diff --git a/.gitignore b/.gitignore
index b3798daf9..062ff8ba4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,6 +6,7 @@ yarn-debug.log*
 yarn-error.log*
 package-lock.json
 tests/**/coverage/
+/src/utils/baseUrl.js
 
 # Editor directories and files
 .idea
diff --git a/src/api/chat.js b/src/api/chat.js
index 1c2c5a977..0cf5433f3 100644
--- a/src/api/chat.js
+++ b/src/api/chat.js
@@ -1,300 +1,6 @@
 
 import request from '@/utils/request';
 
-export function postDataBd(data) {
-    return request({
-        url: `/api/audio/bd?group=${data.group}&conversationId=${data.conversationId}`,
-        method: 'post',
-        data: data.file
-    });
-}
-
-// 创建/获取会话id
-export function getConversation(data) {
-    return request({
-        url: `/api/audio/conversation`,
-        method: 'get',
-        params: {
-            group: data.group,
-            userId: data.userId,
-            code: data.code
-        }
-    });
-}
-
-export function postDataXf(data) {
-    return request({
-        url: `/api/audio/xf`,
-        method: 'post',
-        data: data
-    });
-}
-
-// 获取语音历史记录
-export function getHistoryVoice(code) {
-    return request({
-        url: `/api/audio/${code}/history`,
-        method: 'get'
-    });
-}
-
-// 文字聊天 发送文字
-export function chatWithText(data, group) {
-    return request({
-        url: `/api/jointTraining/chatWithText?group=${group}`,
-        method: 'post',
-        data: {
-            message: data
-        }
-    });
-}
-
-// 文字聊天 发送语音
-export function chatWithAudio(file, group) {
-    return request({
-        url: `/api/jointTraining/chatWithAudio?group=${group}`,
-        method: 'post',
-        data: file
-    });
-}
-
-// 文字聊天 发送语音(新版)
-export function chatWithAudioNew(file, group) {
-    return request({
-        url: `/api/v1/jointTraining/chatWithAudio?group=${group}`,
-        method: 'post',
-        data: file
-    });
-}
-
-// 生成分发二维码
-export function getJoinTrainCode(data, group) {
-    return request({
-        url: `/api/jointTraining/qrCode?group=${group}`,
-        method: 'post',
-        data: data
-    });
-}
-
-// 创建房间
-export function postCreateRoom(data) {
-    return request({
-        url: `/api/jointTraining/room`,
-        method: 'post',
-        data: data
-    });
-}
-
-// 检查房间存在
-export function checkRoomExist(params) {
-    return request({
-        url: `/api/simulationRoom`,
-        method: 'get',
-        params
-    });
-}
-
-// 获取房间详情
-export function postRoomDetail(group) {
-    return request({
-        url: `/api/jointTraining/room/${group}`,
-        method: 'get'
-    });
-}
-
-// 销毁房间
-export function deljointTrainRoom(group) {
-    return request({
-        url: `/api/jointTraining/room`,
-        method: 'delete',
-        params: {
-            group: group
-        }
-    });
-}
-
-// 查询有权限房间列表
-export function getjointTrainList(params) {
-    return request({
-        url: `/api/jointTraining/room/list`,
-        method: 'get',
-        params: params
-    });
-}
-
-// 加入房间
-export function getjointTraining(group) {
-    return request({
-        url: `/api/jointTraining/room/join`,
-        method: 'put',
-        params: {
-            group: group
-        }
-    });
-}
-
-// 设置人员角色
-export function putUserRoles(data, group) {
-    return request({
-        url: `/api/jointTraining/room/user/role?group=${group}`,
-        method: 'put',
-        data: data
-    });
-}
-
-// 获取房间里的用户列表
-export function getJointTrainRoomUserList(group) {
-    return request({
-        url: `/api/jointTraining/room/${group}/user/list`,
-        method: 'get'
-    });
-}
-
-// 离开房间接口
-export function putJointTrainingExit(group) {
-    return request({
-        url: `/api/jointTraining/room/exit`,
-        method: 'put',
-        params: {
-            group: group
-        }
-    });
-}
-
-// 开始联合演练
-export function startJointTraining(group) {
-    return request({
-        url: `/api/jointTraining/room/simulation`,
-        method: 'post',
-        params: {
-            group: group
-        }
-    });
-}
-
-// 获取个人信息
-export function getUserRoles(group) {
-    return request({
-        url: `/api/jointTraining/room/user/role`,
-        method: 'get',
-        params: {
-            group: group
-        }
-    });
-}
-
-// 踢出用户
-export function putJointTrainingUserkicked(userId, group) {
-    return request({
-        url: `/api/jointTraining/room/user`,
-        method: 'put',
-        params: {
-            userId: userId,
-            group: group
-        }
-    });
-}
-
-// 管理员结束所有人的仿真
-export function putJointTrainingSimulation(group) {
-    return request({
-        url: `/api/jointTraining/room/simulation/all`,
-        method: 'put',
-        params: {
-            group: group
-        }
-    });
-}
-
-// 结束仿真返回房间
-export function putJointTrainingSimulationUser(group) {
-    return request({
-        url: `/api/jointTraining/room/simulation/user/exit`,
-        method: 'put',
-        params: {
-            group: group
-        }
-    });
-}
-
-// 进入仿真
-export function putJointTrainingSimulationEntrance(group) {
-    return request({
-        url: `/api/jointTraining/room/simulation/user/entrance`,
-        method: 'put',
-        params: {
-            group: group
-        }
-    });
-}
-
-/**
- * 权限获取(房间权限)
- */
-export function getPermissionJoint(group) {
-    return request({
-        url: '/api/jointTraining/qrCode',
-        method: 'get',
-        params: {
-            group: group
-        }
-    });
-}
-
-// 添加或更新真实设备和仿真对象连接
-export function setRealDevice(group, data) {
-    return request({
-        url: `/api/jointTraining/room/realDevice?group=${group}`,
-        method: 'post',
-        data: data
-    });
-}
-
-// 删除真实设备和仿真对象连接
-export function delRealDevice(id, group) {
-    return request({
-        url: `/api/jointTraining/room/realDevice/${id}`,
-        method: 'delete',
-        params: { group: group }
-    });
-}
-
-// 获取真实设备列表
-export function getRealDevices(group) {
-    return request({
-        url: `/api/jointTraining/room/${group}/devices`,
-        method: 'get'
-    });
-}
-
-// 获取房间真实设备连接关系
-export function getRealDevicesInRoom(group) {
-    return request({
-        url: `/api/jointTraining/room/${group}/realDevice/connect`,
-        method: 'get'
-    });
-}
-
-// 更新真实设备的连接关系
-export function updateRealDevices(group, data) {
-    return request({
-        url: `/api/jointTraining/room/${group}/realDevice`,
-        method: 'put',
-        data: data
-    });
-}
-
-// 真实设备是否被其他仿真使用
-export function realDeviceIsUsed(group, projectCode) {
-    return request({
-        url: `/api/jointTraining/room/${group}/realDeviceUsed`,
-        method: 'get',
-        params: {
-            projectCode: projectCode
-        }
-    });
-}
-
 // 获取仿真成员列表（新版地图）
 export function getSimulationMembersNew(group) {
     return request({
@@ -302,23 +8,6 @@ export function getSimulationMembersNew(group) {
         method: 'get'
     });
 }
-
-// 获取仿真会话消息列表（新版地图）
-export function getSimulationContextListNew(group, conversationId) {
-    return request({
-        url: `/simulation/${group}/conversation/${conversationId}`,
-        method: 'get'
-    });
-}
-
-// 接受其他人的会话邀请 (新版地图)
-export function acceptCoversitionInvite(group, conversationId) {
-    return request({
-        url: `/simulation/${group}/${conversationId}/accept`,
-        method: 'put'
-    });
-}
-
 /** 发起会话 */
 export function startConversition(group, data, sign) {
     return request({
@@ -327,13 +16,6 @@ export function startConversition(group, data, sign) {
         data
     });
 }
-/** 根据会话id获取仿真会话 */
-export function getSimulationConversition(group, conversationId) {
-    return request({
-        url: `/api/simulation/${group}/conversation/${conversationId}`,
-        method: 'get'
-    });
-}
 /** 发送会话消息 */
 export function sendSimulationConversition(group, conversationId, file) {
     return request({
@@ -363,3 +45,11 @@ export function getAllConversition(group) {
         method: 'get'
     });
 }
+
+/** 语音播完的接口  */
+export function overConversationMessage(group, conversationMessageId) {
+    return request({
+        url: `/api/v1/competitionPractical/${group}/audio/over/${conversationMessageId}`,
+        method: 'put'
+    });
+}
diff --git a/src/api/company.js b/src/api/company.js
index a7c1ff06e..b39fcd373 100644
--- a/src/api/company.js
+++ b/src/api/company.js
@@ -22,13 +22,7 @@ export function deleteCompany(id) {
         method: 'delete'
     });
 }
-/** 根据id查询公司信心 */
-export function getCompanyById(id) {
-    return request({
-        url: `/api/company/${id}`,
-        method: 'get'
-    });
-}
+
 /** 更新公司信息 */
 export function updateCompany(id, data) {
     return request({
diff --git a/src/api/competition.js b/src/api/competition.js
index 194d0d9d9..248589fd9 100644
--- a/src/api/competition.js
+++ b/src/api/competition.js
@@ -7,20 +7,7 @@ export function refereeExitSimulation(group) {
         method: 'delete'
     });
 }
-/** 裁判进入仿真 */
-export function refereeEnterSimulation(group) {
-    return request({
-        url: `/api/v1/competition/room/${group}/refree`,
-        method: 'post'
-    });
-}
-/** 裁判查询竞赛人员的房间列表 */
-export function refereeGetCompetitionList(id) {
-    return request({
-        url: `/api/v1/competition/${id}/room`,
-        method: 'get'
-    });
-}
+
 /** 参赛者创建演练房间 */
 export function participantCreatTrainingRoom(id, data) {
     return request({
@@ -30,23 +17,6 @@ export function participantCreatTrainingRoom(id, data) {
     });
 }
 
-// 加载试卷
-export function loadingPaper(competitionId, data) {
-    return request({
-        url: `/api/v1/competition/${competitionId}/testPaper`,
-        method: 'post',
-        data
-    });
-}
-/** 竞赛报名 */
-export function postSignUp(id, data) {
-    return request({
-        url: `/api/race/${id}/signUp`,
-        method: 'post',
-        data
-    });
-}
-
 /** 查询用户是否已经报名该竞赛 */
 export function getIsSignUp(raceId, params = {}) {
     return request({
@@ -56,24 +26,6 @@ export function getIsSignUp(raceId, params = {}) {
     });
 }
 
-/** 分页查询竞赛报名人员 */
-export function getRaceUserList(params) {
-    return request({
-        url: `/api/race/${params.raceId}/raceUser/page`,
-        method: 'get',
-        params
-    });
-}
-
-/** 裁判打分 */
-export function putRefereeScoring(data) {
-    return request({
-        url: `/api/v1/competition/referee/scoring`,
-        method: 'put',
-        data
-    });
-}
-
 /** 提交试卷 */
 export function postCompetitionTheory(data) {
     return request({
@@ -83,14 +35,6 @@ export function postCompetitionTheory(data) {
     });
 }
 
-/** 查询本竞赛用的实操列表 */
-export function getCompetitionPractical(competitionId) {
-    return request({
-        url: `/api/v1/competitionPractical/competition/${competitionId}`,
-        method: 'get'
-    });
-}
-
 /** 查询竞赛报名人员详情 */
 export function getRaceUserById(raceId) {
     return request({
@@ -169,68 +113,6 @@ export function getPracticalCompetitionResult(competitionId) {
     });
 }
 
-/** 回访准备 */
-export function playBackReady(params) {
-    return request({
-        url: `/api/v1/simulationRecord/playback/ready`,
-        method: 'get',
-        params
-    });
-}
-
-/** 设置倍速 */
-export function setPlaySpeed(params) {
-    return request({
-        url: `/api/v1/simulationRecord/playback/setPlaySpeed`,
-        method: 'get',
-        params
-    });
-}
-
-/** 开始播放 */
-export function startPlaying(params) {
-    return request({
-        url: `/api/v1/simulationRecord/playback/startPlaying`,
-        method: 'get',
-        params
-    });
-}
-
-/** 暂停播放 */
-export function playingPause(params) {
-    return request({
-        url: `/api/v1/simulationRecord/playback/pausePlaying`,
-        method: 'get',
-        params
-    });
-}
-
-/** 结束播放 */
-export function endPlaying(params) {
-    return request({
-        url: `/api/v1/simulationRecord/playback/endPlaying`,
-        method: 'get',
-        params
-    });
-}
-
-/** 从暂停中播放 */
-export function fromPauseToPlay(params) {
-    return request({
-        url: `/api/v1/simulationRecord/playback/playing`,
-        method: 'get',
-        params
-    });
-}
-
-/** 裁判查询理论考试结果 */
-export function getTheroyCompetitionResult(competitionId, raceUserId) {
-    return request({
-        url: `api/v1/competitionTheory/detail/competition/${competitionId}/raceUser/${raceUserId}`,
-        method: 'get'
-    });
-}
-
 // 以下drts项目使用
 
 /** 项目获取试题列表 */
@@ -360,3 +242,21 @@ export function getEmptyOperationalStatistics(group) {
     });
 }
 
+/** 草稿场景数据导入*/
+export function postSceneImport(scriptId, name, data) {
+    return request({
+        url: `/api/v1/competitionPractical/${scriptId}/import?name=${name}`,
+        method: 'post',
+        data: data,
+        time: 60000
+    });
+}
+
+/** 草稿场景数据导出 */
+export function getSceneExport(id) {
+    return request({
+        url: `/api/v1/competitionPractical/${id}/export`,
+        method: 'get'
+    });
+}
+
diff --git a/src/api/designPlatform.js b/src/api/designPlatform.js
index 3582533a6..985d6a6e8 100644
--- a/src/api/designPlatform.js
+++ b/src/api/designPlatform.js
@@ -138,37 +138,10 @@ export function previewRunPlan(planId) {
     });
 }
 
-/** 加载剧本 */
-export function loadDraftScript(scriptId, memberId, group) {
-    return request({
-        url: `/api/simulation/${group}/scriptDraft/${scriptId}?memberId=${memberId}`,
-        method: 'post'
-    });
-}
-
 /** 剧本预览选择角色 */
 export function loadDraftScriptNew(memberId, group) {
     return request({
-        // url: `/simulation/${group}/choosePlay?memberId=${memberId}`,
         url: `/api/scriptSimulation/${group}/chooseMemberAndStart?memberId=${memberId}`,
         method: 'put'
     });
 }
-
-/** 剧本预览选择角色 */
-export function loadDraftScriptNewMode(memberId, group, mode) {
-    return request({
-        // url: `/simulation/${group}/choosePlay?memberId=${memberId}`,
-        url: `/api/scriptSimulation/${group}/chooseMemberAndStart?memberId=${memberId}&mode=${mode}`,
-        method: 'put'
-    });
-}
-
-/** 获取已发布的有地图的城市列表*/
-export function publisMapCityList(data) {
-    return request({
-        url: `/api/map/city?dicCode=${data}`,
-        method: 'get'
-    });
-}
-
diff --git a/src/api/jmap/lesson.js b/src/api/jmap/lesson.js
index 12d67929d..e1960957f 100644
--- a/src/api/jmap/lesson.js
+++ b/src/api/jmap/lesson.js
@@ -95,3 +95,10 @@ export function aKeyGeneratingLesson(data) {
         data: data
     });
 }
+/** 根据课程ID获取班级 */
+export function getExamClassList(lessonId) {
+    return request({
+        url: `/api/lesson/${lessonId}/classes`,
+        method: 'get'
+    });
+}
diff --git a/src/api/jmap/lessondraft.js b/src/api/jmap/lessondraft.js
index 7c8a9bb9e..e1a1475ec 100644
--- a/src/api/jmap/lessondraft.js
+++ b/src/api/jmap/lessondraft.js
@@ -85,15 +85,6 @@ export function getLessonChapterDetail(data) {
     });
 }
 
-/** 发布课程*/
-export function publishLesson(data) {
-    return request({
-        url: `/api/lessonDraft/${data.id}/publish`,
-        method: 'post',
-        data: data
-    });
-}
-
 /** 课程章节拖拽排序*/
 export function dragSortLessonChapter(data) {
     return request({
diff --git a/src/api/jmap/map.js b/src/api/jmap/map.js
index 0ded2d724..9acfc87ba 100644
--- a/src/api/jmap/map.js
+++ b/src/api/jmap/map.js
@@ -16,14 +16,6 @@ export function getPublishMapListOnline() {
     });
 }
 
-/** 根据皮肤获取发布地图列表*/
-export function getPublishMapListByLineCode(lineCode) {
-    return request({
-        url: `/api/map/${lineCode}/list`,
-        method: 'get'
-    });
-}
-
 /** 根据地图id获取地图版本信息*/
 export function getPublishMapVersionById(id) {
     return request({
@@ -107,15 +99,6 @@ export function putMapOffLine(mapId) {
     });
 }
 
-// /** 修改发布地图名称*/
-// export function updatePublishMapName(data) {
-//     return request({
-//         url: `/api/map/${data.mapId}/updateName`,
-//         method: 'put',
-//         data: data
-//     });
-// }
-
 // 检测地图名称唯一性
 export function checkMapName(name) {
     return request({
@@ -133,23 +116,6 @@ export function getPublishMapDetailList(params, code) {
     });
 }
 
-/** 获取有屏蔽门的站台列表*/
-export function hasDoorStationList(mapId) {
-    return request({
-        url: `/api/map/${mapId}/stand/hasDoor`,
-        method: 'get'
-    });
-}
-
-// /** 修改发布地图城市*/
-// export function updatePublishMapCity(data) {
-//     return request({
-//         url: `/api/map/${data.mapId}/city`,
-//         method: 'put',
-//         data: data
-//     });
-// }
-
 // 修改地图基本信息
 export function updatePublishMapInfo(data) {
     return request({
@@ -254,3 +220,19 @@ export function getStandListByStationCode(id, stationCode) {
         method: 'get'
     });
 }
+
+/** 获取已发布的有地图的城市列表*/
+export function publisMapCityList(data) {
+    return request({
+        url: `/api/map/city?dicCode=${data}`,
+        method: 'get'
+    });
+}
+
+/** 新版地图根据仿真mapId获取仿真地图数据 */
+export function getNewMapDataByMapId(mapId) {
+    return request({
+        url: `/api/map/${mapId}/mapData`,
+        method: 'get'
+    });
+}
diff --git a/src/api/jmap/mapdraft.js b/src/api/jmap/mapdraft.js
index 97d180405..0332b4ef4 100644
--- a/src/api/jmap/mapdraft.js
+++ b/src/api/jmap/mapdraft.js
@@ -60,15 +60,6 @@ export function saveMap(data) {
     });
 }
 
-// 保存新草稿地图
-// export function saveNewMap(data) {
-//     return request({
-//         url: `/api/mapBuild/${data.mapId}/saveNewElements`,
-//         method: 'post',
-//         data: data
-//     });
-// }
-
 /** 草稿地图另存为*/
 export function saveAsMap(data) {
     return request({
@@ -124,78 +115,6 @@ export function getBuildMapExport(mapId) {
     });
 }
 
-/** 查询进路列表*/
-export function listRouteRoute(mapId, params) {
-    return request({
-        url: `/api/mapBuild/${mapId}/route`,
-        method: 'get',
-        params: params
-    });
-}
-/** 查询进路地图列表*/
-export function listRouteMapRoute(mapId) {
-    return request({
-        url: `/api/mapBuild/${mapId}/route/all`,
-        method: 'get'
-    });
-}
-/** 查询进路明细*/
-export function queryRouteRouteDetail(data) {
-    return request({
-        url: `/api/mapBuild/route/${data.id}`,
-        method: 'get'
-    });
-}
-/** 创建进路*/
-export function createRouteRoute(data) {
-    return request({
-        url: `/api/mapBuild/route`,
-        method: 'post',
-        data: data
-    });
-}
-/** 删除进路*/
-export function deleteRouteRoute(id) {
-    return request({
-        url: `/api/mapBuild/route/${id}`,
-        method: 'delete'
-    });
-}
-/** 更新进路*/
-export function updateRouteRoute(data) {
-    return request({
-        url: `/api/mapBuild/route/${data.id}`,
-        method: 'put',
-        data: data
-    });
-}
-
-/** 创建联动道岔*/
-export function createLinkageSwitch(data) {
-    return request({
-        url: `/api/mapBuild/switchCoupled`,
-        method: 'post',
-        data: data
-    });
-}
-
-/** 删除联动道岔*/
-export function deleteLinkageSwitch(coupleId) {
-    return request({
-        url: `/api/mapBuild/switchCoupled/${coupleId}`,
-        method: 'delete'
-    });
-}
-
-/** get联动道岔列表*/
-export function listLinkageSwitch(mapId, params) {
-    return request({
-        url: `/api/mapBuild/${mapId}/switchCoupled`,
-        method: 'get',
-        params: params
-    });
-}
-
 /** 草稿地图数据校验*/
 export function verifyMap(id) {
     return request({
@@ -204,49 +123,6 @@ export function verifyMap(id) {
     });
 }
 
-/** 分页查询交路数据*/
-export function listRouting(mapId, params) {
-    return request({
-        url: `/api/mapBuild/${mapId}/routing`,
-        method: 'get',
-        params: params
-    });
-}
-
-/** 创建交路*/
-export function addRouting(data) {
-    return request({
-        url: `/api/mapBuild/routing`,
-        method: 'post',
-        data: data
-    });
-}
-
-/** 删除交路*/
-export function deleteRouting(routingId) {
-    return request({
-        url: `/api/mapBuild/routing/${routingId}`,
-        method: 'delete'
-    });
-}
-
-/** 获取交路详情*/
-export function getRouting(routingId) {
-    return request({
-        url: `/api/mapBuild/routing/${routingId}`,
-        method: 'get'
-    });
-}
-
-/** 更新交路*/
-export function updateRouting(data) {
-    return request({
-        url: `/api/mapBuild/routing/${data.id}`,
-        method: 'put',
-        data: data
-    });
-}
-
 /** 分页查询交路数据(新版)*/
 export function listRoutingData(mapId, params) {
     return request({
@@ -307,49 +183,6 @@ export function generateStationRunData(routingId) {
     });
 }
 
-//  创建自动信号    old（旧数据）
-export function postAutoSignal(data) {
-    return request({
-        url: `/api/mapBuild/autoSignal`,
-        method: 'post',
-        data: data
-    });
-}
-
-//  删除自动信号    old（旧数据）
-export function delAutoSignal(autoSignalId) {
-    return request({
-        url: `/api/mapBuild/autoSignal/${autoSignalId}`,
-        method: 'delete'
-    });
-}
-
-//  分页获取自动信号列表  old（旧数据）
-export function getAutoSignalList(mapId, params) {
-    return request({
-        url: `/api/mapBuild/${mapId}/autoSignal`,
-        method: 'get',
-        params
-    });
-}
-
-//  获取自动信号详情    old（旧数据）
-export function getAutoSignalDetail(autoSignalId) {
-    return request({
-        url: `/api/mapBuild/autoSignal/${autoSignalId}`,
-        method: 'get'
-    });
-}
-
-//  更新自动信号    old（旧数据）
-export function putAutoSignal(data) {
-    return request({
-        url: `/api/mapBuild/autoSignal/${data.autoSignalId}`,
-        method: 'put',
-        data: data
-    });
-}
-
 //  分页获取自动信号列表  new（新数据）
 export function getAutoSignalListNew(mapId, params) {
     return request({
@@ -392,14 +225,6 @@ export function putAutoSignalNew(data) {
         data: data
     });
 }
-
-export function getListByCityCode(cityCode) {
-    return request({
-        url: `/api/mapBuild/${cityCode}/list`,
-        method: 'get'
-    });
-}
-
 // 创建信号机接近区段
 export function postApproachSection(data) {
     return request({
@@ -464,12 +289,6 @@ export function delContinueProtect(id) {
         method: 'delete'
     });
 }
-export function getContinueProtectById(id) {
-    return request({
-        url: `/api/mapBuild/overlap/${id}`,
-        method: 'get'
-    });
-}
 export function getContinueProtectList(mapId, params) {
     return request({
         url: `/api/mapBuild/${mapId}/overlap/paging`,
@@ -545,15 +364,6 @@ export function getRouteNewList(mapId, params) {
         params
     });
 }
-// 获取自动折返分组列表
-export function getAutoReentryGroupList(mapId, params) {
-    return request({
-        url: `/api/mapBuild/${mapId}/autoReentry/group/reentryTrack`,
-        method: 'get',
-        params
-    });
-}
-
 // 新建进路侧防
 export function postFlankProtection(data) {
     return request({
diff --git a/src/api/jmap/pathunit.js b/src/api/jmap/pathunit.js
index e0a4ab3f3..c5bc487f2 100644
--- a/src/api/jmap/pathunit.js
+++ b/src/api/jmap/pathunit.js
@@ -1,44 +1,2 @@
-import request from '@/utils/request';
+// import request from '@/utils/request';
 
-/** 获取路径单元列表*/
-export function getRouteUnitList(id, data) {
-    return request({
-        url: `/api/mapBuild/${id}/routeUnit`,
-        method: 'get',
-        params: data
-    });
-}
-
-/** 创建路径单元*/
-export function addRouteUnit(data) {
-    return request({
-        url: `/api/mapBuild/routeUnit`,
-        method: 'post',
-        data: data
-    });
-}
-
-/** 删除路径单元*/
-export function delRouteUnit(id) {
-    return request({
-        url: `/api/mapBuild/routeUnit/${id}`,
-        method: 'DELETE'
-    });
-}
-
-/** 获取路径单元*/
-export function getRouteUnit(id) {
-    return request({
-        url: `/api/mapBuild/routeUnit/${id}`,
-        method: 'get'
-    });
-}
-
-/** 更新路径单元*/
-export function setRouteUnit(data) {
-    return request({
-        url: `/api/mapBuild/routeUnit/${data.id}`,
-        method: 'put',
-        data: data
-    });
-}
diff --git a/src/api/jmap/training.js b/src/api/jmap/training.js
index ec7c4584e..280a8c200 100644
--- a/src/api/jmap/training.js
+++ b/src/api/jmap/training.js
@@ -1,29 +1,5 @@
 import request from '@/utils/request';
 
-/** 开始实训 0*/
-export function startTraining(args, group) {
-    return request({
-        url: `/api/training/${args.id}/start`,
-        method: 'get',
-        params: {
-            group
-        }
-    });
-}
-
-/** 实训结束*/
-export function endTraining(args, group) {
-    return request({
-        url: `/api/training/${args.lessonId}/${args.id}/end`,
-        method: 'get',
-        params: {
-            mode: args.mode,
-            usedTime: args.usedTime,
-            group
-        }
-    });
-}
-
 /** 发送步骤数据*/
 export function sendTrainingNextStep(data, group) {
     return request({
@@ -35,32 +11,6 @@ export function sendTrainingNextStep(data, group) {
         }
     });
 }
-/** 获取章节基本信息 0*/
-export function getTrainingDetail(trainingId) {
-    return request({
-        url: `/api/training/${trainingId}`,
-        method: 'get'
-    });
-}
-
-/** 添加实训 0*/
-export function addTraining(data) {
-    return request({
-        url: '/api/training',
-        method: 'post',
-        data: data
-    });
-}
-
-/** 获取实训步骤数据 0*/
-export function getTrainingStepsDetail(trainingId, params) {
-    return request({
-        url: `/api/training/${trainingId}/detail`,
-        method: 'get',
-        params: params
-    });
-}
-
 /** 查询实训列表 0*/
 export function pageQueryTraining(params) {
     return request({
@@ -69,41 +19,6 @@ export function pageQueryTraining(params) {
         params: params
     });
 }
-/** 自动生成实训操作 0*/
-export function addAutoTraining(data) {
-    return request({
-        url: `/api/training/generate`,
-        method: 'post',
-        data: data
-    });
-}
-
-/** 修改自动删除实训操作 0*/
-export function updateAutoTraining(data) {
-    return request({
-        url: `/api/training/batchUpdateGenerate`,
-        method: 'put',
-        data: data
-    });
-}
-/** 删除自动生成实训 0*/
-export function deleteAutoTraining(params) {
-    return request({
-        url: `/api/training/generate`,
-        method: 'delete',
-        params: params
-    });
-}
-
-/** 获取用户实训列表 0*/
-export function getTrainingList(data) {
-    return request({
-        url: `/api/training/list`,
-        method: 'get',
-        params: data
-    });
-}
-
 export function sendCommand(group, command) {
     return request({
         url: `/api/training/deviceChange?group=${group}`,
@@ -125,29 +40,6 @@ export function sendCommandNew(group, commandDefinitionId, command) {
         data: command
     });
 }
-// 添加用户实训数据 0
-export function addUserTraining(data) {
-    return request({
-        url: `/api/training/userTraining`,
-        method: 'post',
-        data: data
-    });
-}
-// 更新用户实训数据 0
-export function putUserTraining(data) {
-    return request({
-        url: `/api/training/userTraining/${data.id}`,
-        method: 'put',
-        data: data
-    });
-}
-// 清除实训数据 0
-export function deleteUserTraining(statsId) {
-    return request({
-        url: `/api/training/userTraining/${statsId}`,
-        method: 'delete'
-    });
-}
 
 /** 开始实训 （新版地图） */
 export function startTrainingNew (args, group) {
@@ -184,7 +76,8 @@ export function getTrainingDetailNew(trainingId) {
         url: `/api/v1/training/${trainingId}`,
         method: 'get'
     });
-}/** 添加实训（新版地图） */
+}
+/** 添加实训（新版地图） */
 export function addTrainingNew(data) {
     return request({
         url: '/api/v1/training',
diff --git a/src/api/jointTraining.js b/src/api/jointTraining.js
index 7c77e7245..ebd203cff 100644
--- a/src/api/jointTraining.js
+++ b/src/api/jointTraining.js
@@ -1,34 +1,5 @@
 import request from '@/utils/request';
 
-// 文字聊天 发送文字
-export function chatWithTextNew(data, group) {
-    return request({
-        url: `/api/v1/jointTraining/chatWithText?group=${group}`,
-        method: 'post',
-        data: {
-            message: data
-        }
-    });
-}
-
-// 生成分发二维码
-export function getJoinTrainCodeNew(data, group) {
-    return request({
-        url: `/api/v1/jointTraining/qrCode?group=${group}`,
-        method: 'post',
-        data: data
-    });
-}
-
-// 创建房间
-export function postCreateRoomNew(data) {
-    return request({
-        url: `/api/v1/jointTraining/room`,
-        method: 'post',
-        data: data
-    });
-}
-
 // 检查房间存在
 export function checkRoomExistNew(params) {
     return request({
@@ -38,45 +9,6 @@ export function checkRoomExistNew(params) {
     });
 }
 
-// 获取房间详情
-export function postRoomDetailNew(group) {
-    return request({
-        url: `/api/v1/jointTraining/room/${group}`,
-        method: 'get'
-    });
-}
-
-// 销毁房间
-export function deljointTrainRoomNew(group) {
-    return request({
-        url: `/api/v1/jointTraining/room`,
-        method: 'delete',
-        params: {
-            group: group
-        }
-    });
-}
-
-// 查询有权限房间列表
-export function getjointTrainListNew(params) {
-    return request({
-        url: `/api/v1/jointTraining/room/list`,
-        method: 'get',
-        params: params
-    });
-}
-
-// 加入房间
-export function getjointTrainingNew(group) {
-    return request({
-        url: `/api/v1/jointTraining/room/join`,
-        method: 'put',
-        params: {
-            group: group
-        }
-    });
-}
-
 // 设置人员角色
 export function putUserRolesNew(data, group) {
     return request({
@@ -86,70 +18,6 @@ export function putUserRolesNew(data, group) {
     });
 }
 
-// 获取房间里的用户列表
-export function getJointTrainRoomUserListNew(group) {
-    return request({
-        url: `/api/v1/jointTraining/room/${group}/user/list`,
-        method: 'get'
-    });
-}
-
-// 离开房间接口
-export function putJointTrainingExitNew(group) {
-    return request({
-        url: `/api/v1/jointTraining/room/exit`,
-        method: 'put',
-        params: {
-            group: group
-        }
-    });
-}
-
-// 开始联合演练
-export function startJointTrainingNew(group) {
-    return request({
-        url: `/api/v1/jointTraining/room/simulation`,
-        method: 'post',
-        params: {
-            group: group
-        }
-    });
-}
-
-// 获取个人信息
-export function getUserRolesNew(group) {
-    return request({
-        url: `/api/v1/jointTraining/room/user/role`,
-        method: 'get',
-        params: {
-            group: group
-        }
-    });
-}
-
-// 踢出用户
-export function putJointTrainingUserkickedNew(userId, group) {
-    return request({
-        url: `/api/v1/jointTraining/room/user`,
-        method: 'put',
-        params: {
-            userId: userId,
-            group: group
-        }
-    });
-}
-
-// 管理员结束所有人的仿真
-export function putJointTrainingSimulationNew(group) {
-    return request({
-        url: `/api/v1/jointTraining/room/simulation/all`,
-        method: 'put',
-        params: {
-            group: group
-        }
-    });
-}
-
 // 结束仿真返回房间
 export function putJointTrainingSimulationUserNew(group) {
     return request({
@@ -160,90 +28,3 @@ export function putJointTrainingSimulationUserNew(group) {
         }
     });
 }
-
-// 进入仿真
-export function putJointTrainingSimulationEntranceNew(group) {
-    return request({
-        url: `/api/v1/jointTraining/room/simulation/user/entrance`,
-        method: 'put',
-        params: {
-            group: group
-        }
-    });
-}
-
-/**
- * 权限获取(房间权限)
- */
-export function getPermissionJointNew(group) {
-    return request({
-        url: '/api/v1/jointTraining/qrCode',
-        method: 'get',
-        params: {
-            group: group
-        }
-    });
-}
-
-// 添加或更新真实设备和仿真对象连接
-export function setRealDeviceNew(group, data) {
-    return request({
-        url: `/api/v1/jointTraining/room/realDevice?group=${group}`,
-        method: 'post',
-        data: data
-    });
-}
-
-// 删除真实设备和仿真对象连接
-export function delRealDeviceNew(id, group) {
-    return request({
-        url: `/api/v1/jointTraining/room/realDevice/${id}`,
-        method: 'delete',
-        params: { group: group }
-    });
-}
-
-// 获取真实设备列表
-export function getRealDevicesNew(group) {
-    return request({
-        url: `/api/v1/jointTraining/room/${group}/devices`,
-        method: 'get'
-    });
-}
-
-// 获取房间真实设备连接关系
-export function getRealDevicesInRoomNew(group) {
-    return request({
-        url: `/api/v1/jointTraining/room/${group}/realDevice/connect`,
-        method: 'get'
-    });
-}
-
-// 更新真实设备的连接关系
-export function updateRealDevicesNew(group, data) {
-    return request({
-        url: `/api/v1/jointTraining/room/${group}/realDevice`,
-        method: 'put',
-        data: data
-    });
-}
-
-// 真实设备是否被其他仿真使用
-export function realDeviceIsUsedNew(group, projectCode) {
-    return request({
-        url: `/api/v1/jointTraining/room/${group}/realDeviceUsed`,
-        method: 'get',
-        params: {
-            projectCode: projectCode
-        }
-    });
-}
-
-// 获取所有需要值班员的车站（新版）
-export function getAvailableStaionList(mapId) {
-    return request({
-        url: `/api/map/${mapId}/station/needSupervisor`,
-        method: 'get'
-    });
-}
-
diff --git a/src/api/management/author.js b/src/api/management/author.js
index 4b65a86e5..e580cf508 100644
--- a/src/api/management/author.js
+++ b/src/api/management/author.js
@@ -10,15 +10,6 @@ export function getLessonPermissonPageList(params) {
     });
 }
 
-/** 创建课程权限*/
-export function createLessonPermisson(data) {
-    return request({
-        url: '/api/permission',
-        method: 'post',
-        data: data
-    });
-}
-
 /** 获取权限详情*/
 export function getPermissonDetail(id) {
     return request({
@@ -44,14 +35,6 @@ export function postPermissonList(mapId) {
     });
 }
 
-/** 获取用户某课程某段时间内可用的权限数量*/
-export function getTotalRemains(params) {
-    return request({
-        url: '/api/userPermission/totalRemains',
-        method: 'get',
-        params: params
-    });
-}
 /** 设置权限失效或有效*/
 export function setLessonPermisson(data) {
     return request({
@@ -61,25 +44,7 @@ export function setLessonPermisson(data) {
     });
 }
 
-/** 设置权限失效或有效*/
-export function getPermissionList(id) {
-    return request({
-        url: `/api/permission/${id}`,
-        method: 'get'
-    });
-}
-
-/** 获取大屏权限列表*/
-export function queryPermissionScreen() {
-    return request({
-        url: `/api/userPermission/bigScreen`,
-        method: 'get'
-    });
-}
-
-/**
- * 用户权限列表
- */
+/** 用户权限列表*/
 export function listPermision(params) {
     return request({
         url: `/api/userPermission`,
@@ -88,9 +53,7 @@ export function listPermision(params) {
     });
 }
 
-/**
- * 个人权限列表
- */
+/** 个人权限列表*/
 export function listUserPermision(params) {
     return request({
         url: `/api/userPermission/my`,
@@ -99,14 +62,6 @@ export function listUserPermision(params) {
     });
 }
 
-/** 用户权限列表 */
-export function getDistribute(id) {
-    return request({
-        url: `/api/distribute/${id}`,
-        method: 'get'
-    });
-}
-
 /** 设置权限所有者 */
 export function putPermissionOwner(data) {
     return request({
diff --git a/src/api/management/dictionary.js b/src/api/management/dictionary.js
index ea2446efd..f1d4b1d0c 100644
--- a/src/api/management/dictionary.js
+++ b/src/api/management/dictionary.js
@@ -48,10 +48,7 @@ export function update(data) {
     });
 }
 
-/**
- * 根据字典code获取明细列表
- * @param {*} code
- */
+/** 根据字典code获取明细列表*/
 export function getDetailList(code) {
     return request({
         url: '/api/dictionary/getDetailListByCode',
diff --git a/src/api/management/distribute.js b/src/api/management/distribute.js
index 152c27809..97c19a813 100644
--- a/src/api/management/distribute.js
+++ b/src/api/management/distribute.js
@@ -1,32 +1,5 @@
 import request from '@/utils/request';
 
-/** 权限转增*/
-export function getLessons(data) {
-    return request({
-        url: '/api/distribute/getLessons',
-        method: 'get',
-        data: data
-    });
-}
-
-/** 权限分发*/
-export function giveLessons(data) {
-    return request({
-        url: '/api/distribute/distribute',
-        method: 'post',
-        data: data
-    });
-}
-
-/** 权限转增*/
-export function permissionTurnAdd(data) {
-    return request({
-        url: '/api/distribute/transfer',
-        method: 'post',
-        data: data
-    });
-}
-
 /** 权限获取*/
 export function getPermission(state) {
     return request({
@@ -35,24 +8,6 @@ export function getPermission(state) {
     });
 }
 
-/** 接收课程权限*/
-export function receiveLessons(data) {
-    return request({
-        url: '/api/distribute/receiveLessons',
-        method: 'get',
-        data: data
-    });
-}
-
-/** 考试权限分发*/
-export function giveExams(data) {
-    return request({
-        url: `/api/distribute/giveExams`,
-        method: 'post',
-        data: data
-    });
-}
-
 /** 权限打包分页查询*/
 export function listPackagePermission(params) {
     return request({
@@ -62,15 +17,6 @@ export function listPackagePermission(params) {
     });
 }
 
-/** 打包权限*/
-export function packagePermissionDistribute(data) {
-    return request({
-        url: `/api/distribute/givePermission/package`,
-        method: 'post',
-        data: data
-    });
-}
-
 /** 权限回收*/
 export function restorePackagePermission(id) {
     return request({
@@ -97,32 +43,6 @@ export function getPermissionPackageDetail(id, params) {
     });
 }
 
-/** 权限分发打包*/
-export function permissionDistributePackage(data) {
-    return request({
-        url: `/api/distribute/package`,
-        method: 'post',
-        data: data
-    });
-}
-
-/** 权限分发解包*/
-export function permissionDistributeUnPackage(permissionId) {
-    return request({
-        url: `/api/distribute/${permissionId}/unPackage`,
-        method: 'delete'
-    });
-}
-
-/** 查询可打包的权限分发*/
-export function listCanPackagePermission(params) {
-    return request({
-        url: `/api/distribute/package`,
-        method: 'get',
-        params: params
-    });
-}
-
 // 设置权限分发列表 权限失效
 export function setCommodityStatus(id) {
     return request({
@@ -148,11 +68,3 @@ export function givePermission(data) {
         data: data
     });
 }
-
-/** 查询权限分发领取用户列表 */
-export function distributeUsers(distributeId) {
-    return request({
-        url: `/api/distribute/${distributeId}/distributeUsers`,
-        method: 'get'
-    });
-}
diff --git a/src/api/management/exam.js b/src/api/management/exam.js
index 51d0ac757..88e2b9b4f 100644
--- a/src/api/management/exam.js
+++ b/src/api/management/exam.js
@@ -93,19 +93,3 @@ export function updateExamRules(data) {
         data: data
     });
 }
-
-/** 根据课程ID获取试卷 */
-export function getExamParperList(lessonId) {
-    return request({
-        url: `/api/exam/${lessonId}/list`,
-        method: 'get'
-    });
-}
-
-/** 根据课程ID获取班级 */
-export function getExamClassList(lessonId) {
-    return request({
-        url: `/api/lesson/${lessonId}/classes`,
-        method: 'get'
-    });
-}
diff --git a/src/api/management/goods.js b/src/api/management/goods.js
index ae1a9ff6a..aeb3d25a4 100644
--- a/src/api/management/goods.js
+++ b/src/api/management/goods.js
@@ -9,9 +9,7 @@ export function getCommodityDetailByParams(data) {
     });
 }
 
-/**
- * 获取商品明细列表
- */
+/** 获取商品明细列表*/
 export function getCommodityList(params) {
     return request({
         url: '/api/goods',
@@ -20,20 +18,7 @@ export function getCommodityList(params) {
     });
 }
 
-/**
- * 保存商品明细列表
- */
-export function saveCommodityList(params) {
-    return request({
-        url: '/api/goods',
-        method: 'post',
-        data: params
-    });
-}
-
-/**
- * 删除商品明细
- */
+/** 删除商品明细*/
 export function delCommodity(id) {
     return request({
         url: `/api/goods/${id}`,
@@ -41,29 +26,7 @@ export function delCommodity(id) {
     });
 }
 
-/**
- * 获取商品地图，产品，课程列表
- */
-export function getMapLesson() {
-    return request({
-        url: `/api/goods/tree`,
-        method: 'get'
-    });
-}
-
-/**
- * 获取商品地图，产品，课程列表
- */
-export function getCommodityDetailById(id) {
-    return request({
-        url: `/api/goods/${id}`,
-        method: 'get'
-    });
-}
-
-/**
- * 获取商品地图，产品，课程列表
- */
+/** 获取商品地图，产品，课程列表*/
 export function updataCommodityList(data) {
     return request({
         url: `/api/goods/${data.id}`,
@@ -72,9 +35,7 @@ export function updataCommodityList(data) {
     });
 }
 
-/**
- * 设置失效或有效切换
- */
+/** 设置失效或有效切换*/
 export function setCommodityStatus(id) {
     return request({
         url: `/api/goods/${id}/status`,
@@ -110,44 +71,6 @@ export function getGoodsList() {
     });
 }
 
-// 根据权限id查询商品
-export function getGoodsByPermissionId(id) {
-    return request({
-        url: `/api/goods/permissionId`,
-        method: 'get',
-        params: {
-            permissionId: id
-        }
-    });
-}
-
-// 创建商品
-export function postsPermissionGoods(data) {
-    return request({
-        // url: `/api/goods`,
-        url: `/api/goods/create/list`,
-        method: 'post',
-        data: data
-    });
-}
-
-// 创建万能权限商品
-export function postPermissionIdsGoods(data) {
-    return request({
-        url: `/api/goods/permissionIds`,
-        method: 'post',
-        data: data
-    });
-}
-
-// 创建万能权限商品
-export function postCreatePackage(data) {
-    return request({
-        url: `/api/goods/create/package`,
-        method: 'post',
-        data: data
-    });
-}
 // 获取订单对应的商品列表
 export function getGoodsListByOrderId(id) {
     return request({
diff --git a/src/api/management/mapline.js b/src/api/management/mapline.js
index baf989ed9..f3b2acc6d 100644
--- a/src/api/management/mapline.js
+++ b/src/api/management/mapline.js
@@ -26,14 +26,6 @@ export function delSkinCode(id) {
     });
 }
 
-/** 根据id查询真实线路 */
-export function querySkinCode(id) {
-    return request({
-        url: `/api/realLine/${id}`,
-        method: 'get'
-    });
-}
-
 /** 修改真实线路*/
 export function updateSkinCode(data) {
     return request({
@@ -60,23 +52,6 @@ export function putRealLineConfig(id, data) {
     });
 }
 
-/** 通过皮肤Code更新地图皮肤*/
-export function updateSkinCodeByCode(data) {
-    return request({
-        url: `/api/realLine/${data.code}/update`,
-        method: 'put',
-        data: data
-    });
-}
-
-/** 检查code是否存在*/
-export function querySkinCodeExistByCode(code) {
-    return request({
-        url: `/api/realLine/${code}/exist`,
-        method: 'get'
-    });
-}
-
 /** 获取真实线路列表*/
 export function getLineCodeList() {
     return request({
diff --git a/src/api/management/order.js b/src/api/management/order.js
index 1c8d91a9f..519a15197 100644
--- a/src/api/management/order.js
+++ b/src/api/management/order.js
@@ -10,15 +10,6 @@ export function getOrderPageList(params) {
     });
 }
 
-/** 根据ID获取订单数据*/
-export function getOrderDetail(id, params) {
-    return request({
-        url: `/api/order/${id}`,
-        method: 'get',
-        params: params
-    });
-}
-
 /** 创建一个订单*/
 export function createOrder(data) {
     return request({
@@ -37,31 +28,6 @@ export function updateOrder(data) {
     });
 }
 
-export function deleteOrder(id) {
-    return request({
-        url: `/api/order/${id}`,
-        method: 'delete'
-    });
-}
-
-/** 订单权限领取*/
-export function getOrder(params) {
-    return request({
-        url: '/api/order/getOrder',
-        method: 'get',
-        params: params
-    });
-}
-
-/** 订单权限分发*/
-export function giveOrder(data) {
-    return request({
-        url: '/api/order/giveOrder',
-        method: 'post',
-        data: data
-    });
-}
-
 /** 订单续费*/
 export function getOrderCharge(id) {
     return request({
@@ -104,14 +70,6 @@ export function cancalOrder(orderId) {
     });
 }
 
-// 万能权限查询权限包商品
-export function postFindPermission(ids) {
-    return request({
-        url: `/api/goods/permissionIds?ids=${ids}`,
-        method: 'get'
-    });
-}
-
 // 获取订单的分发二维码
 export function getDistributeFromOrder(orderCode) {
     return request({
diff --git a/src/api/management/user.js b/src/api/management/user.js
index 62f0f5af3..910e2113f 100644
--- a/src/api/management/user.js
+++ b/src/api/management/user.js
@@ -1,29 +1,4 @@
 import request from '@/utils/request';
-/** 注册用户*/
-export function createUserInfo(data) {
-    return request({
-        url: '/api/userinfo/create',
-        method: 'put',
-        data: data
-    });
-}
-/** 根据用户Id获取用户信息*/
-export function getUserInfoByOpenId(params) {
-    return request({
-        url: '/api/userinfo/getByOpenId',
-        method: 'get',
-        params: params
-    });
-}
-
-/** 根据姓名或者手机号查询用户*/
-export function getUserInfoByNameOrMobile(params) {
-    return request({
-        url: '/api/userinfo/nameOrMobile',
-        method: 'get',
-        params: params
-    });
-}
 
 /** 查询用户参数*/
 export function getUserConfigInfo() {
@@ -33,15 +8,6 @@ export function getUserConfigInfo() {
     });
 }
 
-/** 设置用户参数*/
-export function setUserConfigInfo(data) {
-    return request({
-        url: '/api/user/config',
-        method: 'post',
-        data: data
-    });
-}
-
 /** 获取销售列表*/
 export function getSellerList() {
     return request({
@@ -85,10 +51,10 @@ export function saveUserSubscribe(data) {
     });
 }
 
-// 修改用户权限
+// 修改用户信息
 export function putRoles(data) {
     return request({
-        url: `/api/user/${data.id}/role`,
+        url: `/api/user/${data.id}/info`,
         method: 'put',
         data: data
     });
@@ -211,14 +177,6 @@ export function exportStudentResults(projectCode, data) {
         data: data
     });
 }
-// 生成绑定微信二维码
-export function getWxQrCode(params) {
-    return request({
-        url: `/api/user/wmurl`,
-        method: 'get',
-        params: params
-    });
-}
 
 // 获取微信小程序绑定二维码
 export function getBindWxQrCodeUrl() {
diff --git a/src/api/management/userexam.js b/src/api/management/userexam.js
index ec588788c..584a2745d 100644
--- a/src/api/management/userexam.js
+++ b/src/api/management/userexam.js
@@ -51,22 +51,6 @@ export function delPublishExam(id) {
     });
 }
 
-/** 删除用户实训*/
-export function delTrainingList() {
-    return request({
-        url: `/api/userExam/list`,
-        method: 'delet'
-    });
-}
-
-/** 设置试卷失效 */
-export function setExamGive(id) {
-    return request({
-        url: `/api/userExam/${id}/abandon`,
-        method: 'put'
-    });
-}
-
 export function updateExam(data) {
     return request({
         url: `/api/userExam/${data.id}`,
diff --git a/src/api/project.js b/src/api/project.js
index d80bfdab0..480992756 100644
--- a/src/api/project.js
+++ b/src/api/project.js
@@ -23,13 +23,6 @@ export function getProjectDeviceList(params) {
         params:params
     });
 }
-// export function getProjectDeviceList(params) {
-// 	return request({
-// 		url: `/api/device/paging`,
-// 		method: 'get',
-// 		params:params
-// 	});
-// }
 /** 删除项目设备 */
 export function deleteProjectDevice(id) {
     return request({
@@ -92,14 +85,7 @@ export function setPscConfig(id, data) {
         data: data
     });
 }
-/** 查询项目下的所有设备 */
-export function getAllDeviceInProject(params) {
-    return request({
-        url: `/api/project/device/project`,
-        method: 'get',
-        params
-    });
-}
+
 /** 添加/修改ibp设备配置 */
 export function setVrIbpConfig(id, data) {
     return request({
@@ -183,3 +169,11 @@ export function setSandboxConfig(id, data) {
         data: data
     });
 }
+/** 添加/修改联锁工作站配置 */
+export function setIlwConfig(id, data) {
+    return request({
+        url: `/api/device/${id}/config/ilw`,
+        method: 'put',
+        data: data
+    });
+}
diff --git a/src/api/pushMessage.js b/src/api/pushMessage.js
index bf435773e..0a13502d1 100644
--- a/src/api/pushMessage.js
+++ b/src/api/pushMessage.js
@@ -15,3 +15,43 @@ export function pushSysNotice(data) {
         data
     });
 }
+
+export function postLicense(data) {
+    return request({
+        url: `/api/license`,
+        method: 'post',
+        data
+    });
+}
+
+export function postLicenseValidate(data) {
+    return request({
+        url: `/api/license/validate`,
+        method: 'post',
+        // baseURL: 'https://joylink.club/jlcloud',
+        data
+    });
+}
+
+export function postLicenseLocal(data) {
+    return request({
+        url: `/api/license/local`,
+        method: 'post',
+        data
+    });
+}
+
+export function getPagingQueryList(params) {
+    return request({
+        url: `/api/license/pagingQuery`,
+        method: 'get',
+        params
+    });
+}
+
+export function putLicenseValid(id) {
+    return request({
+        url: `/api/license/${id}/invalidating`,
+        method: 'put'
+    });
+}
diff --git a/src/api/questionsRule.js b/src/api/questionsRule.js
index a9d6668e7..4bd9c236c 100644
--- a/src/api/questionsRule.js
+++ b/src/api/questionsRule.js
@@ -1,12 +1,5 @@
 import request from '@/utils/request';
 
-/** 获取出题规则列表 */
-export function getQuestionRuleList() {
-    return request({
-        url: `/api/questionsRule`,
-        method: 'get'
-    });
-}
 /** 添加出题规则 */
 export function addQuestionRule(data) {
     return request({
@@ -30,13 +23,7 @@ export function deleteQuestionRule(id) {
         method: 'delete'
     });
 }
-/** 查询单个出题规则 */
-export function selectedQuestionRule(id) {
-    return request({
-        url: `/api/questionsRule/${id}`,
-        method: 'get'
-    });
-}
+
 /** 更改出题规则内容 */
 export function updateQuestionRule(id, data) {
     return request({
diff --git a/src/api/race.js b/src/api/race.js
index 0badd499c..c5f6bc3ef 100644
--- a/src/api/race.js
+++ b/src/api/race.js
@@ -1,43 +1,17 @@
 import request from '@/utils/request';
 
-/** 分页查询竞赛 */
-export function getRaceList(params) {
-    return request({
-        url: `/api/race`,
-        method: 'get',
-        params: params
-    });
-}
-/** 创建竞赛 */
-export function createRace(data) {
-    return request({
-        url: `/api/race`,
-        method: 'post',
-        data
-    });
-}
-/** 修改竞赛信息 */
-export function updateRace(id, data) {
-    return request({
-        url: `/api/race/${id}`,
-        method: 'put',
-        data
-    });
-}
-
-// /** 获取实操试题列表（题库）*/
-// export function getPracticeList(params) {
-//     return request({
-//         url: `/api/v1/competitionPractical`,
-//         method: 'get',
-//         params
-//     });
-// }
 /** 导入项目试题库 */
-export function importQuestionBand(data, projectCode) {
+export function importQuestionBand(data, companyId) {
     return request({
-        url: `/api/questionBank/project/${projectCode}/questions`,
+        url: `/api/questionBank/questions/import?id=${companyId}`,
         method: 'post',
         data
     });
 }
+/** 查询公司下题目类型数量 */
+export function selectQuestionTypeNum(companyId) {
+    return request({
+        url: `/api/questionBank/type/number?companyId=${companyId}`,
+        method: 'get'
+    });
+}
diff --git a/src/api/rpTools.js b/src/api/rpTools.js
index 12eff69fe..142d92f61 100644
--- a/src/api/rpTools.js
+++ b/src/api/rpTools.js
@@ -1,68 +1,197 @@
 import request from '@/utils/request';
 
 /**
- * 获取运行图数据
+ * 查询线路列表
  */
-export function getRpTools() {
+export function listLines() {
+	return request({
+		url: `/api/rpTools/map`,
+		method: 'get'
+	})
+}
+
+/**
+ * 查询线路列表
+ */
+export function listStations(lineId) {
+	return request({
+		url: `/api/rpTools/${lineId}/station`,
+		method: 'get'
+	})
+}
+
+/**
+ * 更新线路车站
+ */
+export function updateStation(stationId, data) {
+	return request({
+		url: `/api/rpTools/station/${stationId}`,
+		method: 'put',
+		data
+	})
+}
+
+/**
+ * 查询运行图列表
+ */
+export function listRps() {
     return request({
-        url: '/api/rpTools',
+        url: `/api/rpTools`,
         method: 'get'
     });
 }
 
-/**
- * 添加车次
- */
-export function addRpTrip(data) {
-	return request({
-        url: '/api/rpTools/trip',
-		method: 'post',
-		data
+/** 创建运行图*/
+export function createRp(data) {
+    return request({
+        url: `/api/rpTools`,
+        method: 'post',
+        data
     });
 }
 
 /**
- * 删除车次
+ * 删除运行图组
  */
-export function delRpTrip(tripNo) {
+export function deleteRp(groupId) {
 	return request({
-		url: `/api/rpTools/${tripNo}/trip`,
+		url: `/api/rpTools/${groupId}`,
 		method: 'delete'
 	})
 }
 
-/**
- * 修改运行时间
- */
-export function justTripNoRunning(tripNo, data) {
+/** 获取运行图配置*/
+export function getRpConfig(planId) {
+    return request({
+        url: `/api/rpTools/${planId}/config`,
+        method: 'get'
+    });
+}
+
+/** 修改运行图配置*/
+export function modifyRpConfig(planId, data) {
+    return request({
+        url: `/api/rpTools/${planId}/config`,
+        method: 'put',
+        data
+    });
+}
+
+/** 获取运行图数据*/
+export function getRpTools(planId) {
+    return request({
+        url: `/api/rpTools/${planId}`,
+        method: 'get'
+    });
+}
+
+/** 添加车次*/
+export function addRpTrip(planId, data) {
+    return request({
+        url: `/api/rpTools/${planId}/trip`,
+        method: 'post',
+        data
+    });
+}
+
+/** 删除车次*/
+export function delRpTrip(planId, tripNo) {
+    return request({
+        url: `/api/rpTools/${planId}/${tripNo}/trip`,
+        method: 'delete'
+    });
+}
+
+/** 平移服务*/
+export function translateRpService(planId, serviceNo, data) {
+    return request({
+        url: `/api/rpTools/${planId}/${serviceNo}/service`,
+        method: 'put',
+        data
+    });
+}
+
+/** 删除服务*/
+export function delRpService(planId, serviceNo) {
+    return request({
+        url: `/api/rpTools/${planId}/${serviceNo}/service`,
+        method: 'delete'
+    });
+}
+
+/** 添加区域*/
+export function createRpArea(planId, data) {
+    return request({
+        url: `/api/rpTools/${planId}/area`,
+        method: 'post',
+        data
+    });
+}
+
+/** 修改区域*/
+export function modifyRpArea(planId, areaNo, data) {
+    return request({
+        url: `/api/rpTools/${planId}/${areaNo}/area`,
+        method: 'put',
+        data
+    });
+}
+
+/** 修改区域文字*/
+export function modifyAreaNote(planId, areaNo, data) {
+    return request({
+        url: `/api/rpTools/${planId}/${areaNo}/text`,
+        method: 'put',
+        data
+    });
+}
+/** 删除区域*/
+export function delRpArea(planId, areaNo) {
+    return request({
+        url: `/api/rpTools/${planId}/${areaNo}/area`,
+        method: 'delete'
+    });
+}
+
+/** 修改运行时间*/
+export function justTripNoRunning(planId, tripNo, data) {
+    return request({
+        url: `/api/rpTools/${planId}/${tripNo}/running`,
+        method: 'put',
+        data
+    });
+}
+
+/** 修改停站时间*/
+export function justTripNoStop(planId, tripNo, data) {
+    return request({
+        url: `/api/rpTools/${planId}/${tripNo}/stop`,
+        method: 'put',
+        data
+    });
+}
+
+/** 修改折返时间*/
+export function justTripTurnBack(planId, tripNo, data) {
+    return request({
+        url: `/api/rpTools/${planId}/${tripNo}/turnBack`,
+        method: 'put',
+        data
+    });
+}
+
+/** 开始编辑*/
+export function startRpEdit(planId) {
 	return request({
-		url: `/api/rpTools/${tripNo}/running`,
-		method: 'put',
-		data
+		url: `/api/rpTools/${planId}/edit`,
+		method: 'put'
 	})
 }
 
-
-/**
- * 修改停站时间
- */
-export function justTripNoStop(tripNo, data) {
+/** 开始编辑*/
+export function endRpEdit(planId) {
 	return request({
-		url: `/api/rpTools/${tripNo}/stop`,
-		method: 'put',
-		data
+		url: `/api/rpTools/${planId}/endEdit`,
+		method: 'put'
 	})
 }
-
-/**
- * 平移车次
- */
-export function translateTripNo(tripNo, data) {
-	return request({
-		url: `/api/rpTools/${tripNo}/trip`,
-		method: 'put',
-		data
-	})
-}
-
-
diff --git a/src/api/runplan.js b/src/api/runplan.js
index 1e0d5198d..4d90b75de 100644
--- a/src/api/runplan.js
+++ b/src/api/runplan.js
@@ -1,19 +1,6 @@
 import request from '@/utils/request';
 
-/**
- * 新建地图速度等级列表
- */
-export function newSpeedLevels(data) {
-    return request({
-        url: '/api/runPlan/draft/speed',
-        method: 'post',
-        data: data
-    });
-}
-
-/**
- * 获取运行图的车站列表
- */
+/** 获取运行图的车站列表*/
 export function getStationList(mapId) {
     return request({
         url: `/api/runPlan/draft/station/${mapId}`,
@@ -30,20 +17,7 @@ export function populatingGenericData(planId, data) {
     });
 }
 
-/**
- * 创建运行图
- */
-export function newRunPlan(data) {
-    return request({
-        url: '/api/runPlan/draft',
-        method: 'post',
-        data: data
-    });
-}
-
-/**
- * 查询运行图获取数据
- */
+/** 查询运行图获取数据*/
 export function queryRunPlan(planId) {
     return request({
         url: `/api/runPlan/draft/${planId}`,
@@ -96,9 +70,7 @@ export function publishRunPlan(data) {
     });
 }
 
-/**
- * 导入真实运行图
- */
+/** 导入真实运行图*/
 export function importRunPlan(data) {
     return request({
         url: `/api/runPlan/draft/${data.mapId}/prdPlan`,
@@ -115,13 +87,6 @@ export function getRpListByMapId(mapId) {
     });
 }
 
-/** 获取站间运行时间*/
-export function getStationRunning(mapId) {
-    return request({
-        url: `/api/runPlan/draft/${mapId}/stationRunning`,
-        method: 'get'
-    });
-}
 /** 获取地图原始站间运行等级 */
 export function getMapStationRun(mapId) {
     return request({
@@ -188,6 +153,15 @@ export function addPlanService(data) {
     });
 }
 
+/** 修改计划*/
+export function updatePlanService(planId, serviceNumber, data) {
+    return request({
+        url: `/api/runPlan/draft/${planId}/service/${serviceNumber}`,
+        method: 'put',
+        data: data
+    });
+}
+
 /** 删除计划*/
 export function deletePlanService(data) {
     return request({
@@ -243,6 +217,22 @@ export function getRoutingBySDTNumber(params) {
     });
 }
 
+/** 修改计划号*/
+export function updateServiceNumber(planId, serviceNumber, newServiceNumber) {
+    return request({
+        url: `/api/runPlan/draft/${planId}/service/${serviceNumber}/serviceNumber?newServiceNumber=${newServiceNumber}`,
+        method: 'put'
+    });
+}
+
+/** 修改任务车次号*/
+export function updateTripNumber(planId, SDTNumber, tripNumber) {
+    return request({
+        url: `/api/runPlan/draft/${planId}/trip/${SDTNumber}/tripNumber?tripNumber=${tripNumber}`,
+        method: 'put'
+    });
+}
+
 /** 运行图仿真测试*/
 export function runPlanNotify({ planId }) {
     return request({
diff --git a/src/api/scheduling.js b/src/api/scheduling.js
index f0d5cdd05..1de48c2f5 100644
--- a/src/api/scheduling.js
+++ b/src/api/scheduling.js
@@ -1,58 +1,12 @@
 import request from '@/utils/request';
 
-export function querySecheduling(group, params) {
-    return request({
-        url: `/api/scheduling/${group}/day`,
-        method: 'get',
-        params
-    });
-}
-
-export function generateScheduling(group, params) {
-    return request({
-        url: `/api/scheduling/${group}/generate`,
-        method: 'post',
-        params
-    });
-}
-
-export function getSchedulingAllTrains(group) {
-    return request({
-        url: `/api/scheduling/${group}/train/all`,
-        method: 'get'
-    });
-}
-
-export function checkScheduling(group, data) {
-    return request({
-        url: `/api/scheduling/${group}/check`,
-        method: 'post',
-        data
-    });
-}
-
-export function saveScheduling(group, data) {
-    return request({
-        url: `/api/scheduling/${group}/save`,
-        method: 'post',
-        data
-    });
-}
-
 export function generateSchedulingAgain(group) {
     return request({
         url: `/api/scheduling/${group}/rebuild`,
         method: 'delete'
     });
 }
-/** 生成地图通用派班计划 */
-export function generateCommonScheduling (data) {
-    return request({
-        url: `/api/v1/scheduling/generate/common`,
-        method: 'post',
-        data
-    });
-}
+
 /** 查询某天的派班计划 */
 export function querySechedulingNew (group, params) {
     return request({
diff --git a/src/api/script.js b/src/api/script.js
index 012b46a0a..dfff747cf 100644
--- a/src/api/script.js
+++ b/src/api/script.js
@@ -1,15 +1,5 @@
 import request from '@/utils/request';
 
-/** 分页查找上线的剧本*/
-export function getScriptPageListOnline(params) {
-    return request({
-        url: `/api/script/paging/online`,
-        // url: `/api/script/paging/published`,
-        method: 'get',
-        params: params
-    });
-}
-
 /** 分页查找上线的剧本(新版)*/
 export function getScriptPageListOnlineNew(params) {
     return request({
@@ -19,14 +9,6 @@ export function getScriptPageListOnlineNew(params) {
     });
 }
 
-/** 通过ID查询发布的剧本的详细信息 */
-export function getScriptById(id) {
-    return request({
-        url: `/api/script/${id}/detail`,
-        method: 'get'
-    });
-}
-
 /** 通过ID查询发布的剧本的详细信息(新版) */
 export function getScriptByIdNew(id) {
     return request({
@@ -35,14 +17,6 @@ export function getScriptByIdNew(id) {
     });
 }
 
-/** 通过group查询未发布剧本的详细信息 */
-export function getDraftScriptByGroup(group) {
-    return request({
-        url: `/api/simulation/${group}/script/loadedScript`,
-        method: 'get'
-    });
-}
-
 /** 通过group查询未发布剧本的详细信息(新版) */
 export function getDraftScriptByGroupNew(group) {
     return request({
@@ -52,7 +26,7 @@ export function getDraftScriptByGroupNew(group) {
 }
 
 /** 剧本撤销发布 */
-export function retractScript(id, data) {
+export function retractScript(id) {
     return request({
         url: `/api/script/draft/${id}/retract`,
         method: 'put'
@@ -127,19 +101,20 @@ export function getAllSelectedScriptRole(group) {
     });
 }
 
-/** 加载剧本接口(仿真使用 竞赛) */
-export function loadScript(group, scriptId) {
+/** 草稿剧本数据导入*/
+export function postScriptImport(mapId, name, data) {
     return request({
-        url: `/api/scriptSimulation/${group}/load/script/${scriptId}`,
-        method: 'PUT'
+        url: `/api/script/draft/${mapId}/import?name=${name}`,
+        method: 'post',
+        data: data,
+        time: 60000
     });
 }
 
-/** 剧本实训结束 接口(仿真使用 竞赛) */
-export function endScriptTraining(group) {
+/** 草稿剧本数据导出 */
+export function getScriptExport(id) {
     return request({
-        url: `/api/scriptSimulation/${group}/finish`,
+        url: `/api/script/draft/${id}/export`,
         method: 'get'
     });
 }
-
diff --git a/src/api/simulation.js b/src/api/simulation.js
index b9a55ad1c..c6efd75d2 100644
--- a/src/api/simulation.js
+++ b/src/api/simulation.js
@@ -1,23 +1,5 @@
 import request from '@/utils/request';
 
-/** 获取故障规则列表*/
-export function getFailureGenerateRules(params) {
-    return request({
-        url: `/api/simulation/failureGenerateRules`,
-        method: 'get',
-        params: params
-    });
-}
-
-/** 设置自动故障*/
-export function setFailureMode(data, group) {
-    return request({
-        url: `/api/simulation/${group}/failureMode`,
-        method: 'post',
-        data: data
-    });
-}
-
 /** 设置自动故障(新版)*/
 export function setFailureModeNew(data, group) {
     return request({
@@ -41,15 +23,6 @@ export function getSimulationFaultRules(group) {
     });
 }
 
-// 创建故障规则（新版）
-export function addFailureRule(data) {
-    return request({
-        url: `/api/v1/faultRule`,
-        method: 'post',
-        data: data
-    });
-}
-
 /** 根据id删除故障规则 */
 export function deleteFailureRule(id) {
     return request({
@@ -58,56 +31,7 @@ export function deleteFailureRule(id) {
     });
 }
 
-/** 获取故障规则列表(新版)*/
-export function getFailureRulesNew(params) {
-    return request({
-        url: `/api/v1/faultRule/page`,
-        method: 'get',
-        params: params
-    });
-}
-
-// 修改故障规则（新版）
-export function modifyFailureRule(data) {
-    return request({
-        url: `/api/v1/faultRule`,
-        method: 'put',
-        data: data
-    });
-}
-
-/** 通过id获取故障规则(新版)*/
-export function getFailureRulesByIdNew(id) {
-    return request({
-        url: `/api/v1/faultRule/${id}`,
-        method: 'get'
-    });
-}
-
-/**
- * 仿真系统按计划行车
- */
-export function runDiagramStart(params, group) {
-    return request({
-        url: `/api/simulation/${group}/start`,
-        method: 'put',
-        params: params
-    });
-}
-
-/**
- * 仿真系统结束计划行车
- */
-export function runDiagramOver(group) {
-    return request({
-        url: `/api/simulation/${group}/over`,
-        method: 'put'
-    });
-}
-
-/**
- *  退出仿真系统
- */
+/** 退出仿真系统*/
 export function runDiagramQuit(group) {
     return request({
         url: `/api/simulation/${group}/quit`,
@@ -115,43 +39,6 @@ export function runDiagramQuit(group) {
     });
 }
 
-/** 获取仿真系统时间*/
-export function runDiagramGetTime(group) {
-    return request({
-        url: `/api/simulation/${group}/systemTime`,
-        method: 'get'
-    });
-}
-
-// 查看是否开始按计划行车
-export function runDiagramIsStart(group) {
-    return request({
-        url: `/api/simulation/${group}/isRunPlanStart`,
-        method: 'get'
-    });
-}
-
-/**
- * 仿真系统CBTC
- * @param {*} mapId
- */
-export function simulationNotify({ mapId, prdType }) {
-    return request({
-        url: `/api/simulation/${mapId}/${prdType}`,
-        method: 'get'
-    });
-}
-
-/**
- * 实训系统CBTC
- * @param {*} data
- */
-export function trainingNotify({ trainingId }) {
-    return request({
-        url: `/api/simulation/training/${trainingId}`,
-        method: 'get'
-    });
-}
 /** 实训系统（新版地图） */
 export function trainingNotifyNew({ trainingId }) {
     return request({
@@ -159,16 +46,7 @@ export function trainingNotifyNew({ trainingId }) {
         method: 'get'
     });
 }
-/**
- * 考试系统CBTC
- * @param {*} data
- */
-export function examNotify({ examId }) {
-    return request({
-        url: `/api/simulation/exam/${examId}`,
-        method: 'get'
-    });
-}
+
 /** 考试系统（新版地图）*/
 export function examNotifyNew({ examId }) {
     return request({
@@ -211,30 +89,6 @@ export function deleteSimulationStats(statsId) {
     });
 }
 
-/** 获取用户鼠标左键选中的设备信息*/
-export function letfMouseSelectDevice(deviceCode, group) {
-    return request({
-        url: `/api/simulation/${group}/device/${deviceCode}`,
-        method: 'get'
-    });
-}
-
-/** 获取每日运行图*/
-export function getEveryDayRunPlanData(group) {
-    return request({
-        url: `/api/simulation/${group}/runPlan`,
-        method: 'get'
-    });
-}
-
-/** 录制脚本仿真*/
-export function scriptRecordNotify(scriptId) {
-    return request({
-        url: `/api/simulation/scriptWrite/${scriptId}`,
-        method: 'get'
-    });
-}
-
 /** 录制脚本仿真(新版)*/
 export function scriptRecordNotifyNew(scriptId) {
     return request({
@@ -243,14 +97,6 @@ export function scriptRecordNotifyNew(scriptId) {
     });
 }
 
-/** 保存剧本背景*/
-export function saveScriptScenes(group) {
-    return request({
-        url: `/api/simulation/${group}/scriptWrite/scenes`,
-        method: 'put'
-    });
-}
-
 /** 保存剧本背景(新版)*/
 export function saveScriptScenesNew(group) {
     return request({
@@ -267,14 +113,6 @@ export function scriptRePreview(group) {
     });
 }
 
-/** 保存录制任务数据*/
-export function saveScriptData(group) {
-    return request({
-        url: `/api/simulation/${group}/scriptWrite/saveData`,
-        method: 'put'
-    });
-}
-
 /** 保存录制任务数据(新版)*/
 export function saveScriptDataNew(group) {
     return request({
@@ -283,15 +121,6 @@ export function saveScriptDataNew(group) {
     });
 }
 
-/** 更新任务地图定位信息*/
-export function updateMapLocation(group, data) {
-    return request({
-        url: `/api/simulation/${group}/scriptWrite/mapLocation`,
-        method: 'put',
-        data
-    });
-}
-
 /** 更新任务地图定位信息（新版）*/
 export function updateMapLocationNew(group, data) {
     return request({
@@ -301,82 +130,6 @@ export function updateMapLocationNew(group, data) {
     });
 }
 
-/** 获取剧本编制的所有成员角色*/
-export function getScriptMemberData(group) {
-    return request({
-        url: `/api/simulation/${group}/scriptWrite/members`,
-        method: 'get'
-    });
-}
-
-/** 获取剧本出演成员角色 */
-export function getScriptPlayMember(group) {
-    return request({
-        url: `/api/simulation/${group}/scriptWrite/players`,
-        method: 'get'
-    });
-}
-
-/** 获取剧本出演成员角色(新版地图) */
-export function getScriptPlayMemberNew(group) {
-    return request({
-        url: `/api/scriptSimulation/${group}/allPlayer`,
-        method: 'get'
-    });
-}
-
-/** 取消剧本演出成员角色 */
-export function cancleScriptMembers(group, data) {
-    return request({
-        url: `/api/simulation/${group}/scriptWrite/removePlayers`,
-        method: 'put',
-        data
-    });
-}
-
-/** 取消剧本演出成员角色 */
-export function cancleScriptMembersNew(group, data) {
-    return request({
-        url: `/api/scriptSimulation/${group}/removePlayers`,
-        method: 'put',
-        data
-    });
-}
-
-/** 选择剧本演出成员角色 */
-export function selectScriptMembers(group, data) {
-    return request({
-        url: `/api/simulation/${group}/scriptWrite/choosePlayers`,
-        method: 'put',
-        data
-    });
-}
-
-/** 选择剧本演出成员角色 (新版地图)*/
-export function selectScriptMembersNew(group, data) {
-    return request({
-        url: `/api/scriptSimulation/${group}/choosePlayers`,
-        method: 'put',
-        data
-    });
-}
-
-/** 修改剧本演出成员性别 */
-export function modifyScriptMemberSex(group, playerId, data) {
-    return request({
-        url: `/api/simulation/${group}/scriptWrite/player/${playerId}?gender=${data.gender}`,
-        method: 'put'
-    });
-}
-
-/** 清除仿真剧本数据*/
-export function dumpScriptData(group) {
-    return request({
-        url: `/api/simulation/${group}/scriptWrite/saveData`,
-        method: 'delete'
-    });
-}
-
 /** 清除仿真剧本数据(新版)*/
 export function dumpScriptDataNew(group) {
     return request({
@@ -385,57 +138,6 @@ export function dumpScriptDataNew(group) {
     });
 }
 
-/** 查询录制剧本步骤*/
-export function queryScriptStep(group) {
-    return request({
-        url: `/api/simulation/${group}/scriptRecordStage`,
-        method: 'get'
-    });
-}
-
-/** 获取指定时间里可加载列车的个数*/
-export function getDesignatedTimeTrainNum(params, group) {
-    return request({
-        url: `/api/simulation/${group}/plan/trainNum`,
-        method: 'get',
-        params
-    });
-}
-/** 添加剧本动作 */
-export function addScriptAction(group, data) {
-    return request({
-        url: `/api/simulation/${group}/scriptWrite/action`,
-        method: 'post',
-        data
-    });
-}
-
-/** 添加剧本动作(新版) */
-export function addScriptActionNew(group, data) {
-    return request({
-        url: `/api/scriptSimulation/${group}/addAction`,
-        method: 'PUT',
-        data
-    });
-}
-
-/** 删除剧本动作 */
-export function deleteScriptAction(group, actionId) {
-    return request({
-        url: `/api/simulation/${group}/scriptWrite/action/${actionId}`,
-        method: 'delete'
-    });
-}
-
-/** 修改剧本动作 */
-export function modifyScriptAction(group, actionId, data) {
-    return request({
-        url: `/api/simulation/${group}/scriptWrite/action/${actionId}`,
-        method: 'put',
-        data
-    });
-}
-
 /** 修改剧本动作(新版) */
 export function modifyScriptActionNew(group, data) {
     return request({
@@ -461,22 +163,6 @@ export function deleteExistingSimulation(group) {
         method: 'delete'
     });
 }
-/** 根据设备类型获取设备列表 */
-export function getDeviceCodeByDeviceType(group, params) {
-    return request({
-        url: `/api/simulation/${group}/deviceType/devices`,
-        method: 'get',
-        params
-    });
-}
-
-/** 获取任务录制的数据 */
-export function getScriptRecord(group) {
-    return request({
-        url: `/api/simulation/${group}/scriptWrite`,
-        method: 'get'
-    });
-}
 
 /** 获取任务录制的所有动作（新版）*/
 export function getScriptAllAction(group) {
@@ -486,22 +172,6 @@ export function getScriptAllAction(group) {
     });
 }
 
-/** 加载任务*/
-export function loadQuest(questId, memberId, group) {
-    return request({
-        url: `/api/simulation/${group}/quest/${questId}?memberId=${memberId}`,
-        method: 'post'
-    });
-}
-
-/** 加载剧本 */
-export function loadScript(scriptId, memberId, group) {
-    return request({
-        url: `api/simulation/${group}/script/${scriptId}?memberId=${memberId}`,
-        method: 'post'
-    });
-}
-
 /** 加载剧本(新版) */
 export function loadScriptNew(scriptId, memberId, group) {
     return request({
@@ -510,14 +180,6 @@ export function loadScriptNew(scriptId, memberId, group) {
     });
 }
 
-/** 退出剧本*/
-export function quitScript(group) {
-    return request({
-        url: `/api/simulation/${group}/script`,
-        method: 'delete'
-    });
-}
-
 /** 退出剧本(新版)*/
 export function quitScriptNew(group) {
     return request({
@@ -526,48 +188,6 @@ export function quitScriptNew(group) {
     });
 }
 
-/** 退出任务*/
-export function quitQuest(group) {
-    return request({
-        url: `/api/simulation/${group}/quest`,
-        method: 'put'
-    });
-}
-
-/** 根据group获取仿真对象*/
-export function getSimulationInfo(group) {
-    return request({
-        url: `/api/simulation/${group}`,
-        method: 'get'
-    });
-}
-
-/** 获取可用的设备指令*/
-export function getAvailableDeviceCommand(params) {
-    return request({
-        url: `/api/simulation/deviceCommand/available`,
-        method: 'get',
-        params
-    });
-}
-
-/** 保存/修改任务剧本*/
-export function saveTaskScript(group, data) {
-    return request({
-        url: `/api/simulation/${group}/questRecord/script`,
-        method: 'post',
-        data
-    });
-}
-
-/** 暂停剧本编制的仿真 */
-export function scriptPause(group) {
-    return request({
-        url: `/api/simulation/${group}/scriptWrite/pause`,
-        method: 'post'
-    });
-}
-
 /** 暂停仿真 */
 export function simulationPause(group) {
     return request({
@@ -576,57 +196,15 @@ export function simulationPause(group) {
     });
 }
 
-/** 恢复仿真运行并执行刚编辑的剧本动作 */
-export function executeScript(group) {
-    return request({
-        url: `/api/simulation/${group}/scriptWrite/execute`,
-        method: 'post'
-    });
-}
-
 /** 恢复仿真运行并执行刚编辑的剧本动作(新版) */
 export function executeScriptNew(group) {
     return request({
-        // url: `/api/scriptSimulation/${group}/recoverAndExecute`,
         url: `/simulation/${group}/resume`,
         method: 'PUT'
     });
 }
 
-/** 生成用户自己的当日运行图*/
-export function generateDayRunPlan(planId, group) {
-    return request({
-        url: `/api/simulation/${group}/loadRunPlan/${planId}`,
-        method: 'post'
-    });
-}
-
-/** 创建派班计划仿真*/
-export function schedulingNotify(params) {
-    return request({
-        url: `/api/scheduling/simulation`,
-        method: 'post',
-        params
-    });
-}
-
-/** 获取PLC网关 */
-export function getPlcGateway(group) {
-    return request({
-        url: `/api/simulation/${group}/plcGateway`,
-        method: 'get'
-    });
-}
-
 /** 处理ibp盘事件 */
-// export function handlerIbpEvent(group, data) {
-//     return request({
-//         url: `/api/simulation/${group}/ibp/event`,
-//         method: 'post',
-//         data: data
-//     });
-// }
-
 export function handlerIbpEvent(group, button, stationCode) {
     return request({
         url: `/simulation/${group}/ibp/${button}?stationCode=${stationCode}`,
@@ -673,22 +251,6 @@ export function getNewMapDataByGroup(group) {
     });
 }
 
-/** 新版地图根据仿真mapId获取仿真地图数据 */
-export function getNewMapDataByMapId(mapId) {
-    return request({
-        url: `/api/map/${mapId}/mapData`,
-        method: 'get'
-    });
-}
-
-/** 新版地图指令操作定义 */
-export function newMapOperate(group, operationId, data) {
-    return request({
-        url: `/simulation/${group}/operate/${operationId}`,
-        method: 'post',
-        data: data
-    });
-}
 /** 新版地图根据group获取仿真运行图 */
 export function getEveryDayRunPlanNew(group) {
     return request({
@@ -713,15 +275,6 @@ export function clearSimulation(group) {
     });
 }
 
-/** 查询进路信息*/
-export function querySignalStatus(group, params) {
-    return request({
-        url: `/api/simulation/${group}/status/signal`,
-        method: 'get',
-        params
-    });
-}
-
 /** 获取仿真运行图车次号列表 */
 export function getTripNumberList(group) {
     return request({
@@ -827,3 +380,19 @@ export function getIbpInitialState (group, stationCode) {
         method: 'get'
     });
 }
+// 获取报警列表
+export function getAlarmList(group, params) {
+    return request({
+        url: `/simulation/${group}/alarm`,
+        method: 'get',
+        params:params
+    });
+}
+// 报警确认
+export function confirmAlarm(group, data) {
+    return request({
+        url: `/simulation/${group}/alarm/confirm`,
+        method: 'put',
+        data
+    });
+}
diff --git a/src/api/statistics.js b/src/api/statistics.js
index ad16cd257..c761cf7f0 100644
--- a/src/api/statistics.js
+++ b/src/api/statistics.js
@@ -1,89 +1 @@
-import request from '@/utils/request';
-
-// 课程列表
-export function getLessonList(code) {
-    return request({
-        url: '/api/stats/lesson/list',
-        method: 'get',
-        params: {
-            wmCode: code
-        }
-    });
-}
-
-// 课程内实训数据统计
-export function getLessonTimeChart(data) {
-    return request({
-        url: `/api/stats/lesson/${data.id}/stats`,
-        method: 'get',
-        params: {
-            wmCode: data.code
-        }
-    });
-}
-
-// 查询参与考试的课程列表
-export function getExamTree(code) {
-    return request({
-        url: '/api/stats/exam/lessonList',
-        method: 'get',
-        params: {
-            wmCode: code
-        }
-    });
-}
-
-// 查询参与考试的试题列表
-export function getstatsExamList(data) {
-    return request({
-        url: `/api/stats/exam/${data.lessonId}/list`,
-        method: 'get',
-        params: {
-            wmCode: data.code
-        }
-    });
-}
-
-// 个人考试数据统计
-export function getExamChart(data) {
-    return request({
-        url: `/api/stats/exam/${data.examId}/stats`,
-        method: 'get',
-        params: {
-            wmCode: data.code
-        }
-    });
-}
-
-// 个人关注地图数据统计列表
-export function getRelevanceMapList(code) {
-    return request({
-        url: `/api/user/subscribe`,
-        method: 'get',
-        params: {
-            wmCode: code
-        }
-    });
-}
-
-// 仿真地图下产品列表
-export function getSimulationPrdList(mapId, code) {
-    return request({
-        url: `/api/stats/simulation/${mapId}/prdList`,
-        method: 'get',
-        params: {
-            wmCode: code
-        }
-    });
-}
-
-// 个人仿真数据统计
-export function getSimulationTimeChart(data) {
-    return request({
-        url: `/api/stats/simulation/${data.mapId}/stats`,
-        method: 'get',
-        params: {
-            wmCode: data.code
-        }
-    });
-}
+// import request from '@/utils/request';
diff --git a/src/api/trainingPlatform.js b/src/api/trainingPlatform.js
index 8e05dae65..277ffebb1 100644
--- a/src/api/trainingPlatform.js
+++ b/src/api/trainingPlatform.js
@@ -1,75 +1,68 @@
 import request from '@/utils/request';
 
+/** 根据cityCode后去对应地图及其子系统 */
 export function getTrainingSystemList(cityCode, params) {
-    /** 根据cityCode后去对应地图及其子系统 */
     return request({
         url: `/api/mapSystem/city/${cityCode}`,
         method: 'get',
         params
     });
 }
-
+/** 根据mapId生成地图子系统 */
 export function generateMapSystem(mapId) {
-    /** 根据mapId生成地图子系统 */
     return request({
         url: `/api/mapSystem/generate/${mapId}`,
         method: 'post'
     });
 }
-
+/** 查询子系统信息 */
 export function getSubSystemInfo(id) {
-    /** 查询子系统信息 */
     return request({
         url: `/api/mapSystem/${id}`,
         method: 'get'
     });
 }
-
+/** 查询子系统详情*/
 export function getSubSystemDetail(id) {
-    /** 查询子系统详情*/
     return request({
         url: `/api/mapSystem/${id}/detail`,
         method: 'get'
     });
 }
-
+/** 分页查询地图系统 */
 export function getMapSystemPageList(params) {
-    /** 分页查询地图系统 */
     return request({
         url: `/api/mapSystem`,
         method: 'get',
         params
     });
 }
-
+/** 创建地图系统 */
 export function createMapSubSystem(data) {
-    /** 创建地图系统 */
     return request({
         url: `/api/mapSystem`,
         method: 'post',
         data: data
     });
 }
-
+/** 查询子系统信息 */
 export function updateSubSystem(id, data) {
-    /** 查询子系统信息 */
     return request({
         url: `/api/mapSystem/${id}`,
         method: 'put',
         data: data
     });
 }
-
+/** 删除地图系统 */
 export function deleteSubSystem(id) {
-    /** 删除地图系统 */
     return request({
         url: `/api/mapSystem/${id}`,
         method: 'delete'
     });
 }
 
+/** 根据项目编号查询地图子系统 */
 export function getSubSystemByProjectCode() {
-    /** 根据项目编号查询地图子系统 */
     return request({
         url: `/api/mapSystem/project`,
         method: 'get'
diff --git a/src/assets/icon/favicon_bjd.png b/src/assets/icon/favicon_bjd.png
new file mode 100644
index 000000000..b2d5e932d
Binary files /dev/null and b/src/assets/icon/favicon_bjd.png differ
diff --git a/src/assets/teleRing.mp3 b/src/assets/teleRing.mp3
new file mode 100644
index 000000000..bbd0572e7
Binary files /dev/null and b/src/assets/teleRing.mp3 differ
diff --git a/src/assets/voiceClose.png b/src/assets/voiceClose.png
new file mode 100644
index 000000000..84f7f1e65
Binary files /dev/null and b/src/assets/voiceClose.png differ
diff --git a/src/assets/voiceOpen.png b/src/assets/voiceOpen.png
new file mode 100644
index 000000000..87c81818f
Binary files /dev/null and b/src/assets/voiceOpen.png differ
diff --git a/src/components/Breadcrumb/index.vue b/src/components/Breadcrumb/index.vue
index 7b3c46046..893268877 100644
--- a/src/components/Breadcrumb/index.vue
+++ b/src/components/Breadcrumb/index.vue
@@ -13,53 +13,51 @@
 import pathToRegexp from 'path-to-regexp';
 
 export default {
-	data() {
-		return {
-			levelList: null
-		};
-	},
-	watch: {
-		$route() {
-			this.getBreadcrumb();
-		}
-	},
-	created() {
-		this.getBreadcrumb();
-	},
-	methods: {
-		getBreadcrumb() {
-			// only show routes with meta.title
-			let matched = this.$route.matched.filter(item => item.meta && item.meta.title);
-			const first = matched[0];
+    data() {
+        return {
+            levelList: null
+        };
+    },
+    watch: {
+        $route() {
+            this.getBreadcrumb();
+        }
+    },
+    created() {
+        this.getBreadcrumb();
+    },
+    methods: {
+        getBreadcrumb() {
+            let matched = this.$route.matched.filter(item => item.meta && item.meta.title);
+            const first = matched[0];
 
-			if (!this.isDashboard(first)) {
-				matched = [{ path: '/dashboard', meta: { title: 'Dashboard' }}].concat(matched);
-			}
+            if (!this.isDashboard(first)) {
+                matched = [{ path: '/dashboard', meta: { title: 'Dashboard' }}].concat(matched);
+            }
 
-			this.levelList = matched.filter(item => item.meta && item.meta.title && item.meta.breadcrumb !== false);
-		},
-		isDashboard(route) {
-			const name = route && route.name;
-			if (!name) {
-				return false;
-			}
-			return name.trim().toLocaleLowerCase() === 'Dashboard'.toLocaleLowerCase();
-		},
-		pathCompile(path) {
-			// To solve this problem https://github.com/PanJiaChen/vue-element-admin/issues/561
-			const { params } = this.$route;
-			var toPath = pathToRegexp.compile(path);
-			return toPath(params);
-		},
-		handleLink(item) {
-			const { redirect, path } = item;
-			if (redirect) {
-				this.$router.push(redirect);
-				return;
-			}
-			this.$router.push(this.pathCompile(path));
-		}
-	}
+            this.levelList = matched.filter(item => item.meta && item.meta.title && item.meta.breadcrumb !== false);
+        },
+        isDashboard(route) {
+            const name = route && route.name;
+            if (!name) {
+                return false;
+            }
+            return name.trim().toLocaleLowerCase() === 'Dashboard'.toLocaleLowerCase();
+        },
+        pathCompile(path) {
+            const { params } = this.$route;
+            var toPath = pathToRegexp.compile(path);
+            return toPath(params);
+        },
+        handleLink(item) {
+            const { redirect, path } = item;
+            if (redirect) {
+                this.$router.push(redirect);
+                return;
+            }
+            this.$router.push(this.pathCompile(path));
+        }
+    }
 };
 </script>
 
diff --git a/src/components/Hamburger/index.vue b/src/components/Hamburger/index.vue
index 4b927baaa..62cbc67e7 100644
--- a/src/components/Hamburger/index.vue
+++ b/src/components/Hamburger/index.vue
@@ -15,18 +15,18 @@
 
 <script>
 export default {
-	name: 'Hamburger',
-	props: {
-		isActive: {
-			type: Boolean,
-			default: false
-		}
-	},
-	methods: {
-		toggleClick() {
-			this.$emit('toggleClick');
-		}
-	}
+    name: 'Hamburger',
+    props: {
+        isActive: {
+            type: Boolean,
+            default: false
+        }
+    },
+    methods: {
+        toggleClick() {
+            this.$emit('toggleClick');
+        }
+    }
 };
 </script>
 
diff --git a/src/components/QueryListPage/DataForm.vue b/src/components/QueryListPage/DataForm.vue
index f4a9a984d..f9edadf9c 100644
--- a/src/components/QueryListPage/DataForm.vue
+++ b/src/components/QueryListPage/DataForm.vue
@@ -214,6 +214,7 @@
             <el-select
               v-model="formModel[item.prop]"
               filterable
+              :clearable="item.clearable"
               :placeholder="item.placeholder"
               :disabled="item.disabled"
               @change="((val)=>{deviceChange(val, item)})"
diff --git a/src/components/QueryListPage/QueryForm.vue b/src/components/QueryListPage/QueryForm.vue
index 2b4c11a8b..e71a49c2e 100644
--- a/src/components/QueryListPage/QueryForm.vue
+++ b/src/components/QueryListPage/QueryForm.vue
@@ -302,6 +302,7 @@ export default {
         // 初始化页面数据
         initPageData() {
             this.modelFields = [];
+            this.formModel = {};
             this.exportFlag = this.queryForm.canExport;
             this.resetShow = this.queryForm.reset;
             this.buildQueryField();
diff --git a/src/directive/quickMenuDrag/quickMenuDrag.js b/src/directive/quickMenuDrag/quickMenuDrag.js
index 32287ee15..c9f4d3aaa 100644
--- a/src/directive/quickMenuDrag/quickMenuDrag.js
+++ b/src/directive/quickMenuDrag/quickMenuDrag.js
@@ -17,10 +17,10 @@ export default {
             /**  注意在ie中 第一次获取到的值为组件自带50% 移动之后赋值为px*/
             if (sty.left.includes('%')) {
                 styL = +document.body.clientWidth * (+sty.left.replace(/\%/g, '') / 100);
-                styT = +document.body.clientHeight * (+sty.top.replace(/\%/g, '') / 100);
+                styT = +document.body.clientHeight * (+sty.bottom.replace(/\%/g, '') / 100);
             } else {
                 styL = +sty.left.replace(/\px/g, '');
-                styT = +sty.top.replace(/\px/g, '');
+                styT = +sty.bottom.replace(/\px/g, '');
             }
 
             document.onmousemove = function (e) {
@@ -28,20 +28,23 @@ export default {
                 const l = e.clientX - disX;
                 const t = e.clientY - disY;
 
+                console.log(l, l + styL, dragDom.style.left);
+
                 /** 移动当前元素*/
                 if (l + styL < 0) {
                     dragDom.style.left = `0px`;
-                } else if (l + styL > document.body.clientWidth - dragDom.clientWidth - 30) {
-                    dragDom.style.left = `${document.body.clientWidth - dragDom.clientWidth - 30}px`;
+                } else if (l + styL > document.body.clientWidth - dragDom.clientWidth - 100) {
+                    dragDom.style.left = `${document.body.clientWidth - dragDom.clientWidth - 100}px`;
                 } else {
                     dragDom.style.left = `${l + styL}px`;
                 }
-                if (t + styT < 0) {
-                    dragDom.style.top = `0px`;
-                } else if (t + styT > document.body.clientHeight - dragDom.clientHeight - 10) {
-                    dragDom.style.top = `${document.body.clientHeight - dragDom.clientHeight - 10}px`;
+
+                if (document.body.clientHeight - (styT - t) - dragDom.clientHeight < 0) {
+                    dragDom.style.bottom = `${document.body.clientHeight - dragDom.clientHeight}px`;
+                } else if (document.body.clientHeight - (styT - t) - dragDom.clientHeight > document.body.clientHeight - dragDom.clientHeight) {
+                    dragDom.style.bottom = `0px`;
                 } else {
-                    dragDom.style.top = `${t + styT}px`;
+                    dragDom.style.bottom = `${styT - t}px`;
                 }
 
                 /** 将此时的位置传出去*/
diff --git a/src/i18n/langs/en/router.js b/src/i18n/langs/en/router.js
index 1ecff02c9..399e4d745 100644
--- a/src/i18n/langs/en/router.js
+++ b/src/i18n/langs/en/router.js
@@ -82,5 +82,9 @@ export default {
     practiceManage:'Practice manage',
     bankManage: 'Bank manage',
     sceneManage:'Scene manage',
-    companyManage: 'Company manage'
+    companyManage: 'Company manage',
+    authorApply: 'Grant application',
+    AuthorList: 'Authorization code list',
+    questionsRuleManage: 'Question rule  manage',
+    preTheoryData: 'Pre Theory Data'
 };
diff --git a/src/i18n/langs/en/system.js b/src/i18n/langs/en/system.js
index 4d6d0a763..e5dcaf2c6 100644
--- a/src/i18n/langs/en/system.js
+++ b/src/i18n/langs/en/system.js
@@ -41,7 +41,7 @@ export default {
     nickname: 'Nickname',
     wellDelType: 'This operation will delete the type. Do you want to continue?',
     permission: 'Permission',
-    editUserPermission: 'Edit User Rights',
+    editUserPermission: 'Edit User Info',
     lessonName: 'Lesson Name',
     selectTraining: 'Selection Training',
     createUserTraining: 'Creating User Training',
diff --git a/src/i18n/langs/zh/router.js b/src/i18n/langs/zh/router.js
index dc0645d33..915c11833 100644
--- a/src/i18n/langs/zh/router.js
+++ b/src/i18n/langs/zh/router.js
@@ -87,5 +87,9 @@ export default {
     bankManage: '题库列表',
     practiceManage:'实操列表',
     sceneManage:'场景列表',
-    companyManage: '单位管理'
+    companyManage: '单位管理',
+    authorApply: '授权申请',
+    AuthorList: '授权列表',
+    questionsRuleManage: '出题规则管理',
+    preTheoryData: '理论导入预处理'
 };
diff --git a/src/i18n/langs/zh/system.js b/src/i18n/langs/zh/system.js
index d41320c94..3c9e83713 100644
--- a/src/i18n/langs/zh/system.js
+++ b/src/i18n/langs/zh/system.js
@@ -41,7 +41,7 @@ export default {
     nickname: '昵称',
     wellDelType: '此操作将删除该类型, 是否继续?',
     permission: '权限',
-    editUserPermission: '编辑用户权限',
+    editUserPermission: '编辑用户信息',
     lessonName: '课程名称',
     selectTraining: '选择实训',
     createUserTraining: '创建用户实训',
diff --git a/src/iscs/shape/text.js b/src/iscs/shape/text.js
index 8b6386bb6..7a57815d8 100644
--- a/src/iscs/shape/text.js
+++ b/src/iscs/shape/text.js
@@ -67,7 +67,7 @@ export default class text extends Group {
     }
     setState(model) {
         this.textName.setStyle('text', model.context);
-        this.textName.setStyle('textBackgroundColor', model.gbColor);
+        model.gbColor && this.textName.setStyle('textBackgroundColor', model.gbColor);
     }
     setSize(width, height) {
         this.model.width = width;
diff --git a/src/iscs/status/mapElement.js b/src/iscs/status/mapElement.js
index 66e128dec..1f321d3ea 100644
--- a/src/iscs/status/mapElement.js
+++ b/src/iscs/status/mapElement.js
@@ -1,5 +1,5 @@
 import elType from './elType';
-import iscs from '../iscs';
+import Vue from 'vue';
 
 export default {
     [elType.A.lab]: {
@@ -35,7 +35,7 @@ export default {
                 context: ''
             },
             stateB: {
-                context: ''
+                context: '0'
             }
         }
     } // 数组
@@ -46,32 +46,36 @@ const arrNumKV = [45.8, 57.4, 67.1, 25.8, 34.8, 48.1];
 const arrNumKW = [113.5, 178.0, 254.6, 157.6, 135.7];
 const arrNumMVar = [0.254, 0.54, 0.971, 1.257];
 
-export function setNum(groupList) {
+export function setNum(groupList, jubeg) {
+    const typeC = [];
     groupList.forEach(group => {
-        group.elemList.forEach(el => {
-            switch (el.type) {
-            case elType.C.lab:
-                switch (iscs.iscsDevice[el.code].unit) {
-                case 'A':
-                    el.context = Math.floor(Math.random() * arrNumA.length + 1) - 1;
-                    break;
-                case 'V':
-                    el.context = Math.floor(Math.random() * arrNumV.length + 1) - 1;
-                    break;
-                case 'KV':
-                    el.context = Math.floor(Math.random() * arrNumKV.length + 1) - 1;
-                    break;
-                case 'KW':
-                    el.context = Math.floor(Math.random() * arrNumKW.length + 1) - 1;
-                    break;
-                case 'MVar':
-                    el.context = Math.floor(Math.random() * arrNumMVar.length + 1) - 1;
-                    break;
-                }
+        switch (group.type) {
+        case elType.C.lab:
+            switch (Vue.prototype.$iscs.iscsDevice[group.code].model.unit) {
+            case 'A':
+                group.context = jubeg ? '0A' : `${arrNumA[Math.floor(Math.random() * arrNumA.length + 1) - 1]}A`;
+                typeC.push(group);
+                break;
+            case 'V':
+                group.context = jubeg ? '0V' : `${arrNumV[Math.floor(Math.random() * arrNumV.length + 1) - 1]}V`;
+                typeC.push(group);
+                break;
+            case 'KV':
+                group.context = jubeg ? '0KV' : `${arrNumKV[Math.floor(Math.random() * arrNumKV.length + 1) - 1]}KV`;
+                typeC.push(group);
+                break;
+            case 'KW':
+                group.context = jubeg ? '0KW' : `${arrNumKW[Math.floor(Math.random() * arrNumKW.length + 1) - 1]}KW`;
+                typeC.push(group);
+                break;
+            case 'MVar':
+                group.context = jubeg ? '0MVar' : `${arrNumMVar[Math.floor(Math.random() * arrNumMVar.length + 1) - 1]}MVar`;
+                typeC.push(group);
                 break;
             }
-        });
+            break;
+        }
     });
 
-    return groupList;
+    return typeC;
 }
diff --git a/src/jlmap3d/edit/connect/initDataSave.js b/src/jlmap3d/edit/connect/initDataSave.js
index 755c4fc4b..ab1b3749d 100644
--- a/src/jlmap3d/edit/connect/initDataSave.js
+++ b/src/jlmap3d/edit/connect/initDataSave.js
@@ -32,23 +32,32 @@ export function initDataSave(data) {
       let sections = [];
       // console.log(data.mapdata.sectionlist.sections.datalist);
       for(let i in data.mapdata.sectionlist.sections.datalist){
-        console.log(data.mapdata.sectionlist.sections.datalist[i].mesh.railpoint);
+
         let section = {
           // uuid:data.mapdata.sectionlist.sections.modellist[i].uuid,
           code:data.mapdata.sectionlist.sections.datalist[i].code,
           name:data.mapdata.sectionlist.sections.datalist[i].name,
-          lengthFact:data.mapdata.sectionlist.sections.datalist[i].mesh.lengthFact,
+          lengthFact:null,
           standTrack:data.mapdata.sectionlist.sections.datalist[i].standTrack,
           rp:data.mapdata.sectionlist.sections.datalist[i].rp,
           lp:data.mapdata.sectionlist.sections.datalist[i].lp,
-          railpoint:data.mapdata.sectionlist.sections.datalist[i].mesh.railpoint,
+          railpoint:null,
           rail:data.mapdata.sectionlist.sections.datalist[i].rail,
-          position:data.mapdata.sectionlist.sections.datalist[i].mesh.position,
-          rotation:data.mapdata.sectionlist.sections.datalist[i].mesh.rotation,
-          scale:data.mapdata.sectionlist.sections.datalist[i].mesh.scale,
+          position:null,
+          rotation:null,
+          scale:null,
         }
-        let nowmesh =  data.mapdata.sectionlist.sectiongroup.getObjectByProperty("code",section.code);
-        section.railpoint = nowmesh.railpoint;
+        if(data.mapdata.sectionlist.sections.datalist[i].mesh){
+          console.log(data.mapdata.sectionlist.sections.datalist[i].mesh.railpoint);
+          let nowmesh =  data.mapdata.sectionlist.sectiongroup.getObjectByProperty("code",section.code);
+          section.railpoint = nowmesh.railpoint;
+          section.lengthFact = data.mapdata.sectionlist.sections.datalist[i].mesh.lengthFact;
+          section.position = data.mapdata.sectionlist.sections.datalist[i].mesh.position;
+          section.rotation = data.mapdata.sectionlist.sections.datalist[i].mesh.rotation;
+          section.scale = data.mapdata.sectionlist.sections.datalist[i].mesh.scale;
+          sections.push(section);
+        }
+
         // console.log(nowmesh.railpoint);
         // if(data.mapdata.sectionlist.sections.datalist[i].rsection){
         //   section.rsection = data.mapdata.sectionlist.sections.datalist[i].rsection;
@@ -62,7 +71,7 @@ export function initDataSave(data) {
 
         // testmesh1.position.z = link.position.z;
 
-        sections.push(section);
+
       }
       let arrray = {
           section:sections,
diff --git a/src/jlmap3d/edit/jlmap3dedit.js b/src/jlmap3d/edit/jlmap3dedit.js
index e99031062..8a2487794 100644
--- a/src/jlmap3d/edit/jlmap3dedit.js
+++ b/src/jlmap3d/edit/jlmap3dedit.js
@@ -423,63 +423,12 @@ export function JLmap3dEdit(dom, data, mapid) {
 		for(let i=0;i<alignmentModel.railpoint.length;i++){
 			newpointlist.push(new THREE.Vector3(alignmentModel.railpoint[i].x,alignmentModel.railpoint[i].y,alignmentModel.railpoint[i].z));
 		}
-    let closedSpline = new THREE.CatmullRomCurve3(newpointlist);
-		closedSpline.type = 'catmullrom';
-		closedSpline.closed = false;
 
-		let extrudeSettings = {
-				steps           : 5,
-				curveSegments   : 1,
-				bevelSegments   : 1,
-				bevelEnabled    : false,
-				extrudePath     : closedSpline,
-		};
 
-		var shape = new THREE.Shape();
-		shape.moveTo( 0,-2 );
-		shape.lineTo( 0, 2 );
-		let selectmaterial = oldobject.material;
-		var geometry = new THREE.ExtrudeBufferGeometry( shape, extrudeSettings );
-		let newAlignmentSection = new THREE.Mesh( geometry, selectmaterial );
-		newAlignmentSection.code = oldobject.code;
-		newAlignmentSection.railpoint = [];
-		for(let i=0;i<newpointlist.length;i++){
-			newAlignmentSection.railpoint[i] = {
-				x:newpointlist[i].x,
-				y:newpointlist[i].y,
-				z:newpointlist[i].z
-			}
-		}
-		newAlignmentSection.lengthFact = closedSpline.arcLengthDivisions/4;
-		if(newpointlist.length>2){
-			newAlignmentSection.lengthFact = newAlignmentSection.lengthFact/5;
-		}
-
-		let len = newAlignmentSection.lengthFact;
-		// closedSpline.arcLengthDivisions;
-		let count = newAlignmentSection.geometry.attributes.position.count/3;
-
-		for(let i=0;i<count;i++){
-			let ui=i*6;
-			if(i%2 != 0){
-				newAlignmentSection.geometry.attributes.uv.array[ui] = 0;
-				newAlignmentSection.geometry.attributes.uv.array[ui+1] = 1;
-				newAlignmentSection.geometry.attributes.uv.array[ui+2] = len;
-				newAlignmentSection.geometry.attributes.uv.array[ui+3] = 1;
-				newAlignmentSection.geometry.attributes.uv.array[ui+4] = len;
-				newAlignmentSection.geometry.attributes.uv.array[ui+5] = 0;
-			}else{
-				newAlignmentSection.geometry.attributes.uv.array[ui] = 0;
-				newAlignmentSection.geometry.attributes.uv.array[ui+1] = 0;
-				newAlignmentSection.geometry.attributes.uv.array[ui+2] = 0;
-				newAlignmentSection.geometry.attributes.uv.array[ui+3] = 1;
-				newAlignmentSection.geometry.attributes.uv.array[ui+4] = len;
-				newAlignmentSection.geometry.attributes.uv.array[ui+5] = 0;
-			}
-		}
-		newAlignmentSection.meshtype = "section";
-    scope.mapdata.sectionlist.sections.datalist[alignmentCode].mesh = newAlignmentSection;
-		objectparent.add(newAlignmentSection);
+    let newSection = reCreatSection(newpointlist,oldobject);
+		newSection.meshtype = "section";
+    scope.mapdata.sectionlist.sections.datalist[alignmentCode].mesh = newSection;
+		objectparent.add(newSection);
   };
 
   //区段平整
@@ -493,6 +442,34 @@ export function JLmap3dEdit(dom, data, mapid) {
     for(let i=0;i<alignmentModel.railpoint.length;i++){
       newpointlist.push(new THREE.Vector3(alignmentModel.railpoint[i].x,alignmentModel.railpoint[0].y,alignmentModel.railpoint[i].z));
     }
+
+    let newSection = reCreatSection(newpointlist,oldobject);
+    newSection.meshtype = "section";
+    scope.mapdata.sectionlist.sections.datalist[alignmentCode].mesh = newSection;
+    objectparent.add(newSection);
+  }
+
+  //直区段修复
+  this.straightSection = function(alignmentCode){
+    let oldobject = scope.mapdata.sectionlist.sections.datalist[alignmentCode].mesh;
+    let alignmentModel = scope.mapdata.sectionlist.sections.datalist[alignmentCode];
+    let objectparent = oldobject.parent;
+    objectparent.remove(oldobject);
+
+    let newpointlist = [];
+    newpointlist.push(new THREE.Vector3(alignmentModel.railpoint[0].x,alignmentModel.railpoint[0].y,alignmentModel.railpoint[0].z));
+    newpointlist.push(new THREE.Vector3(alignmentModel.railpoint[1].x,alignmentModel.railpoint[0].y,alignmentModel.railpoint[0].z+0.001));
+    newpointlist.push(new THREE.Vector3(alignmentModel.railpoint[2].x,alignmentModel.railpoint[0].y,alignmentModel.railpoint[0].z));
+
+    // console.log(oldobject);
+
+    let newSection = reCreatSection(newpointlist,oldobject);
+    newSection.meshtype = "section";
+    scope.mapdata.sectionlist.sections.datalist[alignmentCode].mesh = newSection;
+    objectparent.add(newSection);
+  }
+
+  function reCreatSection(newpointlist,oldobject){
     let closedSpline = new THREE.CatmullRomCurve3(newpointlist);
     closedSpline.type = 'catmullrom';
     closedSpline.closed = false;
@@ -524,31 +501,29 @@ export function JLmap3dEdit(dom, data, mapid) {
     if(newpointlist.length>2){
       newAlignmentSection.lengthFact = newAlignmentSection.lengthFact/5;
     }
-
     let len = newAlignmentSection.lengthFact;
     // closedSpline.arcLengthDivisions;
     let count = newAlignmentSection.geometry.attributes.position.count/3;
+
     for(let i=0;i<count;i++){
-			let ui=i*6;
-			if(i%2 != 0){
-				newAlignmentSection.geometry.attributes.uv.array[ui] = 0;
-				newAlignmentSection.geometry.attributes.uv.array[ui+1] = 1;
-				newAlignmentSection.geometry.attributes.uv.array[ui+2] = len;
-				newAlignmentSection.geometry.attributes.uv.array[ui+3] = 1;
-				newAlignmentSection.geometry.attributes.uv.array[ui+4] = len;
-				newAlignmentSection.geometry.attributes.uv.array[ui+5] = 0;
-			}else{
-				newAlignmentSection.geometry.attributes.uv.array[ui] = 0;
-				newAlignmentSection.geometry.attributes.uv.array[ui+1] = 0;
-				newAlignmentSection.geometry.attributes.uv.array[ui+2] = 0;
-				newAlignmentSection.geometry.attributes.uv.array[ui+3] = 1;
-				newAlignmentSection.geometry.attributes.uv.array[ui+4] = len;
-				newAlignmentSection.geometry.attributes.uv.array[ui+5] = 0;
-			}
-		}
-    newAlignmentSection.meshtype = "section";
-    scope.mapdata.sectionlist.sections.datalist[alignmentCode].mesh = newAlignmentSection;
-    objectparent.add(newAlignmentSection);
+      let ui=i*6;
+      if(i%2 != 0){
+        newAlignmentSection.geometry.attributes.uv.array[ui] = 0;
+        newAlignmentSection.geometry.attributes.uv.array[ui+1] = 1;
+        newAlignmentSection.geometry.attributes.uv.array[ui+2] = len;
+        newAlignmentSection.geometry.attributes.uv.array[ui+3] = 1;
+        newAlignmentSection.geometry.attributes.uv.array[ui+4] = len;
+        newAlignmentSection.geometry.attributes.uv.array[ui+5] = 0;
+      }else{
+        newAlignmentSection.geometry.attributes.uv.array[ui] = 0;
+        newAlignmentSection.geometry.attributes.uv.array[ui+1] = 0;
+        newAlignmentSection.geometry.attributes.uv.array[ui+2] = 0;
+        newAlignmentSection.geometry.attributes.uv.array[ui+3] = 1;
+        newAlignmentSection.geometry.attributes.uv.array[ui+4] = len;
+        newAlignmentSection.geometry.attributes.uv.array[ui+5] = 0;
+      }
+    }
+    return newAlignmentSection;
   }
 
   //屏幕自适应
diff --git a/src/jlmap3d/edit/testEditorModel/SectionList.js b/src/jlmap3d/edit/testEditorModel/SectionList.js
index 6fe6cb09c..5f43109e3 100644
--- a/src/jlmap3d/edit/testEditorModel/SectionList.js
+++ b/src/jlmap3d/edit/testEditorModel/SectionList.js
@@ -335,8 +335,10 @@ export function SectionList() {
           for(let j=0,lenj=stopsections[i].reals.length;j<lenj;j++){
 
             let topnextpoint = {};
-
-            if(scope.sections.datalist[stopsections[i].reals[j].section.code].railpoint == 0){
+            console.log(stopsections[i].reals[j].section.code);
+            console.log(scope.sections.datalist[stopsections[i].reals[j].section.code]);
+            if(scope.sections.datalist[stopsections[i].reals[j].section.code].railpoint.length == 0){
+              let
               topnextpoint = {
                 x:scope.sections.datalist[stopsections[i].reals[0].section.code].railpoint[0].x,
                 y:0,
@@ -425,6 +427,9 @@ export function SectionList() {
     position.z = py;
     let len = scope.sections.datalist[start].lengthFact;
     let height = Math.random()/1000;
+    console.log(origin);
+    console.log(start);
+    console.log("++++++++++++++++++");
     scope.sections.datalist[start].railpoint = [
       new THREE.Vector3(position.x,height,position.z),
       new THREE.Vector3(position.x+0.5,height,position.z+0.0001),
@@ -496,12 +501,13 @@ export function SectionList() {
       y:0,
       z:position.z
     };
-    console.log(origin+"******************************");
-    console.log(start);
-    console.log(origin);
+    // console.log(origin+"******************************");
+    // console.log(start);
+    // console.log(origin);
+    console.log(scope.sections.datalist[start]);
     if(scope.sections.datalist[start].standTrack == true && start != origin){
-      console.log(start+"到达");
-      console.log("++++++++++++++++++++++++");
+      // console.log(start+"到达");
+      // console.log("++++++++++++++++++++++++");
       return ;
     }else if(scope.sections.datalist[start].rsection == undefined){
       return ;
@@ -1021,7 +1027,7 @@ export function SectionList() {
         let ccode = switch2d[i].sectionCCode;
         // console.log(switchdata[i]);
 
-
+        console.log(scope.sections.datalist[acode]);
         let aposx = (scope.sections.datalist[acode].points[0].x + scope.sections.datalist[acode].points[scope.sections.datalist[acode].pointslength].x)/2;
         let cposx = (scope.sections.datalist[ccode].points[0].x + scope.sections.datalist[ccode].points[scope.sections.datalist[ccode].pointslength].x)/2;
 
diff --git a/src/jlmap3d/edit/testEditorModel/SignalList.js b/src/jlmap3d/edit/testEditorModel/SignalList.js
index 49e9271c7..606fb257d 100644
--- a/src/jlmap3d/edit/testEditorModel/SignalList.js
+++ b/src/jlmap3d/edit/testEditorModel/SignalList.js
@@ -46,44 +46,55 @@ export function SignalList() {
             }
             let section = sectiondata[data[i].sectionCode];
             let posx = null;
-
-            if(data[i].sectionOffset > section.lengthFact/2){
-              posx = section.mesh.position.x + data[i].sectionOffset - section.lengthFact/2;
-            }else{
-              posx = section.mesh.position.x - (section.lengthFact/2 - data[i].sectionOffset);
+            if(section.lsection == undefined){
+              section = sectiondata[section.rsection];
+              data[i].sectionOffset = section.lengthFact;
+              data[i].sectionCode = section.rsection;
             }
-            //根据线路方向修改信号灯位置
-            if(data[i].right == false){
-              if(section.standTrack == true){
-                posx = posx - 7;
-              }
-
-              newmesh.position.set(posx,0,section.mesh.position.z-3);
-              newmesh.rotation.z = ( Math.PI / 2 );
-            }else if(data[i].right == true){
-              if(section.standTrack == true){
-                posx = posx + 7;
-              }
-              newmesh.position.set(posx,0,section.mesh.position.z+3);
-              newmesh.rotation.z = ( - Math.PI / 2 );
+            if(section.rsection == undefined){
+              section = sectiondata[section.lsection];
+              data[i].sectionOffset = 0;
+              data[i].sectionCode = section.rsection;
             }
-            newmesh.scale.x = 0.05;
-            newmesh.scale.y = 0.05;
-            newmesh.scale.z = 0.05;
-            newmesh.sectionOffset = data[i].sectionOffset;
-            newmesh.sectionCode = data[i].sectionCode;
-            newmesh.right = data[i].right;
-            newsignal.mesh = newmesh;
 
-            newsignal.sectionOffset = data[i].sectionOffset;
-            newsignal.mesh.status = "01";
-            newsignal.name = data[i].name;
-            newsignal.modelid = assetloader.modellist[num].id;
-            newsignal.code = data[i].code;
-            newsignal.sectionCode = data[i].sectionCode;
-            newsignal.right = data[i].right;
-            scope.group.add(newmesh);
-            scope.list.push(newsignal);
+              if(data[i].sectionOffset > section.lengthFact/2){
+                posx = section.mesh.position.x + data[i].sectionOffset - section.lengthFact/2;
+              }else{
+                posx = section.mesh.position.x - (section.lengthFact/2 - data[i].sectionOffset);
+              }
+              //根据线路方向修改信号灯位置
+              if(data[i].right == false){
+                if(section.standTrack == true){
+                  posx = posx - 7;
+                }
+
+                newmesh.position.set(posx,0,section.mesh.position.z-3);
+                newmesh.rotation.z = ( Math.PI / 2 );
+              }else if(data[i].right == true){
+                if(section.standTrack == true){
+                  posx = posx + 7;
+                }
+                newmesh.position.set(posx,0,section.mesh.position.z+3);
+                newmesh.rotation.z = ( - Math.PI / 2 );
+              }
+              newmesh.scale.x = 0.05;
+              newmesh.scale.y = 0.05;
+              newmesh.scale.z = 0.05;
+              newmesh.sectionOffset = data[i].sectionOffset;
+              newmesh.sectionCode = data[i].sectionCode;
+              newmesh.right = data[i].right;
+              newsignal.mesh = newmesh;
+
+              newsignal.sectionOffset = data[i].sectionOffset;
+              newsignal.mesh.status = "01";
+              newsignal.name = data[i].name;
+              newsignal.modelid = assetloader.modellist[num].id;
+              newsignal.code = data[i].code;
+              newsignal.sectionCode = data[i].sectionCode;
+              newsignal.right = data[i].right;
+              scope.group.add(newmesh);
+              scope.list.push(newsignal);
+
 
           }else{
             for(let j=0;j<assetloader.modellist.length;j++){
diff --git a/src/jlmap3d/jl3ddevice/component/moveanimate.js b/src/jlmap3d/jl3ddevice/component/moveanimate.js
index b66cfaf10..0b2f8a14f 100644
--- a/src/jlmap3d/jl3ddevice/component/moveanimate.js
+++ b/src/jlmap3d/jl3ddevice/component/moveanimate.js
@@ -1,7 +1,7 @@
-
+//转辙机动画
 export function Moveanimate(main){
   let scope = this;
-
+  //内容信息显示plane
   this.helpbox = null;
   this.textplane = null;
   //动画列表
@@ -14,9 +14,8 @@ export function Moveanimate(main){
   this.status = true;
   //当前动画模型
   this.nowmodelname = undefined;
+  //定义转辙机零件动画
   this.initlistnew = function(switchmodel){
-
-
     scope.animatelist[switchmodel.animacode+"chaijie"] = [];
     scope.animatelist[switchmodel.animacode+"fuwei"] = [];
     for(let i=0,leni=switchmodel.children.length;i<leni;i++){
@@ -29,8 +28,6 @@ export function Moveanimate(main){
         points2.push(new THREE.Vector3(switchmodel.children[i].position.x-1.5,switchmodel.children[i].position.y,switchmodel.children[i].position.z));
         points2.push(new THREE.Vector3(switchmodel.children[i].position.x,switchmodel.children[i].position.y,switchmodel.children[i].position.z));
         scope.initanimate(scope.animatelist[switchmodel.animacode+"fuwei"],switchmodel.children[i],switchmodel.name+"dizuooff",points2,0.5,true,0);
-
-
       }
       if(switchmodel.children[i].name == "DJZ"){
         let points1 = [];
@@ -186,7 +183,6 @@ export function Moveanimate(main){
     // scope.initanimate(switchmodel.children[i],switchmodel.name+"select1",points,true);
     let modelorderlist = [];
 
-
     modelorderlist[switchmodel.animacode] = [
       {name:"SZ",pos:[-1.5,0,-1]},
       {name:"DINGK",pos:[0,9,0]},
@@ -194,8 +190,6 @@ export function Moveanimate(main){
       {name:"DJZ",pos:[-3,0,0]},
       {name:"DDJ",pos:[-1.5,0,0]},
 
-
-
       {name:"JSQ",pos:[-3,3,0]},
 
       {name:"ZDKBQ",pos:[0,3,0]},
@@ -210,48 +204,45 @@ export function Moveanimate(main){
 
       {name:"BSG",pos:[1,0,-5]},
       {name:"DZG",pos:[-1,0,-5]}
-
-
-
     ];
 
-      scope.animatelist[switchmodel.animacode+"on"] = [];
-      scope.animatelist[switchmodel.animacode+"off"] = [];
-      for(let i=0,leni=modelorderlist[switchmodel.animacode].length;i<leni;i++){
+    scope.animatelist[switchmodel.animacode+"on"] = [];
+    scope.animatelist[switchmodel.animacode+"off"] = [];
 
-        let orderdata = modelorderlist[switchmodel.animacode];
-        let modelon = switchmodel.getObjectByName(orderdata[i].name);
-        // modelon.helpbox = undefined;
-        let pointson = [];
-        pointson.push(new THREE.Vector3(modelon.position.x,modelon.position.y,modelon.position.z));
-        pointson.push(new THREE.Vector3(modelon.position.x+orderdata[i].pos[0],modelon.position.y+orderdata[i].pos[1],modelon.position.z+orderdata[i].pos[2]));
+    for(let i=0,leni=modelorderlist[switchmodel.animacode].length;i<leni;i++){
 
-        let pointsoff = [];
-        pointsoff.push(new THREE.Vector3(modelon.position.x+orderdata[i].pos[0],modelon.position.y+orderdata[i].pos[1],modelon.position.z+orderdata[i].pos[2]));
-        pointsoff.push(new THREE.Vector3(modelon.position.x,modelon.position.y,modelon.position.z));
+      let orderdata = modelorderlist[switchmodel.animacode];
+      let modelon = switchmodel.getObjectByName(orderdata[i].name);
+      // modelon.helpbox = undefined;
+      let pointson = [];
+      pointson.push(new THREE.Vector3(modelon.position.x,modelon.position.y,modelon.position.z));
+      pointson.push(new THREE.Vector3(modelon.position.x+orderdata[i].pos[0],modelon.position.y+orderdata[i].pos[1],modelon.position.z+orderdata[i].pos[2]));
 
-        // if(i == 0){
-        scope.initanimate(scope.animatelist[switchmodel.animacode+"on"],modelon,switchmodel.animacode+modelon.name+"on",pointson,0.03,true,i);
-        scope.initanimate(scope.animatelist[switchmodel.animacode+"off"],modelon,switchmodel.animacode+modelon.name+"off",pointsoff,0.03,true,leni-i-1);
-        // }else if((i+1)<leni){
-        //   scope.initanimate(modelon,switchmodel.animacode+modelon.name+"on",pointson,0.03,true,switchmodel.animacode+orderdata[i+1].name+"on");
-        //   scope.initanimate(modelon,switchmodel.animacode+modelon.name+"off",pointsoff,0.03,true,switchmodel.animacode+orderdata[i-1].name+"off");
-        // }else{
-        //   scope.initanimate(modelon,switchmodel.animacode+modelon.name+"on",pointson,0.03,true);
-        //   scope.initanimate(modelon,switchmodel.animacode+modelon.name+"off",pointsoff,0.03,true,switchmodel.animacode+orderdata[i-1].name+"off");
-        // }
+      let pointsoff = [];
+      pointsoff.push(new THREE.Vector3(modelon.position.x+orderdata[i].pos[0],modelon.position.y+orderdata[i].pos[1],modelon.position.z+orderdata[i].pos[2]));
+      pointsoff.push(new THREE.Vector3(modelon.position.x,modelon.position.y,modelon.position.z));
 
-        // if(switchmodel.children[i].name == "xinpian"){
-        // }
-        // if(switchmodel.children[i].name =="cigang"){
-        // }
-      }
+      // if(i == 0){
+      scope.initanimate(scope.animatelist[switchmodel.animacode+"on"],modelon,switchmodel.animacode+modelon.name+"on",pointson,0.03,true,i);
+      scope.initanimate(scope.animatelist[switchmodel.animacode+"off"],modelon,switchmodel.animacode+modelon.name+"off",pointsoff,0.03,true,leni-i-1);
+      // }else if((i+1)<leni){
+      //   scope.initanimate(modelon,switchmodel.animacode+modelon.name+"on",pointson,0.03,true,switchmodel.animacode+orderdata[i+1].name+"on");
+      //   scope.initanimate(modelon,switchmodel.animacode+modelon.name+"off",pointsoff,0.03,true,switchmodel.animacode+orderdata[i-1].name+"off");
+      // }else{
+      //   scope.initanimate(modelon,switchmodel.animacode+modelon.name+"on",pointson,0.03,true);
+      //   scope.initanimate(modelon,switchmodel.animacode+modelon.name+"off",pointsoff,0.03,true,switchmodel.animacode+orderdata[i-1].name+"off");
+      // }
+
+      // if(switchmodel.children[i].name == "xinpian"){
+      // }
+      // if(switchmodel.children[i].name =="cigang"){
+      // }
+    }
   }
   //动画对象定义
   this.initanimate = function(list,modelobject,name,points,speed,type,nextname){
 
     let curve =  new THREE.CatmullRomCurve3(points);
-
     // curve动画轨迹
     // progress动画进度
     // enable当前动画开关
@@ -273,14 +264,9 @@ export function Moveanimate(main){
     }
     list[nextname].push(animate);
 
-    if(nextname){
-      // list[nextname] = animate;
-      // animate.next = nextname;
-    }else{
-      // list.push(animate);
-    }
-
   }
+
+  //设置动画播放列表
   this.setplaylist = function(nowlist,enable){
 
     scope.playlist = nowlist;
@@ -290,6 +276,8 @@ export function Moveanimate(main){
       scope.playlist[scope.playorder][i].status = "start";
     }
   }
+
+  //更新信息plane内容
   this.updatehelpbox = function(nowhelpbox,nowtextplane){
     scope.textplane = nowtextplane;
     scope.helpbox = nowhelpbox;
@@ -298,15 +286,17 @@ export function Moveanimate(main){
   this.startstop = function(){
 
   }
+
   this.next = function(){
 
   }
+
   this.before = function(){
 
   }
+
   //动画播放器
   this.animateupdate = function(){
-    // console.log(scope.animatelist);
 
     if(scope.enable){
       if(scope.playlist){
@@ -325,7 +315,6 @@ export function Moveanimate(main){
             scope.playlist[scope.playorder][i].status = "end";
             scope.playlist[scope.playorder][i].progress = 0;
 
-
             if(i >= scope.playlist[scope.playorder].length-1){
               if(scope.playorder >= scope.playlist.length-1 ){
                 scope.playlist = null;
@@ -340,7 +329,6 @@ export function Moveanimate(main){
               }
             }
 
-
           }else{
             // console.log(scope.animatelist[k].connectmodel);
             if(scope.nowmodelname != scope.playlist[scope.playorder][i].connectmodel.name){
@@ -383,5 +371,4 @@ export function Moveanimate(main){
     }
   }
 
-
 }
diff --git a/src/jlmap3d/jl3ddevice/component/signallight.js b/src/jlmap3d/jl3ddevice/component/signallight.js
index 6bb3178f4..9648653c5 100644
--- a/src/jlmap3d/jl3ddevice/component/signallight.js
+++ b/src/jlmap3d/jl3ddevice/component/signallight.js
@@ -1,8 +1,8 @@
 import { JL3D_LOCAL_STATIC } from '@/api/jlmap3d/assets3d.js';
 
+//信号机贴图
 export function Signallightload(lights) {
 
-
   settexture(lights, "red", JL3D_LOCAL_STATIC+'/MODEL/device/signal/1.jpg');
 
   settexture(lights, "yellow", JL3D_LOCAL_STATIC+'/MODEL/device/signal/2.jpg');
@@ -12,6 +12,7 @@ export function Signallightload(lights) {
   settexture(lights, "black", JL3D_LOCAL_STATIC+'/MODEL/device/signal/4.jpg');
 }
 
+//加载贴图
 function settexture(lights, name, textureurl) {
   var loader = new THREE.TextureLoader();
 
diff --git a/src/jlmap3d/jl3ddevice/component/textconfig.js b/src/jlmap3d/jl3ddevice/component/textconfig.js
index 1c6545f04..1c9a86ca5 100644
--- a/src/jlmap3d/jl3ddevice/component/textconfig.js
+++ b/src/jlmap3d/jl3ddevice/component/textconfig.js
@@ -4,13 +4,6 @@ export function Textconfig(){
 
   this.devicelist = [];
 
-  this.jdqinit = function(){
-
-  }
-
-  this.jdqraycast = function(){
-
-  }
 
   //配置继电器文字信息
   this.initdevicetext = function(selectmodel){
diff --git a/src/jlmap3d/jl3ddevice/jl3ddevice.js b/src/jlmap3d/jl3ddevice/jl3ddevice.js
deleted file mode 100644
index cdb2723cb..000000000
--- a/src/jlmap3d/jl3ddevice/jl3ddevice.js
+++ /dev/null
@@ -1,729 +0,0 @@
-import { Staticmodel } from '@/jlmap3d/jl3ddevice/config.js';
-import { JL3D_LOCAL_STATIC } from '@/api/jlmap3d/assets3d.js';
-
-//loader
-import { FBXLoader } from '@/jlmap3d/main/loaders/FBXLoader';
-import { OrbitControls } from '@/jlmap3d/main/control/OrbitControls';
-
-import { ModelManager } from '@/jlmap3d/jl3ddevice/loader.js';
-import { Signallightload } from '@/jlmap3d/jl3ddevice/component/signallight.js';
-import { Moveanimate } from '@/jlmap3d/jl3ddevice/component/moveanimate.js';
-import { Textconfig } from '@/jlmap3d/jl3ddevice/component/textconfig.js';
-import StompClient from '@/utils/sock';
-
-var clock = new THREE.Clock();
-export function Jl3ddevice(dom,group,token) {
-	var scope = this;
-
-	this.dom = dom;
-	this.nowcode = null;
-	this.animateswitch = false;
-	this.signallights = [];
-	Signallightload(this.signallights);
-	this.mixers = [];
-	this.showmodel = null;
-
-	//新数据交互
-	let helpbox,textplane;
-	let daochamodel;
-	//点击事件状态
-	this.raycasterstatus = false;
-	//动画状态
-	this.animastats = false;
-	//当前选中模型
-	this.nowobject = null;
-	//当前动画播放模型
-	this.animationmodel = null;
-	this.devicetext = new Textconfig();
-	this.windowstatus = '0';
-
-	//初始化webgl渲染
-	this.renderer = new THREE.WebGLRenderer({ antialias: true });
-
-	this.renderer.setClearColor(new THREE.Color(0x000000));
-	this.renderer.setSize(dom.offsetWidth, dom.offsetHeight);
-	this.renderer.shadowMap.enabled = true;
-	this.renderer.shadowMap.type = THREE.PCFSoftShadowMap;
-	this.dom.appendChild(this.renderer.domElement);
-
-	//定义相机
-
-	this.camera = new THREE.PerspectiveCamera(70, dom.offsetWidth / dom.offsetHeight, 0.01, 120);
-	this.camera.position.set(0, 20, 30);
-	this.camera.aspect = dom.offsetWidth / dom.offsetHeight;
-	this.camera.updateProjectionMatrix();
-	//定义场景(渲染容器)
-	this.scene = new THREE.Scene();
-	this.scene.background = new THREE.Color(0xa0a0a0);
-
-	var mesh = new THREE.Mesh(new THREE.PlaneBufferGeometry(200, 200), new THREE.MeshPhongMaterial({ color: 0x999999, depthWrite: false }));
-	mesh.rotation.x = - Math.PI / 2;
-	mesh.receiveShadow = true;
-	this.scene.add(mesh);
-
-	var grid = new THREE.GridHelper(200, 20, 0x000000, 0x000000);
-	grid.material.opacity = 0.2;
-	grid.material.transparent = true;
-	this.scene.add(grid);
-
-
-	//定义全局光
-	let ambientLight = new THREE.AmbientLight(0xffffff, 1.3);
-	this.scene.add(ambientLight);
-
-
-	var spotLight = new THREE.SpotLight(0xffffff);
-	spotLight.position.set(-50, 60, 15);
-	spotLight.castShadow = true;
-	spotLight.shadow.mapSize.width = 1024;
-	spotLight.shadow.mapSize.height = 1024;
-	this.scene.add(spotLight);
-
-
-
-	this.controls = new THREE.OrbitControls(this.camera, dom);
-	this.controls.maxPolarAngle = Math.PI / 2;
-	this.controls.minPolarangle = Math.PI / 5;
-	this.controls.maxDistance = 80;
-	this.controls.update();
-	this.selectmodel = null;
-
-	let moveanima = new Moveanimate(scope);
-	document.addEventListener( "mousedown", onselect, false );
-
-
-	let teststomp = new StompClient();
-	let topic = '/user/topic/simulation/assistant/'+group;
-	// let topic = '/user/queue/simulation/jl3d/'+group;
-	let header = {'X-Token': token};
-	try {
-		// console.log("teststomp");
-		teststomp.subscribe(topic, callback, header);
-	} catch (error) {
-		console.error('websocket订阅失败');
-	}
-
-	function callback(Response) {
-		let data = JSON.parse(Response.body);
-		if(scope.nowcode != data.body.code){
-			scope.nowcode = data.body.code;
-			scope.selectmodel(data);
-		}else{
-			scope.updateaction(data);
-		}
-
-	}
-	window.onresize = function () {
-		scope.camera.aspect = scope.dom.offsetWidth / scope.dom.offsetHeight;
-		scope.camera.updateProjectionMatrix();
-		scope.renderer.setSize(scope.dom.offsetWidth, scope.dom.offsetHeight);
-	}
-	this.domresize = function(){
-		scope.camera.aspect = scope.dom.offsetWidth / scope.dom.offsetHeight;
-		scope.camera.updateProjectionMatrix();
-		scope.renderer.setSize(scope.dom.offsetWidth, scope.dom.offsetHeight);
-	}
-	this.anime = null;
-
-	this.modelmanager = new ModelManager();
-	this.modelmanager.loadpromise(Staticmodel, scope.mixers).then(function (data) {
-		moveanima.initlistnew(scope.modelmanager.switchmodel.mesh);
-		daochamodel = scope.modelmanager.switchmodel.mesh.getObjectByName("DAOCHA");
-
-		animate();
-	})
-
-	//循环渲染函数
-	function animate() {
-
-		scope.anime = requestAnimationFrame(animate);
-		scope.renderer.render(scope.scene, scope.camera);
-		scope.controls.update();
-		//scope.camera.lookAt(plane);
-		//
-		moveanima.animateupdate();
-		let delta = clock.getDelta();
-		if (scope.mixers) {
-			for (let i = 0; i < scope.mixers.length; i++) {
-				if (scope.mixers[i]) {
-					scope.mixers[i].update(delta);
-				}
-			}
-		}
-
-
-	}
-
-	this.selectmodel = function (data) {
-		if (scope.showmodel) {
-			scope.nowcode  = data.body.code;
-			if (scope.showmodel.code != data.body.code) {
-				scope.scene.remove(scope.showmodel);
-				scope.showmodel = null
-
-				if (data.body._type == "Switch") {
-					scope.modelmanager.switchmodel.locateType = data.body.locateType;
-					scope.modelmanager.switchmodel.code = data.body.code;
-
-					scope.showmodel = scope.modelmanager.switchmodel.mesh;
-					scope.scene.add(scope.showmodel);
-
-					scope.devicetext.initdevicetext(scope.modelmanager.switchmodel.mesh);
-					scope.nowobject = scope.modelmanager.switchmodel.mesh;
-					updatemenulist(scope.devicetext.devicelist);
-					scope.raycasterstatus = true;
-
-				}else{
-					scope.raycasterstatus = false;
-					scope.nowobject = "";
-					updatemenulist();
-				}
-
-				if (data.body._type == "Signal") {
-					scope.modelmanager.signalmodel.code = data.body.code;
-
-					scope.showmodel = scope.modelmanager.signalmodel.mesh;
-					scope.scene.add(scope.showmodel);
-
-				}
-
-				if (data.body._type == "StationStand") {
-
-					scope.modelmanager.standmodel.code = data.body.code;
-
-					scope.showmodel = scope.modelmanager.standmodel.mesh;
-					scope.scene.add(scope.showmodel);
-				}
-
-				if(scope.showmodel){
-					scope.resetmodel();
-					scope.showmodel.code = data.code;
-					initstatus(data);
-				}
-
-			}
-		} else {
-			if (data.body._type == "Switch") {
-				scope.modelmanager.switchmodel.locateType = data.body.locateType;
-				scope.modelmanager.switchmodel.code = data.body.code;
-				scope.showmodel = scope.modelmanager.switchmodel.mesh;
-				scope.scene.add(scope.showmodel);
-
-				scope.devicetext.initdevicetext(scope.modelmanager.switchmodel.mesh);
-				scope.nowobject = scope.modelmanager.switchmodel.mesh;
-				updatemenulist(scope.devicetext.devicelist);
-				scope.raycasterstatus = true;
-				if (data.body.locateType == "01") {
-					scope.modelmanager.switchmodel.locateType = "01";
-					scope.modelmanager.switchmodel.action.reset();
-					scope.modelmanager.switchmodel.action.time = 0;
-					scope.modelmanager.switchmodel.action.timeScale = -1;
-					scope.modelmanager.switchmodel.action.play();
-
-				} else if (data.body.locateType == "02") {
-					scope.modelmanager.switchmodel.locateType = "02";
-					scope.modelmanager.switchmodel.action.reset();
-					scope.modelmanager.switchmodel.action.time = scope.modelmanager.switchmodel.action._clip.duration;
-					scope.modelmanager.switchmodel.action.timeScale = 1;
-					scope.modelmanager.switchmodel.action.play();
-
-				}
-
-			}else{
-				scope.raycasterstatus = false;
-				scope.nowobject = "";
-				updatemenulist();
-			}
-			if (data.body._type == "Signal") {
-				scope.modelmanager.signalmodel.code = data.body.code;
-				scope.showmodel = scope.modelmanager.signalmodel.mesh;
-				scope.scene.add(scope.showmodel);
-			}
-
-			if (data.body._type == "StationStand") {
-				scope.modelmanager.standmodel.code = data.body.code;
-				scope.showmodel = scope.modelmanager.standmodel.mesh;
-				scope.scene.add(scope.showmodel);
-			}
-			initstatus(data);
-		}
-
-
-	}
-
-	this.updateaction = function (data) {
-
-		if (data.body._type == "Switch") {
-			if (data.body.code == scope.modelmanager.switchmodel.code) {
-				if (scope.modelmanager.switchmodel.locateType != data.body.locateType) {
-					if (data.body.locateType == "03" && scope.modelmanager.switchmodel.locateType == "01") {
-
-						scope.modelmanager.switchmodel.locateType = "02";
-						scope.modelmanager.switchmodel.action.reset();
-						scope.modelmanager.switchmodel.action.time = 0;
-						scope.modelmanager.switchmodel.action.timeScale = 1;
-						scope.modelmanager.switchmodel.action.play();
-
-					} else if (data.body.locateType == "03" && scope.modelmanager.switchmodel.locateType == "02") {
-
-						scope.modelmanager.switchmodel.locateType = "01";
-						scope.modelmanager.switchmodel.action.reset();
-						scope.modelmanager.switchmodel.action.time = scope.modelmanager.switchmodel.action._clip.duration;
-						scope.modelmanager.switchmodel.action.timeScale = -1;
-						scope.modelmanager.switchmodel.action.play();
-
-					}
-				}
-			}
-
-		}
-		if (data.body._type == "Signal") {//从上往下红绿黄
-			if (data.body.code == scope.modelmanager.signalmodel.code) {
-				scope.modelmanager.signalmodel.status = data.body.status;
-
-				if (data.body.lightType == "01") {
-
-					if (data.body.status == "01") {
-						scope.modelmanager.signalmodel.mesh.children[0].material.map = scope.signallights["red"];
-						scope.modelmanager.signalmodel.mesh.children[0].material.map.needsUpdate = true;
-						scope.modelmanager.signalmodel.mesh.children[1].material.map = scope.signallights["black"];
-						scope.modelmanager.signalmodel.mesh.children[1].material.map.needsUpdate = true;
-						scope.modelmanager.signalmodel.mesh.children[2].material.map = scope.signallights["black"];
-						scope.modelmanager.signalmodel.mesh.children[2].material.map.needsUpdate = true;
-					}
-					//开放
-					if (data.body.status == "02") {
-						scope.modelmanager.signalmodel.mesh.children[0].material.map = scope.signallights["black"];
-						scope.modelmanager.signalmodel.mesh.children[0].material.map.needsUpdate = true;
-						scope.modelmanager.signalmodel.mesh.children[1].material.map = scope.signallights["black"];
-						scope.modelmanager.signalmodel.mesh.children[1].material.map.needsUpdate = true;
-						scope.modelmanager.signalmodel.mesh.children[2].material.map = scope.signallights["green"];
-						scope.modelmanager.signalmodel.mesh.children[2].material.map.needsUpdate = true;
-					}
-					//开放侧向
-					if (data.body.status == "03") {
-						scope.modelmanager.signalmodel.mesh.children[0].material.map = scope.signallights["black"];
-						scope.modelmanager.signalmodel.mesh.children[0].material.map.needsUpdate = true;
-						scope.modelmanager.signalmodel.mesh.children[1].material.map = scope.signallights["yellow"];
-						scope.modelmanager.signalmodel.mesh.children[1].material.map.needsUpdate = true;
-						scope.modelmanager.signalmodel.mesh.children[2].material.map = scope.signallights["black"];
-						scope.modelmanager.signalmodel.mesh.children[2].material.map.needsUpdate = true;
-					}
-					//引导
-					if (data.body.status == "04") {
-						scope.modelmanager.signalmodel.mesh.children[0].material.map = scope.signallights["red"];
-						scope.modelmanager.signalmodel.mesh.children[0].material.map.needsUpdate = true;
-						scope.modelmanager.signalmodel.mesh.children[1].material.map = scope.signallights["yellow"];
-						scope.modelmanager.signalmodel.mesh.children[1].material.map.needsUpdate = true;
-						scope.modelmanager.signalmodel.mesh.children[2].material.map = scope.signallights["black"];
-						scope.modelmanager.signalmodel.mesh.children[2].material.map.needsUpdate = true;
-					}
-					//封锁
-					if (data.body.status == "05") {
-						scope.modelmanager.signalmodel.mesh.children[0].material.map = scope.signallights["black"];
-						scope.modelmanager.signalmodel.mesh.children[0].material.map.needsUpdate = true;
-						scope.modelmanager.signalmodel.mesh.children[1].material.map = scope.signallights["black"];
-						scope.modelmanager.signalmodel.mesh.children[1].material.map.needsUpdate = true;
-						scope.modelmanager.signalmodel.mesh.children[2].material.map = scope.signallights["black"];
-						scope.modelmanager.signalmodel.mesh.children[2].material.map.needsUpdate = true;
-					}
-					//故障
-					if (data.body.status == "06") {
-						scope.modelmanager.signalmodel.mesh.children[0].material.map = scope.signallights["black"];
-						scope.modelmanager.signalmodel.mesh.children[0].material.map.needsUpdate = true;
-						scope.modelmanager.signalmodel.mesh.children[1].material.map = scope.signallights["black"];
-						scope.modelmanager.signalmodel.mesh.children[1].material.map.needsUpdate = true;
-						scope.modelmanager.signalmodel.mesh.children[2].material.map = scope.signallights["black"];
-						scope.modelmanager.signalmodel.mesh.children[2].material.map.needsUpdate = true;
-					}
-
-				} else if (data.body.lightType == "02") {
-					scope.modelmanager.signalmodel.mesh.children[0].material.map = scope.signallights["black"];
-					scope.modelmanager.signalmodel.mesh.children[0].material.map.needsUpdate = true;
-					scope.modelmanager.signalmodel.mesh.children[1].material.map = scope.signallights["black"];
-					scope.modelmanager.signalmodel.mesh.children[1].material.map.needsUpdate = true;
-					scope.modelmanager.signalmodel.mesh.children[2].material.map = scope.signallights["black"];
-					scope.modelmanager.signalmodel.mesh.children[2].material.map.needsUpdate = true;
-				}
-			}
-
-		}
-
-
-		if (data.body._type == "StationStand") {
-			if (data.body.code == scope.modelmanager.standmodel.code) {
-				if (data.body.screenDoorOpenStatus == "02" && scope.modelmanager.standmodel.screenDoorOpenStatus == "01") {
-					scope.modelmanager.standmodel.screenDoorOpenStatus = "00";
-				}
-				if (data.body.screenDoorOpenStatus == "02" && scope.modelmanager.standmodel.screenDoorOpenStatus == "00") {
-					scope.modelmanager.standmodel.screenDoorOpenStatus = "02";
-
-					scope.modelmanager.standmodel.action.reset();
-					scope.modelmanager.standmodel.action.time = 0;
-					scope.modelmanager.standmodel.action.timeScale = 1;
-					scope.modelmanager.standmodel.action.play();
-				}
-
-				if (data.body.screenDoorOpenStatus == "01" && scope.modelmanager.standmodel.screenDoorOpenStatus == "02") {
-					scope.modelmanager.standmodel.screenDoorOpenStatus = "00";
-				}
-				if (data.body.screenDoorOpenStatus == "01" && scope.modelmanager.standmodel.screenDoorOpenStatus == "00") {
-					scope.modelmanager.standmodel.screenDoorOpenStatus = "01";
-
-					scope.modelmanager.standmodel.action.reset();
-					scope.modelmanager.standmodel.action.time = scope.modelmanager.standmodel.action._clip.duration;
-					scope.modelmanager.standmodel.action.timeScale = -1;
-					scope.modelmanager.standmodel.action.play();
-				}
-			}
-
-		}
-		// scope.showmodel.
-	}
-
-	function initstatus(data) {
-
-		if (data.body._type == "Switch") {
-
-			if (data.body.locateType == "01") {
-				scope.modelmanager.switchmodel.locateType = "01";
-				scope.modelmanager.switchmodel.action.reset();
-				scope.modelmanager.switchmodel.action.time = 0;
-				scope.modelmanager.switchmodel.action.timeScale = -1;
-				scope.modelmanager.switchmodel.action.play();
-
-			} else if (data.body.locateType == "02") {
-				scope.modelmanager.switchmodel.locateType = "02";
-				scope.modelmanager.switchmodel.action.reset();
-				scope.modelmanager.switchmodel.action.time = scope.modelmanager.switchmodel.action._clip.duration;
-				scope.modelmanager.switchmodel.action.timeScale = 1;
-				scope.modelmanager.switchmodel.action.play();
-
-			}
-
-
-		}
-
-		if (data.body._type == "Signal") {
-			if (data.body.lightType == "01") {
-
-				if (data.body.status == "01") {
-					scope.modelmanager.signalmodel.mesh.children[0].material.map = scope.signallights["red"];
-					scope.modelmanager.signalmodel.mesh.children[0].material.map.needsUpdate = true;
-					scope.modelmanager.signalmodel.mesh.children[1].material.map = scope.signallights["black"];
-					scope.modelmanager.signalmodel.mesh.children[1].material.map.needsUpdate = true;
-					scope.modelmanager.signalmodel.mesh.children[2].material.map = scope.signallights["black"];
-					scope.modelmanager.signalmodel.mesh.children[2].material.map.needsUpdate = true;
-				}
-				//开放
-				if (data.body.status == "02") {
-					scope.modelmanager.signalmodel.mesh.children[0].material.map = scope.signallights["black"];
-					scope.modelmanager.signalmodel.mesh.children[0].material.map.needsUpdate = true;
-					scope.modelmanager.signalmodel.mesh.children[1].material.map = scope.signallights["green"];
-					scope.modelmanager.signalmodel.mesh.children[1].material.map.needsUpdate = true;
-					scope.modelmanager.signalmodel.mesh.children[2].material.map = scope.signallights["black"];
-					scope.modelmanager.signalmodel.mesh.children[2].material.map.needsUpdate = true;
-				}
-				if (data.body.switchLocateType == "03") {
-					scope.modelmanager.signalmodel.mesh.children[0].material.map = scope.signallights["black"];
-					scope.modelmanager.signalmodel.mesh.children[0].material.map.needsUpdate = true;
-					scope.modelmanager.signalmodel.mesh.children[1].material.map = scope.signallights["black"];
-					scope.modelmanager.signalmodel.mesh.children[1].material.map.needsUpdate = true;
-					scope.modelmanager.signalmodel.mesh.children[2].material.map = scope.signallights["yellow"];
-					scope.modelmanager.signalmodel.mesh.children[2].material.map.needsUpdate = true;
-				}
-				//引导
-				if (data.body.status == "03") {
-					scope.modelmanager.signalmodel.mesh.children[0].material.map = scope.signallights["red"];
-					scope.modelmanager.signalmodel.mesh.children[0].material.map.needsUpdate = true;
-					scope.modelmanager.signalmodel.mesh.children[1].material.map = scope.signallights["black"];
-					scope.modelmanager.signalmodel.mesh.children[1].material.map.needsUpdate = true;
-					scope.modelmanager.signalmodel.mesh.children[2].material.map = scope.signallights["yellow"];
-					scope.modelmanager.signalmodel.mesh.children[2].material.map.needsUpdate = true;
-				}
-				//封锁
-				if (data.body.status == "04") {
-					scope.modelmanager.signalmodel.mesh.children[0].material.map = scope.signallights["black"];
-					scope.modelmanager.signalmodel.mesh.children[0].material.map.needsUpdate = true;
-					scope.modelmanager.signalmodel.mesh.children[1].material.map = scope.signallights["black"];
-					scope.modelmanager.signalmodel.mesh.children[1].material.map.needsUpdate = true;
-					scope.modelmanager.signalmodel.mesh.children[2].material.map = scope.signallights["black"];
-					scope.modelmanager.signalmodel.mesh.children[2].material.map.needsUpdate = true;
-				}
-				//故障
-				if (data.body.status == "05") {
-					scope.modelmanager.signalmodel.mesh.children[0].material.map = scope.signallights["black"];
-					scope.modelmanager.signalmodel.mesh.children[0].material.map.needsUpdate = true;
-					scope.modelmanager.signalmodel.mesh.children[1].material.map = scope.signallights["black"];
-					scope.modelmanager.signalmodel.mesh.children[1].material.map.needsUpdate = true;
-					scope.modelmanager.signalmodel.mesh.children[2].material.map = scope.signallights["black"];
-					scope.modelmanager.signalmodel.mesh.children[2].material.map.needsUpdate = true;
-				}
-
-			} else if (data.body.lightType == "02") {
-				scope.modelmanager.signalmodel.mesh.children[0].material.map = scope.signallights["black"];
-				scope.modelmanager.signalmodel.mesh.children[0].material.map.needsUpdate = true;
-				scope.modelmanager.signalmodel.mesh.children[1].material.map = scope.signallights["black"];
-				scope.modelmanager.signalmodel.mesh.children[1].material.map.needsUpdate = true;
-				scope.modelmanager.signalmodel.mesh.children[2].material.map = scope.signallights["black"];
-				scope.modelmanager.signalmodel.mesh.children[2].material.map.needsUpdate = true;
-			}
-		}
-
-		if (data.body._type == "StationStand") {
-			if (data.body.code == scope.modelmanager.standmodel.code) {
-
-				if (data.body.screenDoorOpenStatus == "02") {
-					scope.modelmanager.standmodel.screenDoorOpenStatus = "02";
-
-					scope.modelmanager.standmodel.action.reset();
-					scope.modelmanager.standmodel.action.time = scope.modelmanager.standmodel.action._clip.duration;
-					scope.modelmanager.standmodel.action.timeScale = 1;
-					scope.modelmanager.standmodel.action.play();
-				}
-
-				if (data.body.screenDoorOpenStatus == "01") {
-					scope.modelmanager.standmodel.screenDoorOpenStatus = "01";
-
-					scope.modelmanager.standmodel.action.reset();
-					scope.modelmanager.standmodel.action.time = 0;
-					scope.modelmanager.standmodel.action.timeScale = -1;
-					scope.modelmanager.standmodel.action.play();
-				}
-			}
-
-		}
-
-	}
-
-	//设备分解、归位动画按钮
-	this.disperdevice1 = function(){
-		if(scope.nowobject.animacode){
-			if(moveanima.status == true){
-				if(scope.animastats == false){
-					scope.animastats = true;
-					moveanima.setplaylist(moveanima.animatelist[scope.nowobject.animacode+"on"],true)
-				}	else if(scope.animastats == true){
-					scope.animastats = false;
-					moveanima.setplaylist(moveanima.animatelist[scope.nowobject.animacode+"off"],true);
-				}
-			}
-		}
-
-
-	};
-
-	this.disperdevice2 = function(){
-		if(scope.nowobject.animacode){
-			if(moveanima.status == true){
-				if(scope.animastats == false){
-					scope.animastats = true;
-					moveanima.setplaylist(moveanima.animatelist[scope.nowobject.animacode+"chaijie"],true);
-				}	else if(scope.animastats == true){
-					scope.animastats = false;
-					moveanima.setplaylist(moveanima.animatelist[scope.nowobject.animacode+"fuwei"],true);
-				}
-			}
-		}
-
-	};
-
-	this.resetmodel = function(){
-		if(scope.nowobject.animacode){
-			scope.animastats = false;
-			moveanima.setplaylist(moveanima.animatelist[scope.nowobject.animacode+"fuwei"],true);
-		}
-
-	};
-
-	this.animationmsgshowon = function(nowobject){
-		scope.animationmodel = nowobject;
-		if(helpbox){
-			scope.animationmodel.helpbox = null;
-			scope.scene.remove( helpbox );
-			helpbox = undefined;
-		}
-
-		settext(scope.animationmodel,scope.animationmodel.position);
-		// console.log(scope.animationmodel);
-		helpbox = new THREE.BoxHelper( scope.animationmodel, 0xff0000 );
-		moveanima.updatehelpbox(helpbox,textplane);
-		// settext(intersects[0].object,intersects[0].point);
-		// getdevicemsg(intersects[0].object.name);
-		scope.scene.add( helpbox );
-		getdevicemsg(nowobject.name);
-	}
-
-	this.animationmsgshowoff = function(nowobject){
-		if(helpbox){
-			scope.animationmodel.helpbox = null;
-			scope.scene.remove( helpbox );
-			helpbox = undefined;
-		}
-		if(textplane){
-			scope.scene.remove(textplane);
-			textplane.geometry.dispose();
-			textplane.material.dispose();
-		}
-		scope.animationmodel = null;
-	}
-
-	this.updateselect = function(updata){
-		// console.log(updata);
-		if(helpbox){
-			scope.scene.remove( helpbox );
-			helpbox = null;
-		}
-		helpbox = new THREE.BoxHelper( updata.mesh, 0xff0000 );
-		// console.log(updata.mesh);
-		let point = {
-			x:updata.mesh.matrixWorld.elements[12],
-			y:updata.mesh.matrixWorld.elements[13],
-			z:updata.mesh.matrixWorld.elements[14]
-		};
-		settext(updata.mesh,point)
-		getdevicemsg(updata.mesh.name);
-		scope.scene.add( helpbox );
-	}
-
-	function getdevicemsg(selectname){
-		// console.log(selectname);
-		for(let i=0,leni=scope.devicetext.devicelist.length;i<leni;i++){
-
-			if(selectname == scope.devicetext.devicelist[i].name){
-				updatemsg(scope.devicetext.devicelist[i].text,scope.devicetext.devicelist[i].msg);
-				i=leni;
-			}
-		}
-	}
-
-	this.updatewindowstatus = function(nowwindowstatus){
-		scope.windowstatus == nowwindowstatus;
-	}
-
-	function onselect(event){
-		if(event.button == '0'){
-
-			if(scope.raycasterstatus){
-
-				//定义光线
-				let raycaster = new THREE.Raycaster();
-				//定义平面鼠标点击坐标
-				let mouse = new THREE.Vector2();
-				let getBoundingClientRect = scope.dom.getBoundingClientRect()
-				if(scope.windowstatus == '0'){
-					mouse.x = ( (event.clientX - getBoundingClientRect .left)  /scope.dom.offsetWidth) * 2-1;
-					mouse.y = -( (event.clientY - getBoundingClientRect .top) / scope.dom.offsetHeight) * 2 + 1;
-				}else{
-					mouse.x = (event.clientX /  scope.dom.offsetWidth) * 2 - 1;
-					mouse.y = -(event.clientY / scope.dom.offsetHeight) * 2 + 1;
-				}
-
-				raycaster.setFromCamera( mouse, scope.camera );
-
-
-				let intersects = raycaster.intersectObjects( scope.modelmanager.switchmodel.mesh.children,true);
-				if(helpbox){
-					scope.scene.remove( helpbox );
-					helpbox = null;
-				}
-				if(textplane){
-					scope.scene.remove(textplane);
-					textplane.geometry.dispose();
-					textplane.material.dispose();
-				}
-				if(intersects[0]){
-
-
-					if(intersects[0].object.raycastoff){
-						helpbox = new THREE.BoxHelper( intersects[0].object.parent, 0xff0000 );
-						settext(intersects[0].object.parent,intersects[0].point);
-						getdevicemsg(intersects[0].object.parent.name);
-
-					}else{
-						helpbox = new THREE.BoxHelper( intersects[0].object, 0xff0000 );
-						settext(intersects[0].object,intersects[0].point);
-						getdevicemsg(intersects[0].object.name);
-
-					}
-
-					scope.scene.add( helpbox );
-				}
-			}
-
-		}
-
-	}
-
-	function settext(intersects,point){
-		if(intersects.text){
-			let textgeometry = new THREE.PlaneBufferGeometry( 18, 12, 1 );
-			let textt = new THREE.CanvasTexture(getTextCanvas(intersects.text));
-			let textmaterial = new THREE.MeshBasicMaterial( {
-				side: THREE.DoubleSide,
-				map:textt ,transparent: true,
-				alphaTest:0.1
-			} );
-			if(textplane){
-				scope.scene.remove(textplane);
-				textplane.geometry.dispose();
-				textplane.material.dispose();
-			}
-			textplane= new THREE.Mesh( textgeometry, textmaterial );
-			// textplane.name = data[i].code;
-			textplane.position.x = point.x;
-			textplane.position.y = point.y+6;
-			textplane.position.z = point.z;
-			// console.log(textplane.position);
-			// textplane.tcode = data[i].code;
-			textplane.rotation.y = -Math.PI/2;
-			textplane.lookAt(scope.camera.position);
-			// scope.textlist.push(textplane);
-			// newmesh.children[0].add(textplane);
-
-			scope.scene.add(textplane);
-
-			textgeometry.dispose();
-			textmaterial.dispose();
-			textt.dispose();
-		}
-	}
-	var beauty = new Image();
-	beauty.src = JL3D_LOCAL_STATIC+"/texture/guide.png";
-	//canvas文字贴图方法
-	//PS:待提炼 增强功能
-	function getTextCanvas(text){
-			var canvas = document.getElementById('canvastexture');
-
-		  canvas.width = 256;
-		  canvas.height = 128;
-
-		  var ctx = canvas.getContext('2d');
-
-		  //var bg = canvas.createPattern(img, "no-repeat");
-		  //ctx.fillStyle = bg;
-		  ctx.fillRect(0, 0,256,128);
-		  ctx.font = "20px Verdana";
-		  ctx.fillStyle = '#FFFFFF';
-		  ctx.textAlign = 'center';
-		  ctx.textBaseline = 'middle';
-		  ctx.clearRect(0,0,256,128);
-		  //console.log(text.groupNumber);
-		  ctx.drawImage(beauty,0,0,256, 128);
-		  ctx.fillText("设备部件:"+text, 90,30);
-		  // ctx.fillText("车组人员:XXX", 40,20);
-		  // ctx.fillText("速度:XXX.XXX", 40,30);
-		  //ctx.fillText(text.trainModel.name, width/2,height*3/4);
-		  let data = ctx.getImageData(0, 0,256, 128);
-		  return data;
-
-	}
-	this.hideswitch = function (nowswitchstatus){
-		if(nowswitchstatus){
-			scope.modelmanager.switchmodel.mesh.add(daochamodel);
-		}else{
-			scope.modelmanager.switchmodel.mesh.remove(daochamodel);
-		}
-
-	}
-}
diff --git a/src/jlmap3d/jl3ddevice/jl3ddeviceNew.js b/src/jlmap3d/jl3ddevice/jl3ddeviceNew.js
index 67cfbb759..a88567f00 100644
--- a/src/jlmap3d/jl3ddevice/jl3ddeviceNew.js
+++ b/src/jlmap3d/jl3ddevice/jl3ddeviceNew.js
@@ -62,7 +62,6 @@ export function Jl3ddeviceNew(dom,group,token,skinCode) {
 	this.dom.appendChild(this.renderer.domElement);
 
 	//定义相机
-
 	this.camera = new THREE.PerspectiveCamera(70, dom.offsetWidth / dom.offsetHeight, 0.01, 200);
 	this.camera.position.set(0, 20, 30);
 	this.camera.aspect = dom.offsetWidth / dom.offsetHeight;
@@ -87,7 +86,7 @@ export function Jl3ddeviceNew(dom,group,token,skinCode) {
 	let ambientLight = new THREE.AmbientLight(0xffffff, 1.3);
 	this.scene.add(ambientLight);
 
-
+	//区域聚光灯
 	var spotLight = new THREE.SpotLight(0xececff);
 	spotLight.position.set(-50, 80, 0);
 	spotLight.castShadow = true;
@@ -95,8 +94,7 @@ export function Jl3ddeviceNew(dom,group,token,skinCode) {
 	spotLight.shadow.mapSize.height = 2048;
 	this.scene.add(spotLight);
 
-
-
+	//定义轨道视角控制器
 	this.controls = new THREE.OrbitControls(this.camera, dom);
 	this.controls.maxPolarAngle = Math.PI / 2;
 	this.controls.minPolarangle = Math.PI / 5;
@@ -161,8 +159,8 @@ export function Jl3ddeviceNew(dom,group,token,skinCode) {
 				}
 			}
 		}
-		console.log(psdVoiceStationList);
 	});
+
 	document.addEventListener( "mousedown", onselect, false );
 
 	let teststomp = new StompClient();
@@ -176,8 +174,8 @@ export function Jl3ddeviceNew(dom,group,token,skinCode) {
 	}
 
 	function callback(Response) {
+
 		let data = JSON.parse(Response.body);
-		// }else{
 		if(data.type == "DeviceCtrl_3D"){
 			if(data.body.code == scope.nowcode){
 				scope.updateaction(data.body);
@@ -207,12 +205,9 @@ export function Jl3ddeviceNew(dom,group,token,skinCode) {
 				location.reload();
 			});
 		}
-
-		// }
-
 	}
-	window.onresize = function () {
 
+	window.onresize = function () {
 
 		// if(scope.windowstatus){
 		// 	changeelement.style.width = '50%';
@@ -225,7 +220,6 @@ export function Jl3ddeviceNew(dom,group,token,skinCode) {
 		scope.camera.updateProjectionMatrix();
 		scope.renderer.setSize(scope.dom.offsetWidth, scope.dom.offsetHeight);
 
-		console.log(scope.windowstatus);
 		if(scope.windowstatus == "0"){
 			let changeelement = document.getElementById('jl3d');
 			changeelement.style.width = '100%';
@@ -236,22 +230,18 @@ export function Jl3ddeviceNew(dom,group,token,skinCode) {
 			scope.renderer.setSize(window.innerWidth, scope.dom.offsetHeight);
 		}
 
-		// }
-
-
-
-
 	}
+
 	this.domresize = function(){
 		scope.camera.aspect = scope.dom.offsetWidth / scope.dom.offsetHeight;
 		scope.camera.updateProjectionMatrix();
 		scope.renderer.setSize(scope.dom.offsetWidth, scope.dom.offsetHeight);
 	}
+
 	this.anime = null;
 
 	this.modelmanager = new ModelManager();
 
-
 	getPublish3dMapDetail(skinCode).then(netdata => {
 
 		let netDataAssets = JSON.parse(netdata.data.assets);
@@ -274,9 +264,18 @@ export function Jl3ddeviceNew(dom,group,token,skinCode) {
 			}
 
 		})
-		animate();
+		let checkobject = setInterval(function(){
+			if(scope.modelmanager.switchmodel.mesh){
+				clearInterval(checkobject);
+				animate();
+			}
+
+
+		},1000);
+
 	});
 
+	//初始化屏蔽门贴图
 	function setpsdstationmap(stationlist){
 		for(let i=0,leni=stationlist.length;i<leni;i++){
 			psdtexturemap[stationlist[i].stands[0].code] = stationlist[i].code;
@@ -293,7 +292,6 @@ export function Jl3ddeviceNew(dom,group,token,skinCode) {
 		scope.renderer.render(scope.scene, scope.camera);
 		scope.controls.update();
 		//scope.camera.lookAt(plane);
-		//
 		moveanima.animateupdate();
 		let delta = clock.getDelta();
 		if (scope.mixers) {
@@ -303,22 +301,18 @@ export function Jl3ddeviceNew(dom,group,token,skinCode) {
 				}
 			}
 		}
-
-
 	}
-
-
+	//隐藏道岔
 	this.hideswitch = function (nowswitchstatus){
 		if(nowswitchstatus){
 			scope.modelmanager.switchmodel.mesh.add(daochamodel);
 		}else{
 			scope.modelmanager.switchmodel.mesh.remove(daochamodel);
 		}
-
 	}
-
+	//选择模型
 	this.selectmodel = function (data) {
-		scope.modelmanager
+		// scope.modelmanager
 		if (scope.showmodel) {
 
 			if (scope.showmodel.code != data.code) {
@@ -347,7 +341,6 @@ export function Jl3ddeviceNew(dom,group,token,skinCode) {
 					scope.modelmanager.signalmodel.code = data.code;
 					scope.showmodel = scope.modelmanager.signalmodel.mesh;
 					scope.scene.add(scope.showmodel);
-
 				}
 
 				if (data._type == "Psd") {
@@ -374,10 +367,15 @@ export function Jl3ddeviceNew(dom,group,token,skinCode) {
 			}
 		} else {
 			scope.nowcode  = data.code;
-
 			if (data._type == "Switch") {
 				scope.modelmanager.switchmodel.normalPosition = "0";
 				scope.showmodel = scope.modelmanager.switchmodel.mesh;
+				scope.scene.add(scope.showmodel);
+
+				scope.devicetext.initdevicetext(scope.modelmanager.switchmodel.mesh);
+				scope.nowobject = scope.modelmanager.switchmodel.mesh;
+				updatemenulist(scope.devicetext.devicelist);
+				scope.raycasterstatus = true;
 				// scope.scene.add(scope.showmodel);
 				if (data.normalPosition == "0") {
 					scope.modelmanager.switchmodel.normalPosition = "0";
@@ -506,7 +504,7 @@ export function Jl3ddeviceNew(dom,group,token,skinCode) {
 		}
 		scope.animationmodel = null;
 	}
-
+	//根据数据切换设备样式
 	this.updateaction = function (data) {
 		if (data.type == "SWITCH") {
 			if (data.normal == "0") {
@@ -548,7 +546,6 @@ export function Jl3ddeviceNew(dom,group,token,skinCode) {
 			}
 		}
 
-
 		if (data.type == "PSD" || data.type == "STAND") {
 			if (data.code == scope.nowcode) {
 				if (data.open == "1" ) {
@@ -559,8 +556,6 @@ export function Jl3ddeviceNew(dom,group,token,skinCode) {
 					scope.modelmanager.standmodel.action.timeScale = 1;
 					scope.modelmanager.standmodel.action.play();
 					console.log(data);
-					console.log();
-
 					localVoicePlay("开往"+psdVoiceStationList[data.code].finlStationName+"方向的列车进站了！");
 				}
 
@@ -596,7 +591,6 @@ export function Jl3ddeviceNew(dom,group,token,skinCode) {
 			scope.modelmanager.standmodel.action.play();
 		}
 
-
 	}
 
 	this.deviceFaultOver = function (data) {
@@ -669,7 +663,6 @@ export function Jl3ddeviceNew(dom,group,token,skinCode) {
 					scope.modelmanager.switchmodel.action.timeScale = -1;
 					scope.modelmanager.switchmodel.action.play();
 				}
-
 			}
 		}
 
@@ -704,13 +697,11 @@ export function Jl3ddeviceNew(dom,group,token,skinCode) {
 				scope.modelmanager.signalmodel.mesh.children[2].material.map = scope.signallights["black"];
 				scope.modelmanager.signalmodel.mesh.children[2].material.map.needsUpdate = true;
 			}
-
 		}
 
 		if (data._type == "Psd") {
 			if (data.screenDoorOpenStatus == "0") {
 				scope.modelmanager.standmodel.screenDoorOpenStatus = "0";
-
 				scope.modelmanager.standmodel.action.reset();
 				scope.modelmanager.standmodel.action.time = scope.modelmanager.standmodel.action._clip.duration;
 				scope.modelmanager.standmodel.action.timeScale = 1;
@@ -719,7 +710,6 @@ export function Jl3ddeviceNew(dom,group,token,skinCode) {
 
 			if (data.screenDoorOpenStatus == "1") {
 				scope.modelmanager.standmodel.screenDoorOpenStatus = "1";
-
 				scope.modelmanager.standmodel.action.reset();
 				scope.modelmanager.standmodel.action.time = 0;
 				scope.modelmanager.standmodel.action.timeScale = -1;
@@ -739,11 +729,12 @@ export function Jl3ddeviceNew(dom,group,token,skinCode) {
 		}
 
 	}
+	
 	this.updatewindowstatus = function(nowwindowstatus){
 		scope.windowstatus == nowwindowstatus;
 	}
 
-
+	//
 	function onselect(event){
 		if(event.button == '0'){
 
@@ -764,7 +755,6 @@ export function Jl3ddeviceNew(dom,group,token,skinCode) {
 
 				raycaster.setFromCamera( mouse, scope.camera );
 
-
 				let intersects = raycaster.intersectObjects( scope.modelmanager.switchmodel.mesh.children,true);
 				if(helpbox){
 					scope.scene.remove( helpbox );
@@ -776,8 +766,6 @@ export function Jl3ddeviceNew(dom,group,token,skinCode) {
 					textplane.material.dispose();
 				}
 				if(intersects[0]){
-
-
 					if(intersects[0].object.raycastoff){
 						helpbox = new THREE.BoxHelper( intersects[0].object.parent, 0xff0000 );
 						settext(intersects[0].object.parent,intersects[0].point);
@@ -787,9 +775,7 @@ export function Jl3ddeviceNew(dom,group,token,skinCode) {
 						helpbox = new THREE.BoxHelper( intersects[0].object, 0xff0000 );
 						settext(intersects[0].object,intersects[0].point);
 						getdevicemsg(intersects[0].object.name);
-
 					}
-
 					scope.scene.add( helpbox );
 				}
 			}
@@ -821,7 +807,6 @@ export function Jl3ddeviceNew(dom,group,token,skinCode) {
 			textplane.lookAt(scope.camera.position);
 			// scope.textlist.push(textplane);
 			// newmesh.children[0].add(textplane);
-
 			scope.scene.add(textplane);
 
 			textgeometry.dispose();
@@ -834,28 +819,28 @@ export function Jl3ddeviceNew(dom,group,token,skinCode) {
 	//canvas文字贴图方法
 	//PS:待提炼 增强功能
 	function getTextCanvas(text){
-			var canvas = document.getElementById('canvastexture');
+		var canvas = document.getElementById('canvastexture');
 
-		  canvas.width = 256;
-		  canvas.height = 128;
+	  canvas.width = 256;
+	  canvas.height = 128;
 
-		  var ctx = canvas.getContext('2d');
+	  var ctx = canvas.getContext('2d');
 
-		  //var bg = canvas.createPattern(img, "no-repeat");
-		  //ctx.fillStyle = bg;
-		  ctx.fillRect(0, 0,256,128);
-		  ctx.font = "20px Verdana";
-		  ctx.fillStyle = '#FFFFFF';
-		  ctx.textAlign = 'center';
-		  ctx.textBaseline = 'middle';
-		  ctx.clearRect(0,0,256,128);
-		  ctx.drawImage(beauty,0,0,256, 128);
-		  ctx.fillText("设备部件:"+text, 90,30);
-		  // ctx.fillText("车组人员:XXX", 40,20);
-		  // ctx.fillText("速度:XXX.XXX", 40,30);
-		  //ctx.fillText(text.trainModel.name, width/2,height*3/4);
-		  let data = ctx.getImageData(0, 0,256, 128);
-		  return data;
+	  //var bg = canvas.createPattern(img, "no-repeat");
+	  //ctx.fillStyle = bg;
+	  ctx.fillRect(0, 0,256,128);
+	  ctx.font = "20px Verdana";
+	  ctx.fillStyle = '#FFFFFF';
+	  ctx.textAlign = 'center';
+	  ctx.textBaseline = 'middle';
+	  ctx.clearRect(0,0,256,128);
+	  ctx.drawImage(beauty,0,0,256, 128);
+	  ctx.fillText("设备部件:"+text, 90,30);
+	  // ctx.fillText("车组人员:XXX", 40,20);
+	  // ctx.fillText("速度:XXX.XXX", 40,30);
+	  //ctx.fillText(text.trainModel.name, width/2,height*3/4);
+	  let data = ctx.getImageData(0, 0,256, 128);
+	  return data;
 
 	}
 	let voiceSelect;
@@ -871,18 +856,16 @@ export function Jl3ddeviceNew(dom,group,token,skinCode) {
 	}
 
 	function localVoicePlay(playText) {
-			localVoiceCancel();
-			let toSpeak = new SpeechSynthesisUtterance(playText);
-			toSpeak.rate = 0.7;
-			toSpeak.voice = voiceSelect;
-
-			window.speechSynthesis.speak(toSpeak);
-
-		}
+		localVoiceCancel();
+		let toSpeak = new SpeechSynthesisUtterance(playText);
+		toSpeak.rate = 0.7;
+		toSpeak.voice = voiceSelect;
 
+		window.speechSynthesis.speak(toSpeak);
+	}
 
 	function localVoiceCancel() {
-			window.speechSynthesis.cancel();
-		}
+		window.speechSynthesis.cancel();
+	}
 
 }
diff --git a/src/jlmap3d/jl3ddevice/standtextureload.js b/src/jlmap3d/jl3ddevice/standtextureload.js
index e2de5dc24..7b6d09fe4 100644
--- a/src/jlmap3d/jl3ddevice/standtextureload.js
+++ b/src/jlmap3d/jl3ddevice/standtextureload.js
@@ -4,7 +4,6 @@ export function Standtextureload(jlmap3dedit,standTextureData){
   for(let i=0,leni=standTextureData.urls.length;i<leni;i++){
     setstationtexture(jlmap3dedit.stationtexture,standTextureData.urls[i].name,BASE_ASSET_API + standTextureData.urls[i].url);
   }
-
 }
 
 function settexture(materiallist,name,textureurl){
diff --git a/src/jlmap3d/jl3ddevicetrain/component/StompClient.js b/src/jlmap3d/jl3ddevicetrain/component/StompClient.js
deleted file mode 100644
index d8d0b3cdc..000000000
--- a/src/jlmap3d/jl3ddevicetrain/component/StompClient.js
+++ /dev/null
@@ -1,85 +0,0 @@
-import Stomp from 'stompjs';
-import { getBaseUrl } from '@/utils/baseUrl';
-
-const BASE_API = getBaseUrl();
-let baseUrl = 'http://192.168.3.6:9600';// 本地旭强
-if (BASE_API == 'https://joylink.club/jlcloud') {
-    baseUrl = 'https://joylink.club/relay';
-} else if (BASE_API == 'https://test.joylink.club/jlcloud') {
-    baseUrl = 'https://test.joylink.club/relay';
-}
-
-class StompClient {
-    constructor() {
-        const ws = new WebSocket(`${baseUrl}/ws-relay`.replace(/https/, 'wss').replace(/http/, 'ws'));
-        this.client = Stomp.over(ws);
-        this.client.debug = function (message) {
-            console.debug(message);
-        };
-        this.subscribeMap = new Map(); // 已订阅，对象{dest:'', handler:function, sub: Object}
-        this.connected = false;
-        this.onUsed = false;
-    }
-
-    connect() {
-        return new Promise((resolve, reject) => {
-            this.onUsed = true;
-            const that = this;
-            const header = {
-                login: 'relay',
-                passcode: 'relay'
-            };
-            this.client.connect(header,
-                ()=>{
-                    that.connected = true;
-                    // 重连时需要重新订阅
-                    that.subscribeMap.forEach((subscribe, dest) => {
-                        that.subscribe(subscribe.dest, subscribe.handler);
-                    });
-                    resolve();
-                },
-                (error)=>{
-                    console.error(error);
-                    this.connected = false;
-                    reject(error);
-                });
-        });
-    }
-
-    disconnect() {
-        this.onUsed = false;
-        this.client.disconnect();
-    }
-
-    subscribe(destination, handler) {
-        if (!this.connected) {
-            const that = this;
-            this.connect().then(() => {
-                that.subscribe(destination, handler);
-            });
-        } else {
-            const sub = this.client.subscribe(destination, handler);
-            this.subscribeMap.set(destination, {dest: destination, handler: handler, sub: sub});
-        }
-    }
-
-    unsubscribe(destination) {
-        const subscribe = this.subscribeMap.get(destination);
-        if (subscribe && subscribe.sub) {
-            subscribe.sub.unsubscribe();
-        } else if (subscribe) {
-            this.subscribeMap.delete(destination);
-        }
-    }
-
-    send(destination, body) {
-        if (body) {
-            body = JSON.stringify(body);
-            this.client.send(destination, {}, body);
-        } else {
-            console.error('stomp send body required');
-        }
-    }
-}
-
-export default StompClient;
diff --git a/src/jlmap3d/jl3ddevicetrain/component/deviceconnect.js b/src/jlmap3d/jl3ddevicetrain/component/deviceconnect.js
deleted file mode 100644
index a2e08f32a..000000000
--- a/src/jlmap3d/jl3ddevicetrain/component/deviceconnect.js
+++ /dev/null
@@ -1,43 +0,0 @@
-import StompClient from '@/utils/sock';
-
-// import { getTrainingCbtcDemon, runDiagramStart, runDiagramOver, setTrainingCbtcInitTime } from '@/api/simulation';
-// import { creatSubscribe, clearSubscribe, displayTopic, screenTopic } from '@/utils/stomp';
-import { getBaseUrl } from '@/utils/baseUrl'
-import { getToken } from '@/utils/auth';
-
-// 定于仿真socket接口
-export function DeviceSubscribe(jlmap3d,routegroup,jsonwebwork) {
-
-	const scope = this;
-	this.map = null;
-
-	this.teststomp = new StompClient();
-	this.topic = '/user/queue/simulation/jl3d/'+routegroup;
-	let header = {'X-Token': getToken() };
-
-
-	this.updatamap = function() {
-
-	};
-
-	this.socketon = function(topic) {
-		try {
-			// console.log("teststomp");
-			scope.teststomp.subscribe(topic, callback, header);
-		} catch (error) {
-			console.error('websocket订阅失败');
-		}
-
-	};
-
-	this.socketoff = function(topic) {
-		scope.teststomp.unsubscribe(topic);
-	};
-
-	// 仿真socket接口回调函数
-	function callback(Response) {
-
-
-	}
-
-}
diff --git a/src/jlmap3d/jl3ddevicetrain/component/jdqcontrol.js b/src/jlmap3d/jl3ddevicetrain/component/jdqcontrol.js
deleted file mode 100644
index fa1fa9e21..000000000
--- a/src/jlmap3d/jl3ddevicetrain/component/jdqcontrol.js
+++ /dev/null
@@ -1,147 +0,0 @@
-
-export function Jdqcontrol(){
-  let scope = this;
-
-  this.devicelist = [];
-
-  this.jdqinit = function(){
-
-  }
-
-  this.jdqraycast = function(){
-
-  }
-
-  //配置继电器文字信息
-  this.jdqdevicelist = function(selectmodel){
-    if(scope.devicelist.length>0){
-      scope.devicelist = [];
-    }
-    for(let i=0,leni=selectmodel.children.length;i<leni;i++){
-      let part= {
-        name:selectmodel.children[i].name,
-        text:null,
-        mesh:selectmodel.children[i],
-        index:i,
-        show:true,
-        msg:null,
-      };
-      if(selectmodel.children[i].name == "dizuo"){
-        part.text = "底座";
-        part.msg = "安防继电器部件。";
-        selectmodel.children[i].text = "底座";
-      }
-      if(selectmodel.children[i].name == "cigang"){
-        part.text = "磁钢";
-        part.msg = "使继电器由于线圈中电流极性不同而具有定位和范围两种稳定状态，这两种稳定状态在线圈中电流小时候，仍能继续保持。";
-        selectmodel.children[i].text = "磁钢";
-      }
-      if(selectmodel.children[i].name == "Lxing"){
-        part.text = "L型轭铁";
-        part.msg = "扼铁呈Ｌ洲形，由电工纯铁板冲压成型，外表镀多层铬防护。";
-        selectmodel.children[i].text = "L型轭铁";
-      }
-      if(selectmodel.children[i].name == "jiaoxingxiantie"){
-        part.text = "角型衔铁";
-        part.msg = "衔铁为角型，靠蝶形钢丝卡固定在轭铁的刀刃上，动作灵活。衔铁由电工纯铁冲压成型，衔铁上铆有重锤片，以保证衔铁靠重力返回";
-        selectmodel.children[i].text = "角型衔铁";
-      }
-      if(selectmodel.children[i].name == "xianquan"){
-        part.text = "线圈";
-        part.msg = "线圈水平安装在铁芯上，分为前圈和后圈，之所以采用双线圈，主要是为了增强控制电路的适应性和灵活性，可根据电路需要单线圈控"+
-        "制、双线圈串联控制或双线圈并联控制。";
-        selectmodel.children[i].text =  "线圈";
-      }
-      if(selectmodel.children[i].name == "zhongchuipian"){
-        part.text = "重锤片";
-        part.msg = "重锤片由薄钢板制成，其片数由接点组的多少决定，使衔铁的重量基本上满足后接点压力的需要。";
-        selectmodel.children[i].text = "重锤片";
-      }
-      if(selectmodel.children[i].name == "lagan"){
-        part.text = "拉杆";
-        part.msg = "拉杆有铁制的和塑料制的，衔铁通过拉杆带动接点组。";
-        selectmodel.children[i].text = "拉杆";
-      }
-      if(selectmodel.children[i].name == "dongjiedianzhou"){
-        part.text = "动接点轴";
-        part.msg = "动接点轴由锡磷青铜线制成。";
-        selectmodel.children[i].text = "动接点轴";
-      }
-      // if(selectmodel.children[i].name == "neibu"){
-      //   part.text = "内部";
-      //   part.msg = "";
-      //   selectmodel.children[i].text = "内部";
-      // }
-      if(selectmodel.children[i].name == "jiedian"){
-        part.text = "接点";
-        part.msg = "具有开端功率娇小的接点能力。";
-        selectmodel.children[i].text = "接点";
-      }
-      if(selectmodel.children[i].name == "yapian"){
-        part.text = "压片";
-        part.msg = "压片由弹簧钢板冲压成弓形，分上、下两篇，其作用是保证接点组的稳固性。";
-        selectmodel.children[i].text = "压片";
-      }
-      if(selectmodel.children[i].name == "fanghuozhao"){
-        part.text = "防火罩";
-        part.msg = "保护继电器内设备运行。";
-        selectmodel.children[i].text = "防火罩";
-      }
-      if(selectmodel.children[i].name == "dianyuanpian"){
-        part.text = "电源片";
-        part.msg = "电源片单元由黄铜制成的电源片压在胶木内。";
-        selectmodel.children[i].text = "电源片";
-      }
-      if(selectmodel.children[i].name == "xinpian"){
-        part.text = "电路板";
-        part.msg = "故在电路中起着自动调节、安全保护、转换电路等作用。";
-        selectmodel.children[i].text = "电路板";
-      }
-      if(selectmodel.children[i].name =="jueyuanzhou"){
-        part.text = "绝缘轴";
-        part.msg = "绝缘轴用冻石瓷料制成，抗冲击强度足够。";
-        selectmodel.children[i].text = "绝缘轴";
-      }
-      if(selectmodel.children[i].name =="cichuihuqi"){
-        part.text = "磁吹弧器";
-        part.msg = "通过在接点开关相对位置处设置永久磁铁的技术手段，以永久磁铁的磁场作用力影响接点开关产生的电弧，使得电弧受磁场作用力加速拉长至消灭，从而成为一种遮断电弧的继电器。";
-        selectmodel.children[i].text = "磁吹弧器";
-      }
-      if(selectmodel.children[i].name =="jiaqiangdongjiediandanyuan"){
-        part.text = "加强接点单元";
-        part.msg = "具有开端功率较大的接点能力。";
-        selectmodel.children[i].text = "加强接点单元";
-      }
-      if(selectmodel.children[i].name =="yunmugehupian"){
-        part.text = "云母隔弧片";
-        part.msg = "云母隔弧片。";
-        selectmodel.children[i].text = "云母隔弧片";
-      }
-      if(selectmodel.children[i].name =="yapian1"){
-        part.text = "压片";
-        part.msg = "压片。";
-        selectmodel.children[i].text = "压片";
-      }
-      if(selectmodel.children[i].name =="jiedian1"){
-        part.text = "接点";
-        part.msg = "具有开端功率娇小的接点能力。";
-        selectmodel.children[i].text = "接点";
-      }
-      if(selectmodel.children[i].name =="ccichuihuqi"){
-        part.text = "磁吹弧器";
-        part.msg = "提高了继电器的可靠性。";
-        selectmodel.children[i].text = "磁吹弧器";
-      }
-
-
-      // if(part.text == null){
-      //   console.log(selectmodel.children[i].name);
-      // }
-      if(part.text){
-        scope.devicelist.push(part);
-      }
-
-    }
-  }
-
-}
diff --git a/src/jlmap3d/jl3ddevicetrain/component/moveanimate.js b/src/jlmap3d/jl3ddevicetrain/component/moveanimate.js
deleted file mode 100644
index 9bce49c27..000000000
--- a/src/jlmap3d/jl3ddevicetrain/component/moveanimate.js
+++ /dev/null
@@ -1,672 +0,0 @@
-
-export function Moveanimate(main){
-  let scope = this;
-
-  this.helpbox = null;
-  this.textplane = null;
-  //动画列表
-  this.animatelist = [];
-  this.playlist = null;
-  this.playorder = 0;
-  //动画播放器开关
-  this.enable = true;
-  //动画开关状态
-  this.status = true;
-  //当前动画模型
-  this.nowmodelname = undefined;
-  //定义所有继电器部件动画
-  // this.initlist = function(modellist){
-  //
-  //   for(let j=0,lenj=modellist.length;j<lenj;j++){
-  //
-  //     for(let i=0,leni=modellist[j].children.length;i<leni;i++){
-  //
-  //       if(modellist[j].children[i].name == "dizuo"){
-  //         let points1 = [];
-  //         points1.push(new THREE.Vector3(modellist[j].children[i].position.x,modellist[j].children[i].position.y,modellist[j].children[i].position.z));
-  //         points1.push(new THREE.Vector3(modellist[j].children[i].position.x,modellist[j].children[i].position.y,modellist[j].children[i].position.z-150));
-  //         scope.initanimate(modellist[j].children[i],modellist[j].name+"dizuoon",points1,0.5,true,0);
-  //         let points2 = [];
-  //         points2.push(new THREE.Vector3(modellist[j].children[i].position.x,modellist[j].children[i].position.y,modellist[j].children[i].position.z-150));
-  //         points2.push(new THREE.Vector3(modellist[j].children[i].position.x,modellist[j].children[i].position.y,modellist[j].children[i].position.z));
-  //         scope.initanimate(modellist[j].children[i],modellist[j].name+"dizuooff",points2,0.5,true,0);
-  //
-  //
-  //       }
-  //       if(modellist[j].children[i].name == "Lxing"){
-  //         let points1 = [];
-  //         points1.push(new THREE.Vector3(modellist[j].children[i].position.x,modellist[j].children[i].position.y,modellist[j].children[i].position.z));
-  //         points1.push(new THREE.Vector3(modellist[j].children[i].position.x,modellist[j].children[i].position.y-50,modellist[j].children[i].position.z));
-  //         scope.initanimate(modellist[j].children[i],modellist[j].name+"Lxingon",points1,0.5,true,0);
-  //         let points2 = [];
-  //         points2.push(new THREE.Vector3(modellist[j].children[i].position.x,modellist[j].children[i].position.y-50,modellist[j].children[i].position.z));
-  //         points2.push(new THREE.Vector3(modellist[j].children[i].position.x,modellist[j].children[i].position.y,modellist[j].children[i].position.z));
-  //         scope.initanimate(modellist[j].children[i],modellist[j].name+"Lxingoff",points2,0.5,true,0);
-  //       }
-  //       if(modellist[j].children[i].name == "jiaoxingxiantie"){
-  //         let points1 = [];
-  //         points1.push(new THREE.Vector3(modellist[j].children[i].position.x,modellist[j].children[i].position.y,modellist[j].children[i].position.z));
-  //         points1.push(new THREE.Vector3(modellist[j].children[i].position.x,modellist[j].children[i].position.y,modellist[j].children[i].position.z+25));
-  //         scope.initanimate(modellist[j].children[i],modellist[j].name+"jiaoxingxiantieon",points1,0.5,true,0);
-  //         let points2 = [];
-  //         points2.push(new THREE.Vector3(modellist[j].children[i].position.x,modellist[j].children[i].position.y,modellist[j].children[i].position.z+25));
-  //         points2.push(new THREE.Vector3(modellist[j].children[i].position.x,modellist[j].children[i].position.y,modellist[j].children[i].position.z));
-  //         scope.initanimate(modellist[j].children[i],modellist[j].name+"jiaoxingxiantieoff",points2,0.5,true,0);
-  //       }
-  //       if(modellist[j].children[i].name == "xianquan"){
-  //         let points1 = [];
-  //         points1.push(new THREE.Vector3(modellist[j].children[i].position.x,modellist[j].children[i].position.y,modellist[j].children[i].position.z));
-  //         points1.push(new THREE.Vector3(modellist[j].children[i].position.x,modellist[j].children[i].position.y-100,modellist[j].children[i].position.z));
-  //         scope.initanimate(modellist[j].children[i],modellist[j].name+"xianquanon",points1,0.5,true,0);
-  //         let points2 = [];
-  //         points2.push(new THREE.Vector3(modellist[j].children[i].position.x,modellist[j].children[i].position.y-100,modellist[j].children[i].position.z));
-  //         points2.push(new THREE.Vector3(modellist[j].children[i].position.x,modellist[j].children[i].position.y,modellist[j].children[i].position.z));
-  //         scope.initanimate(modellist[j].children[i],modellist[j].name+"xianquanoff",points2,0.5,true,0);
-  //       }
-  //       if(modellist[j].children[i].name == "zhongchuipian"){
-  //         let points1 = [];
-  //         points1.push(new THREE.Vector3(modellist[j].children[i].position.x,modellist[j].children[i].position.y,modellist[j].children[i].position.z));
-  //         points1.push(new THREE.Vector3(modellist[j].children[i].position.x,modellist[j].children[i].position.y-25,modellist[j].children[i].position.z));
-  //         scope.initanimate(modellist[j].children[i],modellist[j].name+"zhongchuipianon",points1,0.5,true,0);
-  //         let points2 = [];
-  //         points2.push(new THREE.Vector3(modellist[j].children[i].position.x,modellist[j].children[i].position.y+25,modellist[j].children[i].position.z));
-  //         points2.push(new THREE.Vector3(modellist[j].children[i].position.x,modellist[j].children[i].position.y,modellist[j].children[i].position.z));
-  //         scope.initanimate(modellist[j].children[i],modellist[j].name+"zhongchuipianoff",points2,0.5,true,0);
-  //       }
-  //       if(modellist[j].children[i].name == "lagan"){
-  //         let points1 = [];
-  //         points1.push(new THREE.Vector3(modellist[j].children[i].position.x,modellist[j].children[i].position.y,modellist[j].children[i].position.z));
-  //         points1.push(new THREE.Vector3(modellist[j].children[i].position.x,modellist[j].children[i].position.y+100,modellist[j].children[i].position.z+50));
-  //         scope.initanimate(modellist[j].children[i],modellist[j].name+"laganon",points1,0.5,true,0);
-  //         let points2 = [];
-  //         points2.push(new THREE.Vector3(modellist[j].children[i].position.x,modellist[j].children[i].position.y+100,modellist[j].children[i].position.z+50));
-  //         points2.push(new THREE.Vector3(modellist[j].children[i].position.x,modellist[j].children[i].position.y,modellist[j].children[i].position.z));
-  //         scope.initanimate(modellist[j].children[i],modellist[j].name+"laganoff",points2,0.5,true,0);
-  //       }
-  //       if(modellist[j].children[i].name == "dongjiedianzhou"){
-  //         let points1 = [];
-  //         points1.push(new THREE.Vector3(modellist[j].children[i].position.x,modellist[j].children[i].position.y,modellist[j].children[i].position.z));
-  //         points1.push(new THREE.Vector3(modellist[j].children[i].position.x,modellist[j].children[i].position.y+100,modellist[j].children[i].position.z+25));
-  //         scope.initanimate(modellist[j].children[i],modellist[j].name+"dongjiedianzhouon",points1,0.5,true,0);
-  //         let points2 = [];
-  //         points2.push(new THREE.Vector3(modellist[j].children[i].position.x,modellist[j].children[i].position.y+100,modellist[j].children[i].position.z+25));
-  //         points2.push(new THREE.Vector3(modellist[j].children[i].position.x,modellist[j].children[i].position.y,modellist[j].children[i].position.z));
-  //         scope.initanimate(modellist[j].children[i],modellist[j].name+"dongjiedianzhouoff",points2,0.5,true,0);
-  //       }
-  //       if(modellist[j].children[i].name == "neibu"){
-  //         let points1 = [];
-  //         points1.push(new THREE.Vector3(modellist[j].children[i].position.x,modellist[j].children[i].position.y,modellist[j].children[i].position.z));
-  //         points1.push(new THREE.Vector3(modellist[j].children[i].position.x,modellist[j].children[i].position.y,modellist[j].children[i].position.z-50));
-  //         scope.initanimate(modellist[j].children[i],modellist[j].name+"neibuon",points1,0.5,true,0);
-  //         let points2 = [];
-  //         points2.push(new THREE.Vector3(modellist[j].children[i].position.x,modellist[j].children[i].position.y,modellist[j].children[i].position.z-50));
-  //         points2.push(new THREE.Vector3(modellist[j].children[i].position.x,modellist[j].children[i].position.y,modellist[j].children[i].position.z));
-  //         scope.initanimate(modellist[j].children[i],modellist[j].name+"neibuoff",points2,0.5,true,0);
-  //       }
-  //       if(modellist[j].children[i].name == "jiedian"){
-  //         let points1 = [];
-  //         points1.push(new THREE.Vector3(modellist[j].children[i].position.x,modellist[j].children[i].position.y,modellist[j].children[i].position.z));
-  //         points1.push(new THREE.Vector3(modellist[j].children[i].position.x,modellist[j].children[i].position.y+100,modellist[j].children[i].position.z-15));
-  //         scope.initanimate(modellist[j].children[i],modellist[j].name+"jiedianon",points1,0.5,true,0);
-  //         let points2 = [];
-  //         points2.push(new THREE.Vector3(modellist[j].children[i].position.x,modellist[j].children[i].position.y+100,modellist[j].children[i].position.z-15));
-  //         points2.push(new THREE.Vector3(modellist[j].children[i].position.x,modellist[j].children[i].position.y,modellist[j].children[i].position.z));
-  //         scope.initanimate(modellist[j].children[i],modellist[j].name+"jiedianoff",points2,0.5,true,0);
-  //
-  //       }
-  //       if(modellist[j].children[i].name == "yapian"){
-  //         let points1 = [];
-  //         points1.push(new THREE.Vector3(modellist[j].children[i].position.x,modellist[j].children[i].position.y,modellist[j].children[i].position.z));
-  //         points1.push(new THREE.Vector3(modellist[j].children[i].position.x,modellist[j].children[i].position.y+100,modellist[j].children[i].position.z-25));
-  //         scope.initanimate(modellist[j].children[i],modellist[j].name+"yapianon",points1,0.5,true,0);
-  //         let points2 = [];
-  //         points2.push(new THREE.Vector3(modellist[j].children[i].position.x,modellist[j].children[i].position.y+100,modellist[j].children[i].position.z-25));
-  //         points2.push(new THREE.Vector3(modellist[j].children[i].position.x,modellist[j].children[i].position.y,modellist[j].children[i].position.z));
-  //         scope.initanimate(modellist[j].children[i],modellist[j].name+"yapianoff",points2,0.5,true,0);
-  //       }
-  //       if(modellist[j].children[i].name == "fanghuozhao"){
-  //         let points1 = [];
-  //
-  //         points1.push(new THREE.Vector3(modellist[j].children[i].position.x,modellist[j].children[i].position.y,modellist[j].children[i].position.z));
-  //         points1.push(new THREE.Vector3(modellist[j].children[i].position.x,modellist[j].children[i].position.y,modellist[j].children[i].position.z+200));
-  //         scope.initanimate(modellist[j].children[i],modellist[j].name+"fanghuozhaoon",points1,0.5,true,0);
-  //
-  //         let points2 = [];
-  //         points2.push(new THREE.Vector3(modellist[j].children[i].position.x,modellist[j].children[i].position.y,modellist[j].children[i].position.z+200));
-  //         points2.push(new THREE.Vector3(modellist[j].children[i].position.x,modellist[j].children[i].position.y,modellist[j].children[i].position.z));
-  //         scope.initanimate(modellist[j].children[i],modellist[j].name+"fanghuozhaooff",points2,0.5,true,0);
-  //       }
-  //       if(modellist[j].children[i].name == "dianyuanpian"){
-  //         let points1 = [];
-  //         points1.push(new THREE.Vector3(modellist[j].children[i].position.x,modellist[j].children[i].position.y,modellist[j].children[i].position.z));
-  //         points1.push(new THREE.Vector3(modellist[j].children[i].position.x,modellist[j].children[i].position.y,modellist[j].children[i].position.z-50));
-  //         scope.initanimate(modellist[j].children[i],modellist[j].name+"dianyuanpianon",points1,0.5,true,0);
-  //         let points2 = [];
-  //         points2.push(new THREE.Vector3(modellist[j].children[i].position.x,modellist[j].children[i].position.y,modellist[j].children[i].position.z-50));
-  //         points2.push(new THREE.Vector3(modellist[j].children[i].position.x,modellist[j].children[i].position.y,modellist[j].children[i].position.z));
-  //         scope.initanimate(modellist[j].children[i],modellist[j].name+"dianyuanpianoff",points2,0.5,true,0);
-  //       }
-  //       if(modellist[j].children[i].name == "xinpian"){
-  //         let points1 = [];
-  //         points1.push(new THREE.Vector3(modellist[j].children[i].position.x,modellist[j].children[i].position.y,modellist[j].children[i].position.z));
-  //         points1.push(new THREE.Vector3(modellist[j].children[i].position.x,modellist[j].children[i].position.y+150,modellist[j].children[i].position.z));
-  //         scope.initanimate(modellist[j].children[i],modellist[j].name+"xinpianon",points1,0.5,true,0);
-  //         let points2 = [];
-  //         points2.push(new THREE.Vector3(modellist[j].children[i].position.x,modellist[j].children[i].position.y+150,modellist[j].children[i].position.z));
-  //         points2.push(new THREE.Vector3(modellist[j].children[i].position.x,modellist[j].children[i].position.y,modellist[j].children[i].position.z));
-  //         scope.initanimate(modellist[j].children[i],modellist[j].name+"xinpianoff",points2,0.5,true,0);
-  //       }
-  //       if(modellist[j].children[i].name =="jueyuanzhou"){
-  //         let points1 = [];
-  //         points1.push(new THREE.Vector3(modellist[j].children[i].position.x,modellist[j].children[i].position.y,modellist[j].children[i].position.z));
-  //         points1.push(new THREE.Vector3(modellist[j].children[i].position.x,modellist[j].children[i].position.y+100,modellist[j].children[i].position.z));
-  //         scope.initanimate(modellist[j].children[i],modellist[j].name+"jueyuanzhouon",points1,0.5,true,0);
-  //         let points2 = [];
-  //         points2.push(new THREE.Vector3(modellist[j].children[i].position.x,modellist[j].children[i].position.y+100,modellist[j].children[i].position.z));
-  //         points2.push(new THREE.Vector3(modellist[j].children[i].position.x,modellist[j].children[i].position.y,modellist[j].children[i].position.z));
-  //         scope.initanimate(modellist[j].children[i],modellist[j].name+"jueyuanzhouoff",points2,0.5,true,0);
-  //       }
-  //       if(modellist[j].children[i].name =="cigang"){
-  //         let points1 = [];
-  //         points1.push(new THREE.Vector3(modellist[j].children[i].position.x,modellist[j].children[i].position.y,modellist[j].children[i].position.z));
-  //         points1.push(new THREE.Vector3(modellist[j].children[i].position.x,modellist[j].children[i].position.y-100,modellist[j].children[i].position.z+100));
-  //         scope.initanimate(modellist[j].children[i],modellist[j].name+"cigangon",points1,0.5,true,0);
-  //         let points2 = [];
-  //         points2.push(new THREE.Vector3(modellist[j].children[i].position.x,modellist[j].children[i].position.y-100,modellist[j].children[i].position.z+100));
-  //         points2.push(new THREE.Vector3(modellist[j].children[i].position.x,modellist[j].children[i].position.y,modellist[j].children[i].position.z));
-  //         scope.initanimate(modellist[j].children[i],modellist[j].name+"cigangoff",points2,0.5,true,0);
-  //       }
-  //     }
-  //
-  //   }
-  //   //
-  //
-  //
-  //
-  // }
-  this.initlistnew = function(modellist){
-
-    for(let j=0,lenj=modellist.length;j<lenj;j++){
-      scope.animatelist[modellist[j].code+"chaijie"] = [];
-      scope.animatelist[modellist[j].code+"fuwei"] = [];
-      for(let i=0,leni=modellist[j].children.length;i<leni;i++){
-        if(modellist[j].children[i].name == "dizuo"){
-          let points1 = [];
-          points1.push(new THREE.Vector3(modellist[j].children[i].position.x,modellist[j].children[i].position.y,modellist[j].children[i].position.z));
-          points1.push(new THREE.Vector3(modellist[j].children[i].position.x,modellist[j].children[i].position.y,modellist[j].children[i].position.z-150));
-          scope.initanimate(scope.animatelist[modellist[j].code+"chaijie"],modellist[j].children[i],modellist[j].name+"dizuoon",points1,0.5,true,0);
-          let points2 = [];
-          points2.push(new THREE.Vector3(modellist[j].children[i].position.x,modellist[j].children[i].position.y,modellist[j].children[i].position.z-150));
-          points2.push(new THREE.Vector3(modellist[j].children[i].position.x,modellist[j].children[i].position.y,modellist[j].children[i].position.z));
-          scope.initanimate(scope.animatelist[modellist[j].code+"fuwei"],modellist[j].children[i],modellist[j].name+"dizuooff",points2,0.5,true,0);
-
-
-        }
-        if(modellist[j].children[i].name == "Lxing"){
-          let points1 = [];
-          points1.push(new THREE.Vector3(modellist[j].children[i].position.x,modellist[j].children[i].position.y,modellist[j].children[i].position.z));
-          points1.push(new THREE.Vector3(modellist[j].children[i].position.x,modellist[j].children[i].position.y-50,modellist[j].children[i].position.z));
-          scope.initanimate(scope.animatelist[modellist[j].code+"chaijie"],modellist[j].children[i],modellist[j].name+"Lxingon",points1,0.5,true,0);
-          let points2 = [];
-          points2.push(new THREE.Vector3(modellist[j].children[i].position.x,modellist[j].children[i].position.y-50,modellist[j].children[i].position.z));
-          points2.push(new THREE.Vector3(modellist[j].children[i].position.x,modellist[j].children[i].position.y,modellist[j].children[i].position.z));
-          scope.initanimate(scope.animatelist[modellist[j].code+"fuwei"],modellist[j].children[i],modellist[j].name+"Lxingoff",points2,0.5,true,0);
-        }
-        if(modellist[j].children[i].name == "jiaoxingxiantie"){
-          let points1 = [];
-          points1.push(new THREE.Vector3(modellist[j].children[i].position.x,modellist[j].children[i].position.y,modellist[j].children[i].position.z));
-          points1.push(new THREE.Vector3(modellist[j].children[i].position.x,modellist[j].children[i].position.y,modellist[j].children[i].position.z+25));
-          scope.initanimate(scope.animatelist[modellist[j].code+"chaijie"],modellist[j].children[i],modellist[j].name+"jiaoxingxiantieon",points1,0.5,true,0);
-          let points2 = [];
-          points2.push(new THREE.Vector3(modellist[j].children[i].position.x,modellist[j].children[i].position.y,modellist[j].children[i].position.z+25));
-          points2.push(new THREE.Vector3(modellist[j].children[i].position.x,modellist[j].children[i].position.y,modellist[j].children[i].position.z));
-          scope.initanimate(scope.animatelist[modellist[j].code+"fuwei"],modellist[j].children[i],modellist[j].name+"jiaoxingxiantieoff",points2,0.5,true,0);
-        }
-        if(modellist[j].children[i].name == "xianquan"){
-          let points1 = [];
-          points1.push(new THREE.Vector3(modellist[j].children[i].position.x,modellist[j].children[i].position.y,modellist[j].children[i].position.z));
-          points1.push(new THREE.Vector3(modellist[j].children[i].position.x,modellist[j].children[i].position.y-100,modellist[j].children[i].position.z));
-          scope.initanimate(scope.animatelist[modellist[j].code+"chaijie"],modellist[j].children[i],modellist[j].name+"xianquanon",points1,0.5,true,0);
-          let points2 = [];
-          points2.push(new THREE.Vector3(modellist[j].children[i].position.x,modellist[j].children[i].position.y-100,modellist[j].children[i].position.z));
-          points2.push(new THREE.Vector3(modellist[j].children[i].position.x,modellist[j].children[i].position.y,modellist[j].children[i].position.z));
-          scope.initanimate(scope.animatelist[modellist[j].code+"fuwei"],modellist[j].children[i],modellist[j].name+"xianquanoff",points2,0.5,true,0);
-        }
-        if(modellist[j].children[i].name == "zhongchuipian"){
-          let points1 = [];
-          points1.push(new THREE.Vector3(modellist[j].children[i].position.x,modellist[j].children[i].position.y,modellist[j].children[i].position.z));
-          points1.push(new THREE.Vector3(modellist[j].children[i].position.x,modellist[j].children[i].position.y-25,modellist[j].children[i].position.z));
-          scope.initanimate(scope.animatelist[modellist[j].code+"chaijie"],modellist[j].children[i],modellist[j].name+"zhongchuipianon",points1,0.5,true,0);
-          let points2 = [];
-          points2.push(new THREE.Vector3(modellist[j].children[i].position.x,modellist[j].children[i].position.y+25,modellist[j].children[i].position.z));
-          points2.push(new THREE.Vector3(modellist[j].children[i].position.x,modellist[j].children[i].position.y,modellist[j].children[i].position.z));
-          scope.initanimate(scope.animatelist[modellist[j].code+"fuwei"],modellist[j].children[i],modellist[j].name+"zhongchuipianoff",points2,0.5,true,0);
-        }
-        if(modellist[j].children[i].name == "lagan"){
-          let points1 = [];
-          points1.push(new THREE.Vector3(modellist[j].children[i].position.x,modellist[j].children[i].position.y,modellist[j].children[i].position.z));
-          points1.push(new THREE.Vector3(modellist[j].children[i].position.x,modellist[j].children[i].position.y+100,modellist[j].children[i].position.z+50));
-          scope.initanimate(scope.animatelist[modellist[j].code+"chaijie"],modellist[j].children[i],modellist[j].name+"laganon",points1,0.5,true,0);
-          let points2 = [];
-          points2.push(new THREE.Vector3(modellist[j].children[i].position.x,modellist[j].children[i].position.y+100,modellist[j].children[i].position.z+50));
-          points2.push(new THREE.Vector3(modellist[j].children[i].position.x,modellist[j].children[i].position.y,modellist[j].children[i].position.z));
-          scope.initanimate(scope.animatelist[modellist[j].code+"fuwei"],modellist[j].children[i],modellist[j].name+"laganoff",points2,0.5,true,0);
-        }
-        if(modellist[j].children[i].name == "dongjiedianzhou"){
-          let points1 = [];
-          points1.push(new THREE.Vector3(modellist[j].children[i].position.x,modellist[j].children[i].position.y,modellist[j].children[i].position.z));
-          points1.push(new THREE.Vector3(modellist[j].children[i].position.x,modellist[j].children[i].position.y+100,modellist[j].children[i].position.z+25));
-          scope.initanimate(scope.animatelist[modellist[j].code+"chaijie"],modellist[j].children[i],modellist[j].name+"dongjiedianzhouon",points1,0.5,true,0);
-          let points2 = [];
-          points2.push(new THREE.Vector3(modellist[j].children[i].position.x,modellist[j].children[i].position.y+100,modellist[j].children[i].position.z+25));
-          points2.push(new THREE.Vector3(modellist[j].children[i].position.x,modellist[j].children[i].position.y,modellist[j].children[i].position.z));
-          scope.initanimate(scope.animatelist[modellist[j].code+"fuwei"],modellist[j].children[i],modellist[j].name+"dongjiedianzhouoff",points2,0.5,true,0);
-        }
-        if(modellist[j].children[i].name == "neibu"){
-          let points1 = [];
-          points1.push(new THREE.Vector3(modellist[j].children[i].position.x,modellist[j].children[i].position.y,modellist[j].children[i].position.z));
-          points1.push(new THREE.Vector3(modellist[j].children[i].position.x,modellist[j].children[i].position.y,modellist[j].children[i].position.z-50));
-          scope.initanimate(scope.animatelist[modellist[j].code+"chaijie"],modellist[j].children[i],modellist[j].name+"neibuon",points1,0.5,true,0);
-          let points2 = [];
-          points2.push(new THREE.Vector3(modellist[j].children[i].position.x,modellist[j].children[i].position.y,modellist[j].children[i].position.z-50));
-          points2.push(new THREE.Vector3(modellist[j].children[i].position.x,modellist[j].children[i].position.y,modellist[j].children[i].position.z));
-          scope.initanimate(scope.animatelist[modellist[j].code+"fuwei"],modellist[j].children[i],modellist[j].name+"neibuoff",points2,0.5,true,0);
-        }
-        if(modellist[j].children[i].name == "jiedian"){
-          let points1 = [];
-          points1.push(new THREE.Vector3(modellist[j].children[i].position.x,modellist[j].children[i].position.y,modellist[j].children[i].position.z));
-          points1.push(new THREE.Vector3(modellist[j].children[i].position.x,modellist[j].children[i].position.y+100,modellist[j].children[i].position.z-15));
-          scope.initanimate(scope.animatelist[modellist[j].code+"chaijie"],modellist[j].children[i],modellist[j].name+"jiedianon",points1,0.5,true,0);
-          let points2 = [];
-          points2.push(new THREE.Vector3(modellist[j].children[i].position.x,modellist[j].children[i].position.y+100,modellist[j].children[i].position.z-15));
-          points2.push(new THREE.Vector3(modellist[j].children[i].position.x,modellist[j].children[i].position.y,modellist[j].children[i].position.z));
-          scope.initanimate(scope.animatelist[modellist[j].code+"fuwei"],modellist[j].children[i],modellist[j].name+"jiedianoff",points2,0.5,true,0);
-
-        }
-        if(modellist[j].children[i].name == "yapian"){
-          let points1 = [];
-          points1.push(new THREE.Vector3(modellist[j].children[i].position.x,modellist[j].children[i].position.y,modellist[j].children[i].position.z));
-          points1.push(new THREE.Vector3(modellist[j].children[i].position.x,modellist[j].children[i].position.y+100,modellist[j].children[i].position.z-25));
-          scope.initanimate(scope.animatelist[modellist[j].code+"chaijie"],modellist[j].children[i],modellist[j].name+"yapianon",points1,0.5,true,0);
-          let points2 = [];
-          points2.push(new THREE.Vector3(modellist[j].children[i].position.x,modellist[j].children[i].position.y+100,modellist[j].children[i].position.z-25));
-          points2.push(new THREE.Vector3(modellist[j].children[i].position.x,modellist[j].children[i].position.y,modellist[j].children[i].position.z));
-          scope.initanimate(scope.animatelist[modellist[j].code+"fuwei"],modellist[j].children[i],modellist[j].name+"yapianoff",points2,0.5,true,0);
-        }
-        if(modellist[j].children[i].name == "fanghuozhao"){
-          let points1 = [];
-
-          points1.push(new THREE.Vector3(modellist[j].children[i].position.x,modellist[j].children[i].position.y,modellist[j].children[i].position.z));
-          points1.push(new THREE.Vector3(modellist[j].children[i].position.x,modellist[j].children[i].position.y,modellist[j].children[i].position.z+200));
-          scope.initanimate(scope.animatelist[modellist[j].code+"chaijie"],modellist[j].children[i],modellist[j].name+"fanghuozhaoon",points1,0.5,true,0);
-
-          let points2 = [];
-          points2.push(new THREE.Vector3(modellist[j].children[i].position.x,modellist[j].children[i].position.y,modellist[j].children[i].position.z+200));
-          points2.push(new THREE.Vector3(modellist[j].children[i].position.x,modellist[j].children[i].position.y,modellist[j].children[i].position.z));
-          scope.initanimate(scope.animatelist[modellist[j].code+"fuwei"],modellist[j].children[i],modellist[j].name+"fanghuozhaooff",points2,0.5,true,0);
-        }
-        if(modellist[j].children[i].name == "dianyuanpian"){
-          let points1 = [];
-          points1.push(new THREE.Vector3(modellist[j].children[i].position.x,modellist[j].children[i].position.y,modellist[j].children[i].position.z));
-          points1.push(new THREE.Vector3(modellist[j].children[i].position.x,modellist[j].children[i].position.y,modellist[j].children[i].position.z-50));
-          scope.initanimate(scope.animatelist[modellist[j].code+"chaijie"],modellist[j].children[i],modellist[j].name+"dianyuanpianon",points1,0.5,true,0);
-          let points2 = [];
-          points2.push(new THREE.Vector3(modellist[j].children[i].position.x,modellist[j].children[i].position.y,modellist[j].children[i].position.z-50));
-          points2.push(new THREE.Vector3(modellist[j].children[i].position.x,modellist[j].children[i].position.y,modellist[j].children[i].position.z));
-          scope.initanimate(scope.animatelist[modellist[j].code+"fuwei"],modellist[j].children[i],modellist[j].name+"dianyuanpianoff",points2,0.5,true,0);
-        }
-        if(modellist[j].children[i].name == "xinpian"){
-          let points1 = [];
-          points1.push(new THREE.Vector3(modellist[j].children[i].position.x,modellist[j].children[i].position.y,modellist[j].children[i].position.z));
-          points1.push(new THREE.Vector3(modellist[j].children[i].position.x,modellist[j].children[i].position.y+150,modellist[j].children[i].position.z));
-          scope.initanimate(scope.animatelist[modellist[j].code+"chaijie"],modellist[j].children[i],modellist[j].name+"xinpianon",points1,0.5,true,0);
-          let points2 = [];
-          points2.push(new THREE.Vector3(modellist[j].children[i].position.x,modellist[j].children[i].position.y+150,modellist[j].children[i].position.z));
-          points2.push(new THREE.Vector3(modellist[j].children[i].position.x,modellist[j].children[i].position.y,modellist[j].children[i].position.z));
-          scope.initanimate(scope.animatelist[modellist[j].code+"fuwei"],modellist[j].children[i],modellist[j].name+"xinpianoff",points2,0.5,true,0);
-        }
-        if(modellist[j].children[i].name =="jueyuanzhou"){
-          let points1 = [];
-          points1.push(new THREE.Vector3(modellist[j].children[i].position.x,modellist[j].children[i].position.y,modellist[j].children[i].position.z));
-          points1.push(new THREE.Vector3(modellist[j].children[i].position.x,modellist[j].children[i].position.y+100,modellist[j].children[i].position.z));
-          scope.initanimate(scope.animatelist[modellist[j].code+"chaijie"],modellist[j].children[i],modellist[j].name+"jueyuanzhouon",points1,0.5,true,0);
-          let points2 = [];
-          points2.push(new THREE.Vector3(modellist[j].children[i].position.x,modellist[j].children[i].position.y+100,modellist[j].children[i].position.z));
-          points2.push(new THREE.Vector3(modellist[j].children[i].position.x,modellist[j].children[i].position.y,modellist[j].children[i].position.z));
-          scope.initanimate(scope.animatelist[modellist[j].code+"fuwei"],modellist[j].children[i],modellist[j].name+"jueyuanzhouoff",points2,0.5,true,0);
-        }
-        if(modellist[j].children[i].name =="cigang"){
-          let points1 = [];
-          points1.push(new THREE.Vector3(modellist[j].children[i].position.x,modellist[j].children[i].position.y,modellist[j].children[i].position.z));
-          points1.push(new THREE.Vector3(modellist[j].children[i].position.x,modellist[j].children[i].position.y-100,modellist[j].children[i].position.z+100));
-          scope.initanimate(scope.animatelist[modellist[j].code+"chaijie"],modellist[j].children[i],modellist[j].name+"cigangon",points1,0.5,true,0);
-          let points2 = [];
-          points2.push(new THREE.Vector3(modellist[j].children[i].position.x,modellist[j].children[i].position.y-100,modellist[j].children[i].position.z+100));
-          points2.push(new THREE.Vector3(modellist[j].children[i].position.x,modellist[j].children[i].position.y,modellist[j].children[i].position.z));
-          scope.initanimate(scope.animatelist[modellist[j].code+"fuwei"],modellist[j].children[i],modellist[j].name+"cigangoff",points2,0.5,true,0);
-        }
-
-        if(modellist[j].children[i].name =="ccichuihuqi"){
-          let points1 = [];
-          points1.push(new THREE.Vector3(modellist[j].children[i].position.x,modellist[j].children[i].position.y,modellist[j].children[i].position.z));
-          points1.push(new THREE.Vector3(modellist[j].children[i].position.x,modellist[j].children[i].position.y-50,modellist[j].children[i].position.z+100));
-          scope.initanimate(scope.animatelist[modellist[j].code+"chaijie"],modellist[j].children[i],modellist[j].name+"ccichuihuqion",points1,0.5,true,0);
-          let points2 = [];
-          points2.push(new THREE.Vector3(modellist[j].children[i].position.x,modellist[j].children[i].position.y-50,modellist[j].children[i].position.z+100));
-          points2.push(new THREE.Vector3(modellist[j].children[i].position.x,modellist[j].children[i].position.y,modellist[j].children[i].position.z));
-          scope.initanimate(scope.animatelist[modellist[j].code+"fuwei"],modellist[j].children[i],modellist[j].name+"ccichuihuqioff",points2,0.5,true,0);
-        }
-
-        if(modellist[j].children[i].name =="cichuihuqi"){
-          let points1 = [];
-          points1.push(new THREE.Vector3(modellist[j].children[i].position.x,modellist[j].children[i].position.y,modellist[j].children[i].position.z));
-          points1.push(new THREE.Vector3(modellist[j].children[i].position.x,modellist[j].children[i].position.y-50,modellist[j].children[i].position.z+100));
-          scope.initanimate(scope.animatelist[modellist[j].code+"chaijie"],modellist[j].children[i],modellist[j].name+"cichuihuqion",points1,0.5,true,0);
-          let points2 = [];
-          points2.push(new THREE.Vector3(modellist[j].children[i].position.x,modellist[j].children[i].position.y-50,modellist[j].children[i].position.z+100));
-          points2.push(new THREE.Vector3(modellist[j].children[i].position.x,modellist[j].children[i].position.y,modellist[j].children[i].position.z));
-          scope.initanimate(scope.animatelist[modellist[j].code+"fuwei"],modellist[j].children[i],modellist[j].name+"cichuihuqioff",points2,0.5,true,0);
-        }
-
-        if(modellist[j].children[i].name =="jiaqiangdongjiediandanyuan"){
-          let points1 = [];
-          points1.push(new THREE.Vector3(modellist[j].children[i].position.x,modellist[j].children[i].position.y,modellist[j].children[i].position.z));
-          points1.push(new THREE.Vector3(modellist[j].children[i].position.x,modellist[j].children[i].position.y+25,modellist[j].children[i].position.z+100));
-          scope.initanimate(scope.animatelist[modellist[j].code+"chaijie"],modellist[j].children[i],modellist[j].name+"jiaqiangdongjiediandanyuanon",points1,0.5,true,0);
-          let points2 = [];
-          points2.push(new THREE.Vector3(modellist[j].children[i].position.x,modellist[j].children[i].position.y+25,modellist[j].children[i].position.z+100));
-          points2.push(new THREE.Vector3(modellist[j].children[i].position.x,modellist[j].children[i].position.y,modellist[j].children[i].position.z));
-          scope.initanimate(scope.animatelist[modellist[j].code+"fuwei"],modellist[j].children[i],modellist[j].name+"jiaqiangdongjiediandanyuanoff",points2,0.5,true,0);
-        }
-
-        if(modellist[j].children[i].name =="yunmugehupian"){
-          let points1 = [];
-          points1.push(new THREE.Vector3(modellist[j].children[i].position.x,modellist[j].children[i].position.y,modellist[j].children[i].position.z));
-          points1.push(new THREE.Vector3(modellist[j].children[i].position.x,modellist[j].children[i].position.y+100,modellist[j].children[i].position.z+100));
-          scope.initanimate(scope.animatelist[modellist[j].code+"chaijie"],modellist[j].children[i],modellist[j].name+"yunmugehupianon",points1,0.5,true,0);
-          let points2 = [];
-          points2.push(new THREE.Vector3(modellist[j].children[i].position.x,modellist[j].children[i].position.y+100,modellist[j].children[i].position.z+100));
-          points2.push(new THREE.Vector3(modellist[j].children[i].position.x,modellist[j].children[i].position.y,modellist[j].children[i].position.z));
-          scope.initanimate(scope.animatelist[modellist[j].code+"fuwei"],modellist[j].children[i],modellist[j].name+"yunmugehupianoff",points2,0.5,true,0);
-        }
-      }
-
-    }
-    // let points = [];
-    // points.push(new THREE.Vector3(modellist[j].children[i].position.x,modellist[j].children[i].position.y,modellist[j].children[i].position.z));
-    // points.push(new THREE.Vector3(modellist[j].children[i].position.x,modellist[j].children[i].position.y,modellist[j].children[i].position.z));
-    // scope.initanimate(modellist[j].children[i],modellist[j].name+"select1",points,true);
-    let modelorderlist = [];
-
-
-    modelorderlist[modellist[0].code] = [
-      {name:"fanghuozhao",pos:[0,0,200]},
-      {name:"dizuo",pos:[0,0,-150]},
-      {name:"dianyuanpian",pos:[0,0,-50]},
-      {name:"neibu",pos:[0,0,-25]},
-      {name:"xianquan",pos:[0,-200,0]},
-      {name:"Lxing",pos:[0,-150,0]},
-      {name:"jiaoxingxiantie",pos:[0,-100,50]},
-      {name:"zhongchuipian",pos:[0,-100,-50]},
-      {name:"jiedian",pos:[0,0,100]},
-      {name:"dongjiedianzhou",pos:[0,100,100]},
-      {name:"jueyuanzhou",pos:[0,150,50]},
-      {name:"lagan",pos:[0,150,0]},
-      {name:"yapian",pos:[0,0,25]}
-    ];
-    modelorderlist[modellist[1].code] = [
-      {name:"fanghuozhao",pos:[0,0,200]},
-      {name:"dizuo",pos:[0,0,-150]},
-      {name:"dianyuanpian",pos:[0,0,-50]},
-      {name:"neibu",pos:[0,0,-25]},
-      {name:"xianquan",pos:[0,-200,0]},
-      {name:"Lxing",pos:[0,-150,0]},
-      {name:"jiaoxingxiantie",pos:[0,-100,50]},
-      {name:"zhongchuipian",pos:[0,-100,-50]},
-      {name:"jiedian",pos:[0,0,100]},
-      {name:"dongjiedianzhou",pos:[0,100,100]},
-      {name:"jueyuanzhou",pos:[0,150,50]},
-      {name:"lagan",pos:[0,150,0]},
-      {name:"yapian",pos:[0,0,25]}
-    ];
-    modelorderlist[modellist[2].code] = [
-      {name:"fanghuozhao",pos:[0,0,200]},
-      {name:"dizuo",pos:[0,0,-150]},
-      {name:"dianyuanpian",pos:[0,0,-50]},
-      {name:"neibu",pos:[0,0,-25]},
-      {name:"xianquan",pos:[0,-200,0]},
-      {name:"Lxing",pos:[0,-150,0]},
-      {name:"jiaoxingxiantie",pos:[0,-100,50]},
-      {name:"zhongchuipian",pos:[0,-100,-50]},
-      {name:"jiedian",pos:[0,0,100]},
-      {name:"dongjiedianzhou",pos:[0,100,100]},
-      {name:"jueyuanzhou",pos:[0,150,50]},
-      {name:"lagan",pos:[0,150,0]},
-      {name:"yapian",pos:[0,0,25]}
-    ];
-    modelorderlist[modellist[3].code] = [
-      {name:"fanghuozhao",pos:[0,0,200]},
-      {name:"dizuo",pos:[0,0,-150]},
-      {name:"dianyuanpian",pos:[0,0,-50]},
-      {name:"neibu",pos:[0,0,-25]},
-      {name:"xianquan",pos:[0,-200,0]},
-      {name:"Lxing",pos:[0,-150,0]},
-      {name:"jiaoxingxiantie",pos:[0,-100,50]},
-      {name:"zhongchuipian",pos:[0,-100,-50]},
-      {name:"jiedian",pos:[0,0,100]},
-      {name:"dongjiedianzhou",pos:[0,100,100]},
-      {name:"jueyuanzhou",pos:[0,150,50]},
-      {name:"lagan",pos:[0,150,0]},
-      {name:"yapian",pos:[0,0,25]}
-    ];
-    modelorderlist[modellist[4].code] = [
-      {name:"fanghuozhao",pos:[0,0,200]},
-      {name:"dizuo",pos:[0,0,-150]},
-      {name:"dianyuanpian",pos:[0,0,-50]},
-      {name:"neibu",pos:[0,0,-25]},
-      {name:"xianquan",pos:[0,-200,0]},
-      {name:"Lxing",pos:[0,-150,0]},
-      {name:"zhongchuipian",pos:[0,-100,-50]},
-      {name:"jiaoxingxiantie",pos:[0,-100,50]},
-      {name:"jiedian",pos:[0,150,100]},
-      {name:"dongjiedianzhou",pos:[0,150,75]},
-      {name:"jueyuanzhou",pos:[0,150,50]},
-      {name:"yunmugehupian",pos:[0,100,100]},
-
-      {name:"jiaqiangdongjiediandanyuan",pos:[0,75,75]},
-      {name:"cichuihuqi",pos:[0,75,25]},
-      {name:"lagan",pos:[0,150,0]},
-      {name:"yapian1",pos:[0,0,100]},
-
-      {name:"yapian",pos:[0,0,10]}
-    ];
-    modelorderlist[modellist[5].code] = [
-      {name:"fanghuozhao",pos:[0,0,200]},
-      {name:"dizuo",pos:[0,0,-150]},
-      {name:"dianyuanpian",pos:[0,0,-50]},
-      {name:"neibu",pos:[0,0,-25]},
-      {name:"xianquan",pos:[0,-200,0]},
-      {name:"cigang",pos:[0,-200,50]},
-      {name:"Lxing",pos:[0,-150,0]},
-      {name:"jiaoxingxiantie",pos:[0,-100,50]},
-      {name:"zhongchuipian",pos:[0,-100,-50]},
-      {name:"jiedian",pos:[0,0,100]},
-      {name:"dongjiedianzhou",pos:[0,100,100]},
-      {name:"jueyuanzhou",pos:[0,150,50]},
-      {name:"ccichuihuqi",pos:[0,-50,75]},
-      {name:"lagan",pos:[0,150,0]},
-      {name:"yapian",pos:[0,0,25]}
-    ];
-
-    for(let j=0,lenj=modellist.length;j<lenj;j++){
-      scope.animatelist[modellist[j].code+"on"] = [];
-      scope.animatelist[modellist[j].code+"off"] = [];
-      for(let i=0,leni=modelorderlist[modellist[j].code].length;i<leni;i++){
-        let orderdata = modelorderlist[modellist[j].code];
-        let modelon = modellist[j].getObjectByName(orderdata[i].name);
-        // modelon.helpbox = undefined;
-        let pointson = [];
-        pointson.push(new THREE.Vector3(modelon.position.x,modelon.position.y,modelon.position.z));
-        pointson.push(new THREE.Vector3(modelon.position.x+orderdata[i].pos[0],modelon.position.y+orderdata[i].pos[1],modelon.position.z+orderdata[i].pos[2]));
-
-        let pointsoff = [];
-        pointsoff.push(new THREE.Vector3(modelon.position.x+orderdata[i].pos[0],modelon.position.y+orderdata[i].pos[1],modelon.position.z+orderdata[i].pos[2]));
-        pointsoff.push(new THREE.Vector3(modelon.position.x,modelon.position.y,modelon.position.z));
-
-        // if(i == 0){
-        scope.initanimate(scope.animatelist[modellist[j].code+"on"],modelon,modellist[j].code+modelon.name+"on",pointson,0.01,true,i);
-        scope.initanimate(scope.animatelist[modellist[j].code+"off"],modelon,modellist[j].code+modelon.name+"off",pointsoff,0.01,true,leni-i-1);
-        // }else if((i+1)<leni){
-        //   scope.initanimate(modelon,modellist[j].code+modelon.name+"on",pointson,0.01,true,modellist[j].code+orderdata[i+1].name+"on");
-        //   scope.initanimate(modelon,modellist[j].code+modelon.name+"off",pointsoff,0.01,true,modellist[j].code+orderdata[i-1].name+"off");
-        // }else{
-        //   scope.initanimate(modelon,modellist[j].code+modelon.name+"on",pointson,0.01,true);
-        //   scope.initanimate(modelon,modellist[j].code+modelon.name+"off",pointsoff,0.01,true,modellist[j].code+orderdata[i-1].name+"off");
-        // }
-
-        // if(modellist[j].children[i].name == "xinpian"){
-        // }
-        // if(modellist[j].children[i].name =="cigang"){
-        // }
-      }
-
-    }
-  }
-  //动画对象定义
-  this.initanimate = function(list,modelobject,name,points,speed,type,nextname){
-
-    let curve =  new THREE.CatmullRomCurve3(points);
-
-    // curve动画轨迹
-    // progress动画进度
-    // enable当前动画开关
-    // speed动画速度
-    let animate = {
-      name:name,
-      curve:curve,
-      progress:0,
-      directchange:false,
-      connectmodel:modelobject,
-      enable:false,
-      status:"start",
-      speed:speed,
-      next:null
-    };
-    // list[nextname] = [];
-    if(list[nextname] == undefined){
-      list[nextname] = [];
-    }
-    list[nextname].push(animate);
-
-    if(nextname){
-      // list[nextname] = animate;
-      // animate.next = nextname;
-    }else{
-      // list.push(animate);
-    }
-
-  }
-  this.setplaylist = function(nowlist,enable){
-
-    scope.playlist = nowlist;
-    scope.enable = enable;
-    scope.playorder = 0;
-    for(let i=0;i<scope.playlist[scope.playorder].length;i++){
-      scope.playlist[scope.playorder][i].status = "start";
-    }
-  }
-  this.updatehelpbox = function(nowhelpbox,nowtextplane){
-    scope.textplane = nowtextplane;
-    scope.helpbox = nowhelpbox;
-  }
-
-  this.startstop = function(){
-
-  }
-  this.next = function(){
-
-  }
-  this.before = function(){
-
-  }
-  //动画播放器
-  this.animateupdate = function(){
-    // console.log(scope.animatelist);
-
-    if(scope.enable){
-      if(scope.playlist){
-
-        for(let i=0;i<scope.playlist[scope.playorder].length;i++){
-          if(scope.playlist[scope.playorder][i].status == "start"){
-
-          }
-          if(scope.playlist[scope.playorder][i].progress>=1){
-            let point = scope.playlist[scope.playorder][i].curve.getPointAt(1);
-            //更新模型坐标
-            scope.playlist[scope.playorder][i].connectmodel.position.x = point.x;
-            scope.playlist[scope.playorder][i].connectmodel.position.y = point.y;
-            scope.playlist[scope.playorder][i].connectmodel.position.z = point.z;
-            scope.playlist[scope.playorder][i].enable = false;
-            scope.playlist[scope.playorder][i].status = "end";
-            scope.playlist[scope.playorder][i].progress = 0;
-
-
-            if(i >= scope.playlist[scope.playorder].length-1){
-              if(scope.playorder >= scope.playlist.length-1 ){
-                scope.playlist = null;
-                scope.status = true;
-                scope.enable = false;
-                main.animationmsgshowoff();
-                scope.nowmodelname = undefined;
-                scope.playorder = null;
-                break;
-              }else{
-                scope.playorder += 1;
-              }
-            }
-
-
-          }else{
-            // console.log(scope.animatelist[k].connectmodel);
-            if(scope.nowmodelname != scope.playlist[scope.playorder][i].connectmodel.name){
-              scope.nowmodelname = scope.playlist[scope.playorder][i].connectmodel.name;
-              main.animationmsgshowon(scope.playlist[scope.playorder][i].connectmodel);
-            }
-            //根据动画进度获取动画轨迹上点
-            scope.status = false;
-            let point = scope.playlist[scope.playorder][i].curve.getPointAt(scope.playlist[scope.playorder][i].progress);
-
-            //更新模型坐标
-            scope.playlist[scope.playorder][i].connectmodel.position.x = point.x;
-            scope.playlist[scope.playorder][i].connectmodel.position.y = point.y;
-            scope.playlist[scope.playorder][i].connectmodel.position.z = point.z;
-
-            if(scope.helpbox){
-              scope.helpbox.update();
-            }
-            if(scope.textplane){
-
-              scope.textplane.position.x = scope.playlist[scope.playorder][i].connectmodel.matrixWorld.elements[12];
-              scope.textplane.position.y = scope.playlist[scope.playorder][i].connectmodel.matrixWorld.elements[13]+100;
-              scope.textplane.position.z = scope.playlist[scope.playorder][i].connectmodel.matrixWorld.elements[14];
-            }
-            //判断模型转向
-            if(scope.playlist[scope.playorder][i].directchange){
-              let tangent = scope.playlist[scope.playorder][i].curve.getPointAt(scope.playlist[scope.playorder][i].progress+0.001);
-              // scope.animatelist[k]
-              tangent = null;
-            }
-            //增加动画进度，释放点变量
-            scope.playlist[scope.playorder][i].progress += scope.playlist[scope.playorder][i].speed;
-            point = null;
-
-          }
-
-        }
-
-      }
-    }
-  }
-
-
-}
diff --git a/src/jlmap3d/jl3ddevicetrain/config.js b/src/jlmap3d/jl3ddevicetrain/config.js
deleted file mode 100644
index 073cc3b34..000000000
--- a/src/jlmap3d/jl3ddevicetrain/config.js
+++ /dev/null
@@ -1,73 +0,0 @@
-import { getBaseUrl } from '@/utils/baseUrl';
-import { JL3D_LOCAL_STATIC } from '@/api/jlmap3d/assets3d.js';
-
-
-const BASE_API = getBaseUrl();
-let modelurl = JL3D_LOCAL_STATIC+"/MODEL/jdq/";
-// if(BASE_API == 'https://joylink.club/jlcloud'){
-//   modelurl = "https://joylink.club/oss/jdq/";
-// }else if(BASE_API == 'https://test.joylink.club/jlcloud'){
-//   modelurl = "https://test.joylink.club/oss/jdq/";
-// }
-
-var Staticmodel = {
-	Jdq1: {
-		id: "1",
-		name: "继电器a1700",
-		deviceType: "jdq1700",
-		type: "training",
-		picUrl: "",
-		assetUrl: modelurl + "jdq1700.FBX"
-	},
-	Jdq2: {
-		id: "1",
-		name: "继电器b1700",
-		deviceType: "jdq1700",
-		type: "training",
-		picUrl: "",
-		assetUrl: modelurl + "jdq1700.FBX"
-	},
-	Jdq3: {
-		id: "1",
-		name: "继电器c1700",
-		deviceType: "jdq1700",
-		type: "training",
-		picUrl: "",
-		assetUrl: modelurl + "jdq1700.FBX"
-	},
-	Jdq4: {
-		id: "1",
-		name: "继电器h18",
-		deviceType: "jdq",
-		type: "training",
-		picUrl: "",
-		assetUrl: modelurl + "jdqh18.FBX"
-	},
-	Jdq5: {
-		id: "1",
-		name: "继电器H125",
-		deviceType: "jdq",
-		type: "training",
-		picUrl: "",
-		assetUrl: modelurl + "jdqH125.FBX"
-	},
-
-	Jdq6: {
-		id: "1",
-		name: "继电器135",
-		deviceType: "jdq",
-		type: "training",
-		picUrl: "",
-		assetUrl: modelurl + "jdq135.FBX"
-	},
-	Jdqg:{
-		id: "0",
-		name: "继电器柜",
-		deviceType: "jdqg",
-		type: "training",
-		picUrl: "",
-		assetUrl: modelurl + "jdqg.FBX"
-	}
-}
-
-export { Staticmodel }
diff --git a/src/jlmap3d/jl3ddevicetrain/jl3ddevicetrain.js b/src/jlmap3d/jl3ddevicetrain/jl3ddevicetrain.js
deleted file mode 100644
index 511475cdb..000000000
--- a/src/jlmap3d/jl3ddevicetrain/jl3ddevicetrain.js
+++ /dev/null
@@ -1,576 +0,0 @@
-import { Staticmodel } from '@/jlmap3d/jl3ddevicetrain/config.js';
-import { JL3D_LOCAL_STATIC } from '@/api/jlmap3d/assets3d.js';
-//loader
-import { FBXLoader } from '@/jlmap3d/main/loaders/FBXLoader';
-import { OrbitControls } from '@/jlmap3d/main/control/OrbitControls';
-
-import { ModelManager } from '@/jlmap3d/jl3ddevicetrain/loader.js';
-import { Moveanimate } from '@/jlmap3d/jl3ddevicetrain/component/moveanimate.js';
-import { Jdqcontrol } from '@/jlmap3d/jl3ddevicetrain/component/jdqcontrol.js';
-
-import { DragControls } from '@/jlmap3d/main/control/DragControls.js';
-
-import StompClient from '@/jlmap3d/jl3ddevicetrain/component/StompClient.js';
-// import { Signallightload } from '@/jlmap3d/jl3ddevice/component/signallight.js';
-
-// import StompClient from '@/utils/sock';
-import {Stats} from '@/jlmap3d/main/lib/stats.min.js';
-
-var clock = new THREE.Clock();
-export function Jl3ddevice(dom,serviceid) {
-	let scope = this;
-	//helpbox选中包围框
-	//textplane三维介绍标牌
-	let helpbox,textplane;
-	let connect = null;
-	this.dom = dom;
-	this.nowcode = null;
-	this.animateswitch = false;
-	this.mixers = [];
-	this.showmodel = null;
-	//场景状态
-	this.status = 0;
-	//动画状态
-	this.animastats = false;
-	//当前选中模型
-	this.selectmodel = null;
-	//当前动画播放模型
-	this.animationmodel = null;
-	//初始化webgl渲染
-	let renderer = new THREE.WebGLRenderer({ antialias: true });
-	renderer.setPixelRatio( window.devicePixelRatio );
-	renderer.setSize(dom.offsetWidth, dom.offsetHeight);
-
-	// renderer.shadowMap.enabled = true;
-	// renderer.shadowMap.type = THREE.PCFSoftShadowMap;
-	renderer.setClearColor( 0x000000, 0 );
-	this.dom.appendChild(renderer.domElement);
-
-	//定义相机
-	let camera = new THREE.PerspectiveCamera(70, dom.offsetWidth / dom.offsetHeight, 0.01, 4000);
-	camera.position.set(-1000, 1500, 0);
-	camera.aspect = dom.offsetWidth / dom.offsetHeight;
-	camera.updateProjectionMatrix();
-
-	//视角轨迹控制器
-	this.controls = new THREE.OrbitControls(camera, dom);
-	this.controls.enabled = true;
-  this.controls.target = new THREE.Vector3(500,1000,0);
-	this.controls.screenSpacePanning = true;
-	this.controls.update();
-	this.controls.maxDistance = 3000;
-
-	//定义场景(渲染容器)
-	let scene = new THREE.Scene();
-	var bgTexture = new THREE.TextureLoader().load(JL3D_LOCAL_STATIC+"/background/other.jpg");
-  scene.background = bgTexture;
-
-	//定义全局光
-	let ambientLight = new THREE.AmbientLight(0xffffff, 1.3);
-	scene.add(ambientLight);
-
-	var light = new THREE.HemisphereLight( 0xffffff, 0x444444 );
-	light.position.set( 0, 200, 0 );
-	scene.add( light );
-
-	//网格地面
-	// var grid = new THREE.GridHelper( 1000, 20, 0x000000, 0x000000 );
-	// grid.material.opacity = 0.2;
-	// grid.material.transparent = true;
-	// grid.position.x = 10000;
-	// scene.add( grid );
-	let objects = [];
-	let dragcontrol = new THREE.DragControls( objects, camera, scope.dom );
-	dragcontrol.enabled = false;
-
-	//菜单选中设备更新设备较少
-	this.updateselect = function(updata){
-		// console.log(updata);
-		if(helpbox){
-			scene.remove( helpbox );
-			helpbox = null;
-		}
-		helpbox = new THREE.BoxHelper( updata.mesh, 0xff0000 );
-		// console.log(updata.mesh);
-		let point = {
-			x:updata.mesh.matrixWorld.elements[12],
-			y:updata.mesh.matrixWorld.elements[13],
-			z:updata.mesh.matrixWorld.elements[14]
-		};
-		settext(updata.mesh,point)
-		getdevicemsg(updata.mesh.name);
-		scene.add( helpbox );
-	}
-
-	//返回设备选择
-	this.backselect = function(){
-		move3();
-		updatemenulist(scope.jdqcontrol.devicelist,"all");
-
-		scope.modelmanager.controllist[0].position.set(19,1270,-275);
-		scope.modelmanager.controllist[0].rotation.y = -Math.PI/2;
-		scope.modelmanager.controllist[0].rotation.z = -Math.PI/2;
-
-		scope.modelmanager.controllist[1].position.set(19,1270,-165);
-		scope.modelmanager.controllist[1].rotation.y = -Math.PI/2;
-		scope.modelmanager.controllist[1].rotation.z = -Math.PI/2;
-
-		scope.modelmanager.controllist[2].position.set(19,1270,-55);
-		scope.modelmanager.controllist[2].rotation.y = -Math.PI/2;
-		scope.modelmanager.controllist[2].rotation.z = -Math.PI/2;
-
-		scope.modelmanager.controllist[3].position.set(19,1270,65);
-		scope.modelmanager.controllist[3].rotation.y = -Math.PI/2;
-		scope.modelmanager.controllist[3].rotation.z = -Math.PI/2;
-
-		scope.modelmanager.controllist[4].position.set(19,1270,170);
-		scope.modelmanager.controllist[4].rotation.y = -Math.PI/2;
-		scope.modelmanager.controllist[4].rotation.z = -Math.PI/2;
-
-		scope.modelmanager.controllist[5].position.set(19,1270,280);
-		scope.modelmanager.controllist[5].rotation.y = -Math.PI/2;
-		scope.modelmanager.controllist[5].rotation.z = -Math.PI/2;
-
-		camera.position.set(-1000, 1500, 0);
-		scope.controls.target = new THREE.Vector3(500,1000,0);
-		scope.controls.update();
-		scope.status = '0';
-		if(textplane){
-			scene.remove(textplane);
-			textplane.geometry.dispose();
-			textplane.material.dispose();
-		}
-		scope.selectmodel = null;
-		scope.jdqcontrol.devicelist = [];
-		scope.animastats = false;
-		updatemsg();
-	};
-
-	//设备分解、归位动画按钮
-	this.disperdevice1 = function(){
-
-		if(scope.status == '1'){
-			if(moveanima.status == true){
-				if(scope.animastats == false){
-					scope.animastats = true;
-					move1();
-				}	else if(scope.animastats == true){
-					scope.animastats = false;
-					move2();
-				}
-			}
-
-
-		}
-	};
-
-	this.disperdevice2 = function(){
-
-		if(scope.status == '1'){
-			if(moveanima.status == true){
-				if(scope.animastats == false){
-					scope.animastats = true;
-					moveanima.setplaylist(moveanima.animatelist[scope.selectmodel.code+"chaijie"],true);
-				}	else if(scope.animastats == true){
-					scope.animastats = false;
-					moveanima.setplaylist(moveanima.animatelist[scope.selectmodel.code+"fuwei"],true);
-				}
-			}
-
-
-		}
-	};
-
-
-
-	// let stats = new Stats();
-	// dom.appendChild( stats.dom );
-
-	document.addEventListener( "mousedown", onselect, false );
-	document.addEventListener( "mouseup", onmouseup, false );
-	document.addEventListener( "touchstart", ontouch, false );
-	window.onresize = function () {
-		camera.aspect = scope.dom.offsetWidth / scope.dom.offsetHeight;
-		camera.updateProjectionMatrix();
-		renderer.setSize(scope.dom.offsetWidth, scope.dom.offsetHeight);
-	}
-
-	this.jdqcontrol = new Jdqcontrol();
-
-	let moveanima = new Moveanimate(scope);
-
-	this.anime = null;
-	this.modelmanager = new ModelManager();
-	this.modelmanager.loadpromise(Staticmodel, scope.mixers,scene).then(function (data) {
-		moveanima.initlistnew(	scope.modelmanager.controllist);
-		connect = new StompClient();
-		// debugger
-		connect.subscribe("/queue/simulation/"+serviceid,callback);
-		animate();
-	});
-	this.sendmsg = function (type,index){
-		// console.log(index);
-		let msg = {
-			// deskId:serviceid,
-			id:index+1,
-			on:null
-		};
-		if(type == "0"){
-			msg.on = true;
-		}
-		if(type == "1"){
-			msg.on = false;
-		}
-		//"/app/topic/relay/"+msg.id+"/control/"+msg.on
-
-		connect.send("/app/topic/simulation/"+serviceid+"/relay/"+msg.id+"/control/"+msg.on,{});
-	}
-
-	this.upmodelaction = function(type,index){
-
-		if(type == "0"){
-			scope.modelmanager.actionlist[index].reset();
-			scope.modelmanager.actionlist[index].time = 0;
-			scope.modelmanager.actionlist[index].timeScale = 1;
-			scope.modelmanager.actionlist[index].play();
-		}
-		if(type == "1"){
-			scope.modelmanager.actionlist[index].reset();
-			scope.modelmanager.actionlist[index].time = scope.modelmanager.actionlist[index]._clip.duration;
-			scope.modelmanager.actionlist[index].timeScale = -1;
-			scope.modelmanager.actionlist[index].play();
-		}
-	};
-
-	this.buttoncontrol = function(action){
-		if("startstop"){
-			moveanima.startstop();
-		}
-		if("next"){
-			moveanima.next();
-		}
-		if("before"){
-			moveanima.before();
-		}
-
-	};
-
-	this.resetmodel = function(){
-		moveanima.setplaylist(moveanima.animatelist[scope.selectmodel.code+"fuwei"],true);
-	};
-	//循环渲染函数
-	let delta;
-	let data;
-	function callback(Response){
-		// console.log(Response);
-		data = JSON.parse(Response.body);
-		// console.log(data);
-		upjdqstats(data);
-	}
-	function animate() {
-
-		scope.anime = requestAnimationFrame(animate);
-		renderer.render(scene, camera);
-		moveanima.animateupdate();
-		// scope.controls.update();
-	  // stats.update();
-		delta = clock.getDelta();
-		if(textplane){
-			textplane.lookAt(camera.position);
-		}
-		if (scope.mixers) {
-			for (let i = 0; i < scope.mixers.length; i++) {
-				if (scope.mixers[i]._actions[0].isRunning()) {
-					scope.mixers[i].update(delta);
-				}
-			}
-		}
-
-	}
-
-
-	function move1(){
-		moveanima.setplaylist(moveanima.animatelist[scope.selectmodel.code+"on"],true);
-	}
-
-	function move2(){
-		if(scope.selectmodel){
-			moveanima.setplaylist(moveanima.animatelist[scope.selectmodel.code+"off"],true);
-		}
-	}
-
-	function move3(){
-		if(scope.selectmodel){
-			moveanima.setplaylist(moveanima.animatelist[scope.selectmodel.code+"fuwei"],true);
-		}
-
-	}
-	function ontouch(event){
-		if(scope.status == '0'){
-			let raycaster = new THREE.Raycaster();
-			//定义平面鼠标点击坐标
-
-			let mouse = new THREE.Vector2();
-			mouse.x = (event.touches[0].pageX / dom.offsetWidth) * 2 - 1;
-			mouse.y = -(event.touches[0].pageY / dom.offsetHeight) * 2 + 1;
-
-			raycaster.setFromCamera( mouse, camera );
-			for(let i=0,leni=scope.modelmanager.controllist.length;i<leni;i++){
-				let intersects = raycaster.intersectObjects( scope.modelmanager.controllist[i].children,true);
-
-				if(intersects[0]){
-					scope.modelmanager.controllist[i].position.set(10000,0,0);
-					scope.modelmanager.controllist[i].rotation.y = 0;
-					scope.modelmanager.controllist[i].rotation.z = 0;
-					camera.position.set(10800, 500, 0);
-					scope.controls.target = new THREE.Vector3(10000,0,0);
-					scope.jdqcontrol.jdqdevicelist(scope.modelmanager.controllist[i]);
-					updatemenulist(scope.jdqcontrol.devicelist,scope.modelmanager.controllist[i].code);
-					scope.controls.update();
-
-					scope.selectmodel = scope.modelmanager.controllist[i];
-					scope.status = '1';
-				}
-			}
-
-		}
-		if(scope.status == '1'){
-
-			//定义光线
-			let raycaster = new THREE.Raycaster();
-			//定义平面鼠标点击坐标
-			let mouse = new THREE.Vector2();
-			mouse.x = (event.touches[0].pageX / dom.offsetWidth) * 2 - 1;
-			mouse.y = -(event.touches[0].pageY / dom.offsetHeight) * 2 + 1;
-
-			raycaster.setFromCamera( mouse, camera );
-
-
-			let intersects = raycaster.intersectObjects( scope.modelmanager.controllist,true);
-			if(helpbox){
-				scene.remove( helpbox );
-				helpbox = null;
-			}
-			if(textplane){
-				scene.remove(textplane);
-				textplane.geometry.dispose();
-				textplane.material.dispose();
-			}
-			if(intersects[0]){
-
-				if(intersects[0].object.raycastoff){
-					helpbox = new THREE.BoxHelper( intersects[0].object.parent, 0xff0000 );
-					settext(intersects[0].object.parent,intersects[0].point);
-					getdevicemsg(intersects[0].object.parent.name);
-				}else{
-					helpbox = new THREE.BoxHelper( intersects[0].object, 0xff0000 );
-					settext(intersects[0].object,intersects[0].point);
-					getdevicemsg(intersects[0].object.name);
-				}
-				scene.add( helpbox );
-			}
-		}
-	}
-	function onselect(event){
-		if(event.button == '0'){
-			if(scope.status == '0'){
-				let raycaster = new THREE.Raycaster();
-				//定义平面鼠标点击坐标
-				let mouse = new THREE.Vector2();
-				mouse.x = (event.clientX / dom.offsetWidth) * 2 - 1;
-				mouse.y = -(event.clientY / dom.offsetHeight) * 2 + 1;
-
-				raycaster.setFromCamera( mouse, camera );
-				for(let i=0,leni=scope.modelmanager.controllist.length;i<leni;i++){
-
-					let intersects = raycaster.intersectObjects( scope.modelmanager.controllist[i].children,true);
-
-					if(intersects[0]){
-
-						scope.modelmanager.controllist[i].position.set(10000,0,0);
-						scope.modelmanager.controllist[i].rotation.y = 0;
-						scope.modelmanager.controllist[i].rotation.z = 0;
-						camera.position.set(10800, 500, 0);
-						scope.controls.target = new THREE.Vector3(10000,0,0);
-						scope.jdqcontrol.jdqdevicelist(scope.modelmanager.controllist[i]);
-						updatemenulist(scope.jdqcontrol.devicelist,scope.modelmanager.controllist[i].code);
-						scope.controls.update();
-
-						scope.selectmodel = scope.modelmanager.controllist[i];
-						scope.status = '1';
-						i = scope.modelmanager.controllist.length;
-					}
-				}
-
-			}
-			if(scope.status == '1'){
-
-				//定义光线
-				let raycaster = new THREE.Raycaster();
-				//定义平面鼠标点击坐标
-				let mouse = new THREE.Vector2();
-				mouse.x = (event.clientX / dom.offsetWidth) * 2 - 1;
-				mouse.y = -(event.clientY / dom.offsetHeight) * 2 + 1;
-
-				raycaster.setFromCamera( mouse, camera );
-
-
-				let intersects = raycaster.intersectObjects( scope.modelmanager.controllist,true);
-				if(helpbox){
-					scene.remove( helpbox );
-					helpbox = null;
-				}
-				if(textplane){
-					scene.remove(textplane);
-					textplane.geometry.dispose();
-					textplane.material.dispose();
-				}
-				if(intersects[0]){
-					dragcontrol.setObjects(intersects[0].object);
-
-
-					if(intersects[0].object.raycastoff){
-						helpbox = new THREE.BoxHelper( intersects[0].object.parent, 0xff0000 );
-						settext(intersects[0].object.parent,intersects[0].point);
-						getdevicemsg(intersects[0].object.parent.name);
-
-					}else{
-						helpbox = new THREE.BoxHelper( intersects[0].object, 0xff0000 );
-						settext(intersects[0].object,intersects[0].point);
-						getdevicemsg(intersects[0].object.name);
-
-					}
-
-					scope.controls.enabled = false;
-					dragcontrol.enabled = true;
-					scene.add( helpbox );
-				}
-			}
-
-		}
-
-	}
-	function onmouseup(event){
-		// event.preventDefault();
-		scope.controls.enabled = true;
-		dragcontrol.enabled = false;
-		//
-		// dragcontrol.setObjects(null);
-		// document.removeEventListener("mouseup", onmouseup, false );
-	}
-
-
-	this.animationmsgshowon = function(nowobject){
-		scope.animationmodel = nowobject;
-		if(helpbox){
-			scope.animationmodel.helpbox = null;
-			scene.remove( helpbox );
-			helpbox = undefined;
-		}
-
-		settext(scope.animationmodel,scope.animationmodel.position);
-		// console.log(scope.animationmodel);
-		helpbox = new THREE.BoxHelper( scope.animationmodel, 0xff0000 );
-		moveanima.updatehelpbox(helpbox,textplane);
-		// settext(intersects[0].object,intersects[0].point);
-		// getdevicemsg(intersects[0].object.name);
-		scene.add( helpbox );
-		getdevicemsg(nowobject.name);
-	}
-
-	this.animationmsgshowoff = function(nowobject){
-		if(helpbox){
-			scope.animationmodel.helpbox = null;
-			scene.remove( helpbox );
-			helpbox = undefined;
-		}
-		if(textplane){
-			scene.remove(textplane);
-			textplane.geometry.dispose();
-			textplane.material.dispose();
-		}
-		scope.animationmodel = null;
-	}
-
-	function getdevicemsg(selectname){
-		// console.log(selectname);
-		for(let i=0,leni=scope.jdqcontrol.devicelist.length;i<leni;i++){
-
-			if(selectname == scope.jdqcontrol.devicelist[i].name){
-				updatemsg(scope.jdqcontrol.devicelist[i].text,scope.jdqcontrol.devicelist[i].msg);
-				i=leni;
-			}
-		}
-	}
-	function settext(intersects,point){
-		if(scope.status == '1'){
-			if(intersects.text){
-				let textgeometry = new THREE.PlaneBufferGeometry( 300, 200, 1 );
-				let textt = new THREE.CanvasTexture(getTextCanvas(intersects.text));
-				let textmaterial = new THREE.MeshBasicMaterial( {
-					side: THREE.DoubleSide,
-					map:textt ,transparent: true,
-					alphaTest:0.1
-				} );
-				if(textplane){
-					scene.remove(textplane);
-					textplane.geometry.dispose();
-					textplane.material.dispose();
-				}
-				textplane= new THREE.Mesh( textgeometry, textmaterial );
-				// textplane.name = data[i].code;
-				textplane.position.x = point.x;
-				textplane.position.y = point.y+100;
-				textplane.position.z = point.z;
-				// console.log(textplane.position);
-				// textplane.tcode = data[i].code;
-				textplane.rotation.y = -Math.PI/2;
-				textplane.lookAt(camera.position);
-				// scope.textlist.push(textplane);
-				// newmesh.children[0].add(textplane);
-
-				scene.add(textplane);
-
-				textgeometry.dispose();
-				textmaterial.dispose();
-				textt.dispose();
-			}
-
-		}
-
-
-	}
-	var beauty = new Image();
-	beauty.src = JL3D_LOCAL_STATIC+"/texture/guide.png";
-	//canvas文字贴图方法
-	//PS:待提炼 增强功能
-	function getTextCanvas(text){
-		if(scope.status == '1'){
-			var canvas = document.getElementById('canvastexture');
-
-		  canvas.width = 256;
-		  canvas.height = 128;
-
-		  var ctx = canvas.getContext('2d');
-
-		  //var bg = canvas.createPattern(img, "no-repeat");
-		  //ctx.fillStyle = bg;
-		  ctx.fillRect(0, 0,256,128);
-		  ctx.font = "20px Verdana";
-		  ctx.fillStyle = '#FFFFFF';
-		  ctx.textAlign = 'center';
-		  ctx.textBaseline = 'middle';
-		  ctx.clearRect(0,0,256,128);
-		  //console.log(text.groupNumber);
-		  ctx.drawImage(beauty,0,0,256, 128);
-		  ctx.fillText("设备部件:"+text, 90,30);
-		  // ctx.fillText("车组人员:XXX", 40,20);
-		  // ctx.fillText("速度:XXX.XXX", 40,30);
-		  //ctx.fillText(text.trainModel.name, width/2,height*3/4);
-		  let data = ctx.getImageData(0, 0,256, 128);
-		  return data;
-		}
-
-	}
-
-}
diff --git a/src/jlmap3d/jl3ddevicetrain/jl3ddevicetrainold.js b/src/jlmap3d/jl3ddevicetrain/jl3ddevicetrainold.js
deleted file mode 100644
index 560f1b8f9..000000000
--- a/src/jlmap3d/jl3ddevicetrain/jl3ddevicetrainold.js
+++ /dev/null
@@ -1,571 +0,0 @@
-import { Staticmodel } from '@/jlmap3d/jl3ddevicetrain/config.js';
-import { JL3D_LOCAL_STATIC } from '@/api/jlmap3d/assets3d.js';
-//loader
-import { FBXLoader } from '@/jlmap3d/main/loaders/FBXLoader';
-import { OrbitControls } from '@/jlmap3d/main/control/OrbitControls';
-
-import { ModelManager } from '@/jlmap3d/jl3ddevicetrain/loader.js';
-import { Moveanimate } from '@/jlmap3d/jl3ddevicetrain/component/moveanimate.js';
-import { Jdqcontrol } from '@/jlmap3d/jl3ddevicetrain/component/jdqcontrol.js';
-
-import StompClient from '@/jlmap3d/jl3ddevicetrain/component/StompClient.js';
-// import { Signallightload } from '@/jlmap3d/jl3ddevice/component/signallight.js';
-
-// import StompClient from '@/utils/sock';
-import {Stats} from '@/jlmap3d/main/lib/stats.min.js';
-
-var clock = new THREE.Clock();
-export function Jl3ddevice(dom,serviceid) {
-	let scope = this;
-	//helpbox选中包围框
-	//textplane三维介绍标牌
-	let helpbox,textplane;
-	let connect = null;
-	this.dom = dom;
-	this.nowcode = null;
-	this.animateswitch = false;
-	this.mixers = [];
-	this.showmodel = null;
-	//场景状态
-	this.status = 0;
-	//动画状态
-	this.animastats = false;
-	//当前选中模型
-	this.selectmodel = null;
-
-	//初始化webgl渲染
-	let renderer = new THREE.WebGLRenderer({ antialias: true });
-	renderer.setPixelRatio( window.devicePixelRatio );
-	renderer.setSize(dom.offsetWidth, dom.offsetHeight);
-
-	// renderer.shadowMap.enabled = true;
-	// renderer.shadowMap.type = THREE.PCFSoftShadowMap;
-	renderer.setClearColor( 0x000000, 0 );
-	this.dom.appendChild(renderer.domElement);
-
-	//定义相机
-	let camera = new THREE.PerspectiveCamera(70, dom.offsetWidth / dom.offsetHeight, 0.01, 5000);
-	camera.position.set(-1000, 1500, 0);
-	camera.aspect = dom.offsetWidth / dom.offsetHeight;
-	camera.updateProjectionMatrix();
-
-	//视角轨迹控制器
-	this.controls = new THREE.OrbitControls(camera, dom);
-  this.controls.target = new THREE.Vector3(500,1000,0);
-	this.controls.screenSpacePanning = true;
-	this.controls.update();
-
-	//定义场景(渲染容器)
-	let scene = new THREE.Scene();
-	var bgTexture = new THREE.TextureLoader().load(JL3D_LOCAL_STATIC+"/background/other.jpg");
-  scene.background = bgTexture;
-
-	//定义全局光
-	let ambientLight = new THREE.AmbientLight(0xffffff, 1.3);
-	scene.add(ambientLight);
-
-	var light = new THREE.HemisphereLight( 0xffffff, 0x444444 );
-	light.position.set( 0, 200, 0 );
-	scene.add( light );
-
-	//网格地面
-	// var grid = new THREE.GridHelper( 1000, 20, 0x000000, 0x000000 );
-	// grid.material.opacity = 0.2;
-	// grid.material.transparent = true;
-	// grid.position.x = 10000;
-	// scene.add( grid );
-
-
-
-	//菜单选中设备更新设备较少
-	this.updateselect = function(updata){
-		// console.log(updata);
-		if(helpbox){
-			scene.remove( helpbox );
-			helpbox = null;
-		}
-		helpbox = new THREE.BoxHelper( updata.mesh, 0xff0000 );
-		// console.log(updata.mesh);
-		let point = {
-			x:updata.mesh.matrixWorld.elements[12],
-			y:updata.mesh.matrixWorld.elements[13],
-			z:updata.mesh.matrixWorld.elements[14]
-		};
-		settext(updata.mesh,point)
-		getdevicemsg(updata.mesh.name);
-		// moveanima.animatelist[scope.selectmodel.name+"select1"].enable = true;
-		// console.log(intersects[0].object);
-		scene.add( helpbox );
-	}
-
-	//返回设备选择
-	this.backselect = function(){
-		move2();
-		updatemenulist(scope.jdqcontrol.devicelist);
-
-		scope.modelmanager.controllist[0].position.set(19,1270,-275);
-		scope.modelmanager.controllist[0].rotation.y = -Math.PI/2;
-		scope.modelmanager.controllist[0].rotation.z = -Math.PI/2;
-
-		scope.modelmanager.controllist[1].position.set(19,1270,-165);
-		scope.modelmanager.controllist[1].rotation.y = -Math.PI/2;
-		scope.modelmanager.controllist[1].rotation.z = -Math.PI/2;
-
-		scope.modelmanager.controllist[2].position.set(19,1270,-55);
-		scope.modelmanager.controllist[2].rotation.y = -Math.PI/2;
-		scope.modelmanager.controllist[2].rotation.z = -Math.PI/2;
-
-		scope.modelmanager.controllist[3].position.set(19,1270,65);
-		scope.modelmanager.controllist[3].rotation.y = -Math.PI/2;
-		scope.modelmanager.controllist[3].rotation.z = -Math.PI/2;
-
-		scope.modelmanager.controllist[4].position.set(19,1270,170);
-		scope.modelmanager.controllist[4].rotation.y = -Math.PI/2;
-		scope.modelmanager.controllist[4].rotation.z = -Math.PI/2;
-
-		scope.modelmanager.controllist[5].position.set(19,1270,280);
-		scope.modelmanager.controllist[5].rotation.y = -Math.PI/2;
-		scope.modelmanager.controllist[5].rotation.z = -Math.PI/2;
-
-		camera.position.set(-1000, 1500, 0);
-		scope.controls.target = new THREE.Vector3(500,1000,0);
-		scope.controls.update();
-		scope.status = '0';
-		if(textplane){
-			scene.remove(textplane);
-			textplane.geometry.dispose();
-			textplane.material.dispose();
-		}
-		scope.selectmodel = null;
-		scope.jdqcontrol.devicelist = [];
-		scope.animastats = false;
-		updatemsg();
-	};
-
-	//设备分解、归位动画按钮
-	this.disperdevice = function(){
-
-		if(scope.status == '1'){
-			if(moveanima.status == true){
-				if(scope.animastats == false){
-					scope.animastats = true;
-					move1();
-				}	else if(scope.animastats == true){
-					scope.animastats = false;
-					move2();
-				}
-			}
-
-
-		}
-	};
-
-	// let stats = new Stats();
-	// dom.appendChild( stats.dom );
-
-	document.addEventListener( "mousedown", onselect, false );
-	document.addEventListener( "touchstart", ontouch, false );
-	window.onresize = function () {
-		camera.aspect = scope.dom.offsetWidth / scope.dom.offsetHeight;
-		camera.updateProjectionMatrix();
-		renderer.setSize(scope.dom.offsetWidth, scope.dom.offsetHeight);
-	}
-
-	this.jdqcontrol = new Jdqcontrol();
-
-	let moveanima = new Moveanimate(scope);
-
-	this.anime = null;
-	this.modelmanager = new ModelManager();
-	this.modelmanager.loadpromise(Staticmodel, scope.mixers,scene).then(function (data) {
-		moveanima.initlistnew(	scope.modelmanager.controllist);
-		connect = new StompClient();
-		// debugger
-		connect.subscribe("/queue/simulation/"+serviceid,callback);
-		animate();
-	});
-	this.sendmsg = function (type,index){
-		// console.log(index);
-		let msg = {
-			// deskId:serviceid,
-			id:index+1,
-			on:null
-		};
-		if(type == "0"){
-			msg.on = true;
-		}
-		if(type == "1"){
-			msg.on = false;
-		}
-		//"/app/topic/relay/"+msg.id+"/control/"+msg.on
-
-		connect.send("/app/topic/simulation/"+serviceid+"/relay/"+msg.id+"/control/"+msg.on,{});
-	}
-	this.upmodelaction = function(type,index){
-
-		if(type == "0"){
-			scope.modelmanager.actionlist[index].reset();
-			scope.modelmanager.actionlist[index].time = 0;
-			scope.modelmanager.actionlist[index].timeScale = 1;
-			scope.modelmanager.actionlist[index].play();
-		}
-		if(type == "1"){
-			scope.modelmanager.actionlist[index].reset();
-			scope.modelmanager.actionlist[index].time = scope.modelmanager.actionlist[index]._clip.duration;
-			scope.modelmanager.actionlist[index].timeScale = -1;
-			scope.modelmanager.actionlist[index].play();
-		}
-	};
-	//循环渲染函数
-	let delta;
-	let data;
-	function callback(Response){
-		// console.log(Response);
-		data = JSON.parse(Response.body);
-		// console.log(data);
-		upjdqstats(data);
-	}
-	function animate() {
-
-		scope.anime = requestAnimationFrame(animate);
-		renderer.render(scene, camera);
-		moveanima.animateupdate();
-		// scope.controls.update();
-	  // stats.update();
-		delta = clock.getDelta();
-		if (scope.mixers) {
-			for (let i = 0; i < scope.mixers.length; i++) {
-				if (scope.mixers[i]._actions[0].isRunning()) {
-					scope.mixers[i].update(delta);
-				}
-			}
-		}
-
-	}
-
-
-	function move1(){
-		console.log(scope.selectmodel);
-		moveanima.animatelist[scope.selectmodel.code+"fanghuozhao"+"on"].enable = true;
-		// for(let i=0,leni=scope.selectmodel.children.length;i<leni;i++){
-		//
-		// 	if(scope.selectmodel.children[i].name == "dizuo"){
-		// 		moveanima.animatelist[scope.selectmodel.name+"dizuoon"].enable = true;
-		// 	}
-		// 	if(scope.selectmodel.children[i].name == "Lxing"){
-		// 		moveanima.animatelist[scope.selectmodel.name+"Lxingon"].enable = true;
-		// 	}
-		// 	if(scope.selectmodel.children[i].name == "jiaoxingxiantie"){
-		// 		moveanima.animatelist[scope.selectmodel.name+"jiaoxingxiantieon"].enable = true;
-		// 	}
-		// 	if(scope.selectmodel.children[i].name == "xianquan"){
-		// 		moveanima.animatelist[scope.selectmodel.name+"xianquanon"].enable = true;
-		// 	}
-		// 	if(scope.selectmodel.children[i].name == "zhongchuipian"){
-		// 		moveanima.animatelist[scope.selectmodel.name+"zhongchuipianon"].enable = true;
-		// 	}
-		// 	if(scope.selectmodel.children[i].name == "lagan"){
-		// 		moveanima.animatelist[scope.selectmodel.name+"laganon"].enable = true;
-		// 	}
-		// 	if(scope.selectmodel.children[i].name == "dongjiedianzhou"){
-		// 		moveanima.animatelist[scope.selectmodel.name+"dongjiedianzhouon"].enable = true;
-		// 	}
-		// 	if(scope.selectmodel.children[i].name == "neibu"){
-		// 		moveanima.animatelist[scope.selectmodel.name+"neibuon"].enable = true;
-		// 	}
-		// 	if(scope.selectmodel.children[i].name == "jiedian"){
-		// 		moveanima.animatelist[scope.selectmodel.name+"jiedianon"].enable = true;
-		// 	}
-		// 	if(scope.selectmodel.children[i].name == "yapian"){
-		// 		moveanima.animatelist[scope.selectmodel.name+"yapianon"].enable = true;
-		// 	}
-		// 	if(scope.selectmodel.children[i].name == "fanghuozhao"){
-		// 		moveanima.animatelist[scope.selectmodel.name+"fanghuozhaoon"].enable = true;
-		// 	}
-		// 	if(scope.selectmodel.children[i].name == "dianyuanpian"){
-		// 		moveanima.animatelist[scope.selectmodel.name+"dianyuanpianon"].enable = true;
-		// 	}
-		// 	if(scope.selectmodel.children[i].name == "xinpian"){
-		// 		moveanima.animatelist[scope.selectmodel.name+"xinpianon"].enable = true;
-		// 	}
-		// 	if(scope.selectmodel.children[i].name =="jueyuanzhou"){
-		// 		moveanima.animatelist[scope.selectmodel.name+"jueyuanzhouon"].enable = true;
-		// 	}
-		// 	if(scope.selectmodel.children[i].name =="cigang"){
-		// 		moveanima.animatelist[scope.selectmodel.name+"cigangon"].enable = true;
-		// 	}
-		// }
-	}
-
-	function move2(){
-		if(scope.selectmodel){
-			moveanima.animatelist[scope.selectmodel.code+"yapian"+"off"].enable = true;
-			// for(let i=0,leni=scope.selectmodel.children.length;i<leni;i++){
-			//
-			// 	if(scope.selectmodel.children[i].name == "dizuo"){
-			// 		moveanima.animatelist[scope.selectmodel.name+"dizuooff"].enable = true;
-			// 	}
-			// 	if(scope.selectmodel.children[i].name == "Lxing"){
-			// 		moveanima.animatelist[scope.selectmodel.name+"Lxingoff"].enable = true;
-			// 	}
-			// 	if(scope.selectmodel.children[i].name == "jiaoxingxiantie"){
-			// 		moveanima.animatelist[scope.selectmodel.name+"jiaoxingxiantieoff"].enable = true;
-			// 	}
-			// 	if(scope.selectmodel.children[i].name == "xianquan"){
-			// 		moveanima.animatelist[scope.selectmodel.name+"xianquanoff"].enable = true;
-			// 	}
-			// 	if(scope.selectmodel.children[i].name == "zhongchuipian"){
-			// 		moveanima.animatelist[scope.selectmodel.name+"zhongchuipianoff"].enable = true;
-			// 	}
-			// 	if(scope.selectmodel.children[i].name == "lagan"){
-			// 		moveanima.animatelist[scope.selectmodel.name+"laganoff"].enable = true;
-			// 	}
-			// 	if(scope.selectmodel.children[i].name == "dongjiedianzhou"){
-			// 		moveanima.animatelist[scope.selectmodel.name+"dongjiedianzhouoff"].enable = true;
-			// 	}
-			// 	if(scope.selectmodel.children[i].name == "neibu"){
-			// 		moveanima.animatelist[scope.selectmodel.name+"neibuoff"].enable = true;
-			// 	}
-			// 	if(scope.selectmodel.children[i].name == "jiedian"){
-			// 		moveanima.animatelist[scope.selectmodel.name+"jiedianoff"].enable = true;
-			// 	}
-			// 	if(scope.selectmodel.children[i].name == "yapian"){
-			// 		moveanima.animatelist[scope.selectmodel.name+"yapianoff"].enable = true;
-			// 	}
-			// 	if(scope.selectmodel.children[i].name == "fanghuozhao"){
-			// 		moveanima.animatelist[scope.selectmodel.name+"fanghuozhaooff"].enable = true;
-			// 	}
-			// 	if(scope.selectmodel.children[i].name == "dianyuanpian"){
-			// 		moveanima.animatelist[scope.selectmodel.name+"dianyuanpianoff"].enable = true;
-			// 	}
-			// 	if(scope.selectmodel.children[i].name == "xinpian"){
-			// 		moveanima.animatelist[scope.selectmodel.name+"xinpianoff"].enable = true;
-			// 	}
-			// 	if(scope.selectmodel.children[i].name =="jueyuanzhou"){
-			// 		moveanima.animatelist[scope.selectmodel.name+"jueyuanzhouoff"].enable = true;
-			// 	}
-			// 	if(scope.selectmodel.children[i].name =="cigang"){
-			// 		moveanima.animatelist[scope.selectmodel.name+"cigangoff"].enable = true;
-			// 	}
-			// }
-		}
-
-	}
-	function ontouch(event){
-		if(scope.status == '0'){
-			let raycaster = new THREE.Raycaster();
-			//定义平面鼠标点击坐标
-
-			let mouse = new THREE.Vector2();
-			mouse.x = (event.touches[0].pageX / dom.offsetWidth) * 2 - 1;
-			mouse.y = -(event.touches[0].pageY / dom.offsetHeight) * 2 + 1;
-
-			raycaster.setFromCamera( mouse, camera );
-			for(let i=0,leni=scope.modelmanager.controllist.length;i<leni;i++){
-				let intersects = raycaster.intersectObjects( scope.modelmanager.controllist[i].children,true);
-
-				if(intersects[0]){
-					scope.modelmanager.controllist[i].position.set(10000,0,0);
-					scope.modelmanager.controllist[i].rotation.y = 0;
-					scope.modelmanager.controllist[i].rotation.z = 0;
-					camera.position.set(10800, 500, 0);
-					scope.controls.target = new THREE.Vector3(10000,0,0);
-					scope.jdqcontrol.jdqdevicelist(scope.modelmanager.controllist[i]);
-					updatemenulist(scope.jdqcontrol.devicelist);
-					scope.controls.update();
-
-					scope.selectmodel = scope.modelmanager.controllist[i];
-					scope.status = '1';
-				}
-			}
-
-		}
-		if(scope.status == '1'){
-
-			//定义光线
-			let raycaster = new THREE.Raycaster();
-			//定义平面鼠标点击坐标
-			let mouse = new THREE.Vector2();
-			mouse.x = (event.touches[0].pageX / dom.offsetWidth) * 2 - 1;
-			mouse.y = -(event.touches[0].pageY / dom.offsetHeight) * 2 + 1;
-
-			raycaster.setFromCamera( mouse, camera );
-
-
-			let intersects = raycaster.intersectObjects( scope.modelmanager.controllist,true);
-			if(helpbox){
-				scene.remove( helpbox );
-				helpbox = null;
-			}
-			if(textplane){
-				scene.remove(textplane);
-				textplane.geometry.dispose();
-				textplane.material.dispose();
-			}
-			if(intersects[0]){
-
-				if(intersects[0].object.raycastoff){
-					helpbox = new THREE.BoxHelper( intersects[0].object.parent, 0xff0000 );
-					settext(intersects[0].object.parent,intersects[0].point);
-					getdevicemsg(intersects[0].object.parent.name);
-				}else{
-					helpbox = new THREE.BoxHelper( intersects[0].object, 0xff0000 );
-					settext(intersects[0].object,intersects[0].point);
-					getdevicemsg(intersects[0].object.name);
-				}
-				scene.add( helpbox );
-			}
-		}
-	}
-	function onselect(event){
-		if(event.button == '0'){
-			if(scope.status == '0'){
-				let raycaster = new THREE.Raycaster();
-				//定义平面鼠标点击坐标
-				let mouse = new THREE.Vector2();
-				mouse.x = (event.clientX / dom.offsetWidth) * 2 - 1;
-				mouse.y = -(event.clientY / dom.offsetHeight) * 2 + 1;
-
-				raycaster.setFromCamera( mouse, camera );
-				for(let i=0,leni=scope.modelmanager.controllist.length;i<leni;i++){
-
-					let intersects = raycaster.intersectObjects( scope.modelmanager.controllist[i].children,true);
-
-					if(intersects[0]){
-
-						scope.modelmanager.controllist[i].position.set(10000,0,0);
-						scope.modelmanager.controllist[i].rotation.y = 0;
-						scope.modelmanager.controllist[i].rotation.z = 0;
-						camera.position.set(10800, 500, 0);
-						scope.controls.target = new THREE.Vector3(10000,0,0);
-						scope.jdqcontrol.jdqdevicelist(scope.modelmanager.controllist[i]);
-						updatemenulist(scope.jdqcontrol.devicelist);
-						scope.controls.update();
-
-						scope.selectmodel = scope.modelmanager.controllist[i];
-						scope.status = '1';
-						i = scope.modelmanager.controllist.length;
-					}
-				}
-
-			}
-			if(scope.status == '1'){
-
-				//定义光线
-				let raycaster = new THREE.Raycaster();
-				//定义平面鼠标点击坐标
-				let mouse = new THREE.Vector2();
-				mouse.x = (event.clientX / dom.offsetWidth) * 2 - 1;
-				mouse.y = -(event.clientY / dom.offsetHeight) * 2 + 1;
-
-				raycaster.setFromCamera( mouse, camera );
-
-
-				let intersects = raycaster.intersectObjects( scope.modelmanager.controllist,true);
-				if(helpbox){
-					scene.remove( helpbox );
-					helpbox = null;
-				}
-				if(textplane){
-					scene.remove(textplane);
-					textplane.geometry.dispose();
-					textplane.material.dispose();
-				}
-				if(intersects[0]){
-
-					if(intersects[0].object.raycastoff){
-						helpbox = new THREE.BoxHelper( intersects[0].object.parent, 0xff0000 );
-						settext(intersects[0].object.parent,intersects[0].point);
-						getdevicemsg(intersects[0].object.parent.name);
-					}else{
-						helpbox = new THREE.BoxHelper( intersects[0].object, 0xff0000 );
-						settext(intersects[0].object,intersects[0].point);
-						getdevicemsg(intersects[0].object.name);
-					}
-					scene.add( helpbox );
-				}
-			}
-
-		}
-
-	}
-
-	this.animationmsgshow = function(nowobject){
-		getdevicemsg(nowobject.name);
-	}
-
-	function getdevicemsg(selectname){
-		// console.log(selectname);
-		for(let i=0,leni=scope.jdqcontrol.devicelist.length;i<leni;i++){
-
-			if(selectname == scope.jdqcontrol.devicelist[i].name){
-				updatemsg(scope.jdqcontrol.devicelist[i].text,scope.jdqcontrol.devicelist[i].msg);
-				i=leni;
-			}
-		}
-	}
-	function settext(intersects,point){
-		if(intersects.text){
-			let textgeometry = new THREE.PlaneBufferGeometry( 300, 200, 1 );
-			let textt = new THREE.CanvasTexture(getTextCanvas(intersects.text));
-			let textmaterial = new THREE.MeshBasicMaterial( {
-				side: THREE.DoubleSide,
-				map:textt ,transparent: true,
-				alphaTest:0.1
-			} );
-			if(textplane){
-				scene.remove(textplane);
-				textplane.geometry.dispose();
-				textplane.material.dispose();
-			}
-			textplane= new THREE.Mesh( textgeometry, textmaterial );
-			// textplane.name = data[i].code;
-			textplane.position.x = point.x;
-			textplane.position.y = point.y+100;
-			textplane.position.z = point.z;
-			// console.log(textplane.position);
-			// textplane.tcode = data[i].code;
-			textplane.rotation.y = -Math.PI/2;
-			textplane.lookAt(camera.position);
-			// scope.textlist.push(textplane);
-			// newmesh.children[0].add(textplane);
-			scene.add(textplane);
-			textgeometry.dispose();
-			textmaterial.dispose();
-			textt.dispose();
-		}
-
-
-	}
-	var beauty = new Image();
-	beauty.src = JL3D_LOCAL_STATIC+"/texture/guide.png";
-	//canvas文字贴图方法
-	//PS:待提炼 增强功能
-	function getTextCanvas(text){
-	  var canvas = document.getElementById('canvastexture');
-
-	  canvas.width = 256;
-	  canvas.height = 128;
-
-	  var ctx = canvas.getContext('2d');
-
-	  //var bg = canvas.createPattern(img, "no-repeat");
-	  //ctx.fillStyle = bg;
-	  ctx.fillRect(0, 0,256,128);
-	  ctx.font = "20px Verdana";
-	  ctx.fillStyle = '#FFFFFF';
-	  ctx.textAlign = 'center';
-	  ctx.textBaseline = 'middle';
-	  ctx.clearRect(0,0,256,128);
-	  //console.log(text.groupNumber);
-	  ctx.drawImage(beauty,0,0,256, 128);
-	  ctx.fillText("设备部件:"+text, 90,30);
-	  // ctx.fillText("车组人员:XXX", 40,20);
-	  // ctx.fillText("速度:XXX.XXX", 40,30);
-	  //ctx.fillText(text.trainModel.name, width/2,height*3/4);
-	  let data = ctx.getImageData(0, 0,256, 128);
-	  return data;
-	}
-
-
-}
diff --git a/src/jlmap3d/jl3ddevicetrain/loader.js b/src/jlmap3d/jl3ddevicetrain/loader.js
deleted file mode 100644
index a2dce230b..000000000
--- a/src/jlmap3d/jl3ddevicetrain/loader.js
+++ /dev/null
@@ -1,184 +0,0 @@
-
-
-export function ModelManager(){
-  let scope = this;
-
-  this.controllist = [];
-  this.actionlist = [];
-  let jdq1 = {
-    code:"jdq1",
-    locateType:"01",
-    mesh:null,
-    action:null
-  };
-  let jdq2 = {
-    code:"jdq2",
-    locateType:"01",
-    mesh:null,
-    action:null
-  };
-  let jdq3 = {
-    code:"jdq3",
-    locateType:"01",
-    mesh:null,
-    action:null
-  };
-  let jdq4 = {
-    code:"jdq4",
-    locateType:"01",
-    mesh:null,
-    action:null
-  };
-  let jdq5 = {
-    code:"jdq5",
-    locateType:"01",
-    mesh:null,
-    action:null
-  };
-  let jdq6 = {
-    code:"jdq6",
-    locateType:"01",
-    mesh:null,
-    action:null
-  };
-
-    this.jdqg = {
-      code:null,
-      locateType:"00",
-      mesh:null,
-      action:null
-    };
-
-
-
-
-  this.loadpromise = function (data,mixers,scene){
-    let initlist = [];
-    initlist.push(fbxpromise(data.Jdq1,mixers,jdq1));
-    initlist.push(fbxpromise(data.Jdq2,mixers,jdq2));
-    initlist.push(fbxpromise(data.Jdq3,mixers,jdq3));
-    initlist.push(fbxpromise(data.Jdq4,mixers,jdq4));
-    initlist.push(fbxpromise(data.Jdq5,mixers,jdq5));
-    initlist.push(fbxpromise(data.Jdq6,mixers,jdq6));
-    initlist.push(fbxpromise(data.Jdqg,mixers,scope.jdqg));
-
-    return new Promise(function(resolve, reject){
-
-      Promise.all(initlist).then((result) => {
-        jdq1.mesh.stats = "0";
-        jdq1.mesh.position.x = 19;
-        jdq1.mesh.position.z = -275;
-        jdq1.mesh.position.y = 1270;
-        jdq1.mesh.rotation.y = -Math.PI/2;
-        jdq1.mesh.rotation.z = -Math.PI/2;
-
-        jdq2.mesh.stats = "0";
-        jdq2.mesh.position.x = 19;
-        jdq2.mesh.position.z = -165;
-        jdq2.mesh.position.y = 1270;
-        jdq2.mesh.rotation.y = -Math.PI/2;
-        jdq2.mesh.rotation.z = -Math.PI/2;
-
-        jdq3.mesh.stats = "0";
-        jdq3.mesh.position.x = 19;
-        jdq3.mesh.position.z = -55;
-        jdq3.mesh.position.y = 1270;
-        jdq3.mesh.rotation.y = -Math.PI/2;
-        jdq3.mesh.rotation.z = -Math.PI/2;
-
-        jdq4.mesh.stats = "0";
-        jdq4.mesh.position.x = 19;
-        jdq4.mesh.position.z = 65;
-        jdq4.mesh.position.y = 1270;
-        jdq4.mesh.rotation.y = -Math.PI/2;
-        jdq4.mesh.rotation.z = -Math.PI/2;
-
-        jdq5.mesh.stats = "0";
-        jdq5.mesh.position.x = 19;
-        jdq5.mesh.position.z = 170;
-        jdq5.mesh.position.y = 1270;
-        jdq5.mesh.rotation.y = -Math.PI/2;
-        jdq5.mesh.rotation.z = -Math.PI/2;
-
-        jdq6.mesh.stats = "0";
-        jdq6.mesh.position.x = 19;
-        jdq6.mesh.position.z = 280;
-        jdq6.mesh.position.y = 1270;
-        jdq6.mesh.rotation.y = -Math.PI/2;
-        jdq6.mesh.rotation.z = -Math.PI/2;
-
-        scope.controllist.push(jdq1.mesh);
-        scope.controllist.push(jdq2.mesh);
-        scope.controllist.push(jdq3.mesh);
-        scope.controllist.push(jdq4.mesh);
-        scope.controllist.push(jdq5.mesh);
-        scope.controllist.push(jdq6.mesh);
-        // console.log(jdq1);
-        scope.actionlist.push(jdq1.action);
-        scope.actionlist.push(jdq2.action);
-        scope.actionlist.push(jdq3.action);
-        scope.actionlist.push(jdq4.action);
-        scope.actionlist.push(jdq5.action);
-        scope.actionlist.push(jdq6.action);
-
-    		scene.add(jdq1.mesh);
-    		scene.add(jdq2.mesh);
-    		scene.add(jdq3.mesh);
-    		scene.add(jdq4.mesh);
-        scene.add(jdq5.mesh);
-        scene.add(jdq6.mesh);
-    		scene.add(scope.jdqg.mesh);
-        resolve("success");             //['成功了', 'success']
-      }).catch((error) => {
-        //console.log(error);
-      });
-
-    });
-  }
-
-}
-
-function fbxpromise(asset,mixers,model){
-  return new Promise(function(resolve, reject){
-    var loader = new THREE.FBXLoader();
-
-    loader.load( asset.assetUrl, function ( object ) {
-      let mixer = new THREE.AnimationMixer( object );
-      // object.traverse( function ( child ) {
-      // 	if ( child.isMesh ) {
-      // 		child.castShadow = true;
-      // 		child.receiveShadow = true;
-      // 	}
-      // } );
-
-      //设置透明贴图的材质属性
-      for(let i=0,leni=object.children.length;i<leni;i++){
-        if(object.children[i].name == "fanghuozhao"){
-          for(let j=0,lenj=object.children[i].children.length;j<lenj;j++){
-            object.children[i].children[j].raycastoff = true;
-            if(object.children[i].children[j].name == "waizhao"){
-              object.children[i].children[j].material.depthTest = false;
-            }
-          }
-
-        }
-      }
-
-      object.name = asset.name;
-      object.code = model.code;
-      model.mesh = object;
-
-      if(object.animations.length>0){
-
-        model.action = mixer.clipAction( object.animations[ 0 ] );
-        model.action.setLoop(THREE.LoopOnce);
-        model.action.clampWhenFinished = true;
-        // model.action.play();
-        // scope.actionlist.push("1");
-        mixers.push(mixer);
-      }
-      resolve(asset.deviceType);
-    } );
-
-  });
-}
diff --git a/src/jlmap3d/jl3ddrive/jl3ddrive.js b/src/jlmap3d/jl3ddrive/jl3ddrive.js
index 39f4274e1..50aa53bf9 100644
--- a/src/jlmap3d/jl3ddrive/jl3ddrive.js
+++ b/src/jlmap3d/jl3ddrive/jl3ddrive.js
@@ -8,7 +8,7 @@ import {MTLLoader} from '@/jlmap3d/main/loaders/MTLLoader.js';
 import { FBXLoader } from '@/jlmap3d/main/loaders/FBXLoader.js';
 
 // data
-import { Jl3ddata } from '@/jlmap3d/main/model/jl3ddata';
+import { Jl3ddata } from '@/jlmap3d/main/newmodel/jl3ddata';
 
 // setconfig
 import { SetCamera } from '@/jlmap3d/config/SetCamera';
@@ -21,10 +21,8 @@ import {OrbitControls} from '@/jlmap3d/main/control/OrbitControls.js';
 import { DragControls } from '@/jlmap3d/main/control/DragControls.js';
 
 // 加载器
-import { DriverLoad } from '@/jlmap3d/main/loaders/DriverLoad';
 import { DriverLoadNew } from '@/jlmap3d/main/loaders/DriverLoadNew';
 // connect
-import {Jl3dDriving} from '@/jlmap3d/jl3ddrive/moveupdate/DrivingConnect';
 import {Jl3dDrivingNew} from '@/jlmap3d/jl3ddrive/moveupdate/DrivingConnectNew';
 
 import { getPublishMapVersion, getPublishMapDetail, getPublish3dMapDetail} from '@/api/jlmap3d/load3ddata';
@@ -158,57 +156,7 @@ export function JLmapDriving(dom,data,mapId,storemod,translation,routegroup,proj
     getPublish3dMapDetail(mapId).then(netdata => {
 			// console.log(netdata);
       let assetsdata = JSON.parse(netdata.data.sections);
-      if(assetsdata.link){
-        scope.datatype = "old";
-				// datanew();
-        // scope.jsonwebwork = new Worker(JL3D_LOCAL_STATIC+"/workertest/jsonworker.js");
-        // scope.Subscribe = new Jlmap3dSubscribe(scope,routegroup,scope.jsonwebwork);
-        // scope.Subscribe.socketon(scope.Subscribe.topic);
 
-				scope.Subscribe = new Jl3dDriving(mixers,updatemmi,sound,translation,routegroup);
-
-				scope.Subscribe.socketon(scope.Subscribe.topic);
-				DriverLoad(data,scope,netdata.data,sectionlist,linklist,signallist,stationstandlist,trainlisttest,realsectionlist,rails, camera, controls3, scene,mixers,storemod);
-				var timer = setInterval(function() {
-					if(trainlisttest){
-						if(trainlisttest.group){
-							if(trainlisttest.group.children[0]){
-								// console.log(trainlisttest.group.children[0].name);
-								updatemmi.updatedrivingcode(trainlisttest.group.children[0].name);
-								scope.Subscribe.initdrivercode(trainlisttest.group.children[0].name);
-								for(let k in rails.switchrail){
-									const ddd = storemod.getters['map/getDeviceByCode'](k);
-									let switchdata = rails.switchrail[k];
-									rails.switchrail[k].locateType = ddd.locateType;
-
-									if(ddd.locateType == "01"){
-										//1--向左  2--向右
-										//__\__    __/__
-										if(rails.switchrail[k].directtype == "1"){
-											rails.linkrail[switchdata.alink].lconnect = switchdata.blink;
-											rails.linkrail[switchdata.blink].rconnect = switchdata.alink;
-										}else if(rails.switchrail[k].directtype == "2"){
-											rails.linkrail[switchdata.alink].rconnect = switchdata.blink;
-											rails.linkrail[switchdata.blink].lconnect = switchdata.alink;
-										}
-
-									}else if(ddd.locateType == "02"){
-										if(rails.switchrail[k].directtype == "1"){
-											rails.linkrail[switchdata.alink].lconnect = switchdata.clink;
-											rails.linkrail[switchdata.clink].rconnect = switchdata.alink;
-										}else if(rails.switchrail[k].directtype == "2"){
-											rails.linkrail[switchdata.alink].rconnect = switchdata.clink;
-											rails.linkrail[switchdata.clink].lconnect = switchdata.alink;
-										}
-									}
-								}
-								clearInterval(timer);
-							}
-						}
-					}
-
-				}, 2000);
-      }else{
         scope.datatype = "new";
 				driverWebWorker = new Worker(JL3D_LOCAL_STATIC+"/workertest/driverWebWorker.js");
 				scope.Subscribe = new Jl3dDrivingNew(mixers,updatemmi,sound,translation,routegroup,driverWebWorker,stats);
@@ -230,7 +178,7 @@ export function JLmapDriving(dom,data,mapId,storemod,translation,routegroup,proj
 
 				}, 2000);
 
-      }
+
 
     });
   });
diff --git a/src/jlmap3d/jl3ddrive/moveupdate/DrivingConnect.js b/src/jlmap3d/jl3ddrive/moveupdate/DrivingConnect.js
deleted file mode 100644
index 5324265a7..000000000
--- a/src/jlmap3d/jl3ddrive/moveupdate/DrivingConnect.js
+++ /dev/null
@@ -1,886 +0,0 @@
-import StompClient from '@/utils/sock';
-
-import { getTrainingCbtcDemon, runDiagramStart, runDiagramOver, setTrainingCbtcInitTime } from '@/api/simulation';
-
-import { creatSubscribe, clearSubscribe, displayTopic, screenTopic } from '@/utils/stomp';
-import { getToken } from '@/utils/auth';
-import router from '@/router/index_APP_TARGET';
-
-// 定于仿真socket接口
-export function Jl3dDriving(mixers, updatemmi, sound, translation, routegroup) {
-
-    const scope = this;
-    this.map = null;
-    const toppic = '/app/topic/simulation/client/' + routegroup + '/drive';
-    var trainlisttest = null;
-    var sectionlist = null;
-    var signallist = null;
-    var stationstandlist = null;
-    var sectionlist = null;
-    var materials = null;
-    var actions = null;
-    var rails = null;
-    var links = null;
-
-    var scenes = null;
-
-    var code = null;
-
-    var drivingcode = null;
-    var drivingspeed = null;
-    var drivingaptspeed = null;
-
-    let driverswitch = false;
-
-    const stoptimer = null;
-    const num = 30;
-    const pointstand = null;
-    // run as plane = 01;
-    // reset = 02;
-    var datatype = '00';
-    this.teststomp = new StompClient();
-    this.topic = '/user/queue/simulation/jl3d/' + routegroup;
-    const header = {'X-Token': getToken() };
-
-    this.updatamap = function(newsectionlist, newlinklist, newsignallist, newstationstandlist, newtrainlisttest, newrealsectionlist, newrails, materiallist, nowaction, scene) {
-        // console.log(mapdata);
-        // console.log(newtrainlisttest);
-        trainlisttest = newtrainlisttest;
-        sectionlist = newsectionlist;
-        signallist = newsignallist;
-        stationstandlist = newstationstandlist;
-        materials = materiallist;
-        scenes = scene;
-        actions = nowaction;
-        links = newlinklist;
-        rails = newrails;
-    };
-
-    this.initdrivercode = function(code) {
-        drivingcode = code;
-    };
-
-    this.socketon = function(topic) {
-        try {
-            // console.log("teststomp");
-            scope.teststomp.subscribe(topic, callback, header);
-        } catch (error) {
-            console.error('websocket订阅失败');
-        }
-
-    };
-
-    this.socketoff = function(topic) {
-        scope.teststomp.unsubscribe(topic);
-        for (let i = 0; i < trainlisttest.group.children.length; i++) {
-            if (trainlisttest.group.children[i].dispose == false) {
-                code = trainlisttest.group.children[i].name;
-                trainlisttest.list[code].rotation.y = 0;
-                trainlisttest.list[code].doorStatus = '01';
-                trainlisttest.list[code].speed = 0;
-                trainlisttest.group.children[i].dispose = true;
-                trainlisttest.group.children[i].position.x = -50000;
-                trainlisttest.group.children[i].position.y = -50000;
-                trainlisttest.group.remove(trainlisttest.group.children[i]);
-                i--;
-            }
-        }
-    };
-
-    // 仿真socket接口回调函数
-    function callback(Response) {
-        // console.log(Response);
-        // 对象化数据
-        const data = JSON.parse(Response.body);
-        // 遍历后台数据
-
-        // 判断消息类型
-        // if(data.type == "Simulation_TrainPosition"){
-        //
-        //
-        // }
-        // console.log(data);
-        // console.log(data);
-        switch (data.type) {
-        case 'Simulation_Driver_Change':
-
-            trainlisttest.group.remove(trainlisttest.list[drivingcode]);
-            trainlisttest.list[data.body.code].dispose = true;
-            trainlisttest.list[drivingcode].dispose = true;
-            drivingcode = data.body.code;
-            trainlisttest.group.add(trainlisttest.list[drivingcode]);
-
-            // sound.volswitch = true;
-            updatemmi.updatedrivingcode( data.body.code);
-            break;
-        case 'Simulation_TrainSpeed':
-
-            trainspeed(data);
-            break;
-        case 'SJL3D_TrainStatus':
-            trainstatus(data);
-            break;
-        case 'Simulation_DeviceStatus':
-            devicestatus(data);
-            break;
-        case 'Simulation_Drive_Data_Routing':
-            updatemmi.updatedrivedata(data.body);
-            break;
-        case 'Simulation_Reset':
-            simulationreset(data);
-        default :
-          // TODO
-        }
-
-        // if(data.type == 'Simulation_Drive_Data_Routing'){
-        // 	updatemmi.updatedrivedata(data.body);
-        // }
-        //
-        // if (data.type == 'Simulation_Driver_Change') {
-        // 	drivingcode = data.body.code;
-        // 	updatemmi.updatedrivingcode( data.body.code);
-        // }
-        //
-        // if (data.type == 'Simulation_TrainSpeed') {
-        // 	trainspeed(data);
-        // }
-        //
-        // if (data.type == 'SJL3D_TrainStatus') {
-        // 	trainstatus(data);
-        // }
-        //
-        // if (data.type == 'Simulation_DeviceStatus') {
-        // 	devicestatus(data);
-        // }
-
-    }
-
-    function trainspeed(data) {
-        // console.log(data);
-        if (trainlisttest) {
-            for (let tl = 0; tl < data.body.length; tl++) {
-                code = data.body[tl].id;
-                if (trainlisttest.list[code].speed != data.body[tl].v) {
-                    trainlisttest.list[code].speed = data.body[tl].v;
-
-                    if (trainlisttest.list[code].runMode == '02') {
-
-                        if (trainlisttest.list[code].isStandTrack == true) {
-                            trainlisttest.list[code].speeds = parseFloat(data.body[tl].v * 10 / 36 / 25 / trainlisttest.list[code].len);
-                        } else {
-                            trainlisttest.list[code].speeds = parseFloat(data.body[tl].v * 10 / 36 / 25 / trainlisttest.list[code].len);
-                        }
-                    } else {
-
-                        trainlisttest.list[code].speeds = parseFloat(data.body[tl].v * 10 / 36 / 25 / trainlisttest.list[code].len);
-                    }
-
-                    if (code == drivingcode) {
-                        // if (data.body[tl].v >0) {
-                        // 	updatemmi.updatenowspeed(data.body[tl].v);
-                        // } else {
-
-                        updatemmi.updatenowspeed(Math.abs(data.body[tl].v));
-                        // console.log(data.body[i]);
-
-                        // }
-                    }
-                }
-
-                if (code == drivingcode) {
-                    // if(sound.volswitch == true){
-                    // 	sound.setVolume( data.body[tl].v/100 );
-                    // }
-                    if (data.body[tl].atpv) {
-                        updatemmi.updateatpspeed(data.body[tl].atpv);
-                    } else {
-                        updatemmi.updateatpspeed(-1);
-                    }
-                    if (data.body[tl].atov) {
-                        updatemmi.updateatospeed(data.body[tl].atov);
-                    } else {
-                        updatemmi.updateatospeed(-1);
-                    }
-                    if (trainlisttest.list[code].progress < 1) {
-                        const syncdata = {
-                            type: 'Train',
-                            code: code,
-                            linkCode: trainlisttest.list[code].nowcode,
-                            percent: 0
-                        };
-                        if (trainlisttest.list[code].status == '02') {
-                            if (trainlisttest.list[code].targetLink == trainlisttest.list[code].nowcode) {
-                                if ((trainlisttest.list[code].linkOffsetPercent / trainlisttest.list[code].pc) >= trainlisttest.list[code].targetpercent) {
-                                    syncdata.percent = trainlisttest.list[code].progress;
-                                } else {
-                                    syncdata.percent = trainlisttest.list[code].progress * trainlisttest.list[code].pc;
-                                }
-                            } else {
-                                syncdata.percent = trainlisttest.list[code].progress;
-                            }
-
-                        } else {
-                            if (trainlisttest.list[code].targetLink == trainlisttest.list[code].nowcode) {
-                                if ((trainlisttest.list[code].linkOffsetPercent / trainlisttest.list[code].pc) <= trainlisttest.list[code].targetpercent) {
-                                    syncdata.percent = (1 - trainlisttest.list[code].progress);
-                                } else {
-                                    syncdata.percent = (1 - trainlisttest.list[code].progress) * trainlisttest.list[code].pc;
-                                }
-                            } else {
-                                syncdata.percent = (1 - trainlisttest.list[code].progress);
-                            }
-                        }
-                        // console.log("send");
-                        // console.log(trainlisttest.list[code]);
-                        //
-                        // console.log(syncdata);
-                        // console.log("=============");
-                        scope.teststomp.send(toppic, syncdata);
-                    }
-
-                }
-            }
-        }
-    }
-
-    function trainstatus(data) {
-        // console.log(data.body);
-        for (let i = data.body.length - 1; i >= 0; i--) {
-            // 遍历列车对象组
-            // console.log(trainlisttest);
-            if (trainlisttest) {
-
-                code = data.body[i].code;
-                // 剔除不显示的车
-                // 找到对应列车
-
-                if (code == drivingcode) {
-
-                    driverswitch = data.body[i].runMode;
-                    // 更新车组号
-                    updatemmi.updatetrainnum(data.body[i].groupNumber);
-                    // 更新列车
-                    if (data.body[i].parkRemainTime > 0) {
-                        updatemmi.updatestoptime(translation.stopTime + parseInt(data.body[i].parkRemainTime));
-                    } else {
-                        if (data.body[i].runMode == '02') {
-                            updatemmi.updatestoptime(translation.trainAtoOn);
-                        } else {
-                            if (trainlisttest.list[code].isStandTrack == true && trainlisttest.list[code].progress > 0.95 && trainlisttest.list[code].speed <= 0) {
-                                // if(stoptimer){
-                                //
-                                // }else{
-                                //   stoptimer = setInterval(function(){
-                                //     if(num >=0){
-                                //       updatemmi.updatestoptime("停站时间:"+num);
-                                //       num --;
-                                //     }
-                                //   },1000);
-                                // }
-
-                            } else {
-                                updatemmi.updatestoptime(translation.trainAtoOff);
-                            }
-                        }
-                    }
-                }
-                trainlisttest.list[code].runMode = data.body[i].runMode;
-
-                // 车门开关验证
-                if (trainlisttest.list[code].doorStatus != data.body[i].doorStatus && data.body[i].doorStatus == '01') {
-                    // console.log("close");
-                    trainlisttest.list[code].doorStatus = '01';
-                    for (let an = actions[code].top.length - 1; an >= 0; an--) {
-                        actions[code].top[an].reset();
-                        actions[code].top[an].time = actions[code].top[an]._clip.duration;
-                        actions[code].top[an].timeScale = -1;
-                        actions[code].top[an].play();
-                    }
-                } else if (trainlisttest.list[code].doorStatus != data.body[i].doorStatus && data.body[i].doorStatus == '02') {
-                    // console.log("open");
-                    trainlisttest.list[code].doorStatus = '02';
-                    for (let an = actions[code].top.length - 1; an >= 0; an--) {
-                        actions[code].top[an].reset();
-                        actions[code].top[an].time = 0;
-                        actions[code].top[an].timeScale = 1;
-                        actions[code].top[an].play();
-                    }
-                }
-                // if (data.body[i].directionType == '02') {
-                //
-                // } else {
-                // 	if (trainlisttest.list[code].doorStatus != data.body[i].doorStatus && data.body[i].doorStatus == '01') {
-                // 		// console.log("close");
-                // 		trainlisttest.list[code].doorStatus = '01';
-                // 		for (let an=actions[code].down.length-1; an>=0; an--) {
-                // 			actions[code].down[an].reset();
-                // 			actions[code].down[an].time = actions[code].top[an]._clip.duration;
-                // 			actions[code].down[an].timeScale = -1;
-                // 			actions[code].down[an].play();
-                // 		}
-                // 	} else if (trainlisttest.list[code].doorStatus != data.body[i].doorStatus && data.body[i].doorStatus == '02') {
-                // 		// console.log("open");
-                // 		trainlisttest.list[code].doorStatus = '02';
-                // 		for (let an=actions[code].down.length-1; an>=0; an--) {
-                // 			actions[code].down[an].reset();
-                // 			actions[code].down[an].time = 0;
-                // 			actions[code].down[an].timeScale = 1;
-                // 			actions[code].down[an].play();
-                // 		}
-                // 	}
-                // }
-                // 遍历获取所在轨道
-
-                if (trainlisttest.list[code].dispose != data.body[i].dispose && data.body[i].dispose == false) {
-
-                    if (rails.linkrail[data.body[i].linkCode]) {
-                        // console.log(trainlisttest.group);
-                        if (trainlisttest.group.children.length < 1) {
-                            trainlisttest.group.add(trainlisttest.list[code]);
-                            drivingcode = code;
-                            updatemmi.updatedrivingcode(drivingcode);
-                        }
-                        if (trainlisttest.list[code].mixerpush == false) {
-                            for (let mi = 0, lenmi = trainlisttest.list[code].mixer.length; mi < lenmi; mi++) {
-                                mixers.push(trainlisttest.list[code].mixer[mi]);
-                            }
-                            trainlisttest.list[code].mixerpush = true;
-                        }
-                        // trainlisttest.group.add(trainlisttest.list[code]);
-                        trainlisttest.list[code].position.y = 0;
-                        trainlisttest.list[code].progress = 0;
-                        // trainlisttest.list[code].oldoffset = data.body[i].sectionOffsetPercent;
-                        trainlisttest.list[code].dispose = false;
-                        trainlisttest.list[code].nowcode = data.body[i].linkCode;
-
-                        trainlisttest.list[code].pc = 1;
-                        // console.log(data.body[i]);
-                        if (data.body[i].directionType == '02') { // 向右
-
-                            if (data.body[i].targetStation) {
-
-                                trainlisttest.list[code].stopstation = data.body[i].targetStation;
-                                // console.log(rails.stops[data.body[i].targetStation].direct2.percent);
-                                trainlisttest.list[code].pc = data.body[i].targetLinkPercent / rails.stops[data.body[i].targetStation].direct2.percent;
-                                trainlisttest.list[code].targetpercent = rails.stops[data.body[i].targetStation].direct2.percent;
-                                trainlisttest.list[code].progress = data.body[i].linkOffsetPercent / trainlisttest.list[code].pc;
-                                trainlisttest.list[code].linkOffsetPercent = data.body[i].linkOffsetPercent;
-                                trainlisttest.list[code].targetLink = data.body[i].targetLink;
-                            } else {
-                                trainlisttest.list[code].progress = data.body[i].linkOffsetPercent;
-                                trainlisttest.list[code].linkOffsetPercent = data.body[i].linkOffsetPercent;
-                            }
-
-                            trainlisttest.list[code].status = '02';
-
-                            trainlisttest.list[code].curve = rails.linkrail[data.body[i].linkCode].lineleft;
-                            const point = rails.linkrail[data.body[i].linkCode].lineleft.getPointAt(trainlisttest.list[code].progress);
-                            trainlisttest.list[code].rotation.y = 0;
-                            trainlisttest.list[code].position.x = point.x;
-                            trainlisttest.list[code].position.y = 0;
-                            for (let tl = 0; tl < 6; tl++) {
-                                trainlisttest.list[code].children[tl].position.z = point.z;
-                            }
-                        } else if (data.body[i].directionType == '03') { // 向左
-
-                            // if(trainlisttest.list[code].rname == "006"){
-                            // 	console.log("0000000000000000");
-                            // 	console.log(data.body[i].linkOffsetPercent);
-                            // }
-                            if (data.body[i].targetStation) {
-
-                                trainlisttest.list[code].stopstation = data.body[i].targetStation;
-                                trainlisttest.list[code].pc = data.body[i].targetLinkPercent / rails.stops[data.body[i].targetStation].direct1.percent;
-                                // console.log(data.body[i].targetLinkPercent);
-                                // console.log(rails.stops[data.body[i].targetStation].direct1.percent);
-                                // 	console.log(trainlisttest.list[code].pc);
-                                trainlisttest.list[code].targetpercent = rails.stops[data.body[i].targetStation].direct1.percent;
-                                trainlisttest.list[code].progress = 1 - data.body[i].linkOffsetPercent / trainlisttest.list[code].pc;
-                                trainlisttest.list[code].linkOffsetPercent = data.body[i].linkOffsetPercent;
-                                trainlisttest.list[code].targetLink = data.body[i].targetLink;
-                            } else {
-                                trainlisttest.list[code].progress = 1 - data.body[i].linkOffsetPercent;
-                                trainlisttest.list[code].linkOffsetPercent = data.body[i].linkOffsetPercent;
-                            }
-                            // console.log("progress:"+trainlisttest.list[code].progress);
-                            // console.log("linkOffsetPercent:"+trainlisttest.list[code].linkOffsetPercent);
-                            // console.log("datatarget:"+ data.body[i].targetLinkPercent);
-                            // console.log("directpercent:"+trainlisttest.list[code].targetpercent);
-                            // console.log("====================");
-                            trainlisttest.list[code].status = '03';
-
-                            trainlisttest.list[code].curve = rails.linkrail[data.body[i].linkCode].lineright;
-                            const point = rails.linkrail[data.body[i].linkCode].lineright.getPointAt(trainlisttest.list[code].progress);
-                            trainlisttest.list[code].rotation.y = Math.PI;
-                            trainlisttest.list[code].position.x = point.x;
-                            trainlisttest.list[code].position.y = 0;
-                            for (let tl = 0; tl < 6; tl++) {
-                                trainlisttest.list[code].children[tl].position.z = -point.z;
-                            }
-                        }
-                        trainlisttest.list[code].len = rails.linkrail[data.body[i].linkCode].lengthfact;
-                        // trainlisttest.list[code].isStandTrack = sectionlist.sections.datalist[data.body[i].sectionCode].isStandTrack;
-
-                        // trainlisttest.list[code].len = sectionlist.sections.datalist[data.body[i].sectionCode].distance;
-
-                        if (data.body[i].speed == 0) {
-                            trainlisttest.list[code].speeds = data.body[i].speed;
-                            trainlisttest.list[code].speeds = 0;
-                            // trainlisttest.list[code].startmark = 1;
-                        } else {
-                            trainlisttest.list[code].speeds = data.body[i].speed;
-                            trainlisttest.list[code].speeds = parseFloat(data.body[i].speed * 10 / 36 / 25 / trainlisttest.list[code].len);
-                        }
-
-                    }
-
-                } else if (trainlisttest.list[code].dispose != data.body[i].dispose && data.body[i].dispose == true) {
-                    trainlisttest.group.remove(trainlisttest.list[code]);
-                    trainlisttest.list[code].progress = null;
-                    trainlisttest.list[code].dispose = true;
-                    code = trainlisttest.group.children[i].name;
-                    trainlisttest.list[code].rotation.y = 0;
-                    trainlisttest.list[code].doorStatus = '01';
-                    trainlisttest.list[code].speed = 0;
-                    trainlisttest.list[code].position.x = -50000;
-                    trainlisttest.list[code].position.y = -50000;
-                    trainlisttest.list[code].pc = 1;
-                } else if (trainlisttest.list[code].dispose == data.body[i].dispose && data.body[i].dispose == false) {
-
-                    if (rails.linkrail[data.body[i].linkCode]) {
-                        if (driverswitch == '02' && code == drivingcode) {
-                            updatemmi.updatenowspeed(data.body[i].speed);
-                            if (data.body[i].atpSpeed) {
-                                updatemmi.updateatpspeed(data.body[i].atpSpeed);
-                            } else {
-                                updatemmi.updateatpspeed(-1);
-                            }
-                            if (data.body[i].targetSpeed) {
-                                updatemmi.updateatospeed(data.body[i].targetSpeed);
-                            } else {
-                                updatemmi.updateatospeed(-1);
-                            }
-                            if (data.body[i].maLen) {
-                                updatemmi.updatenowlen(data.body[i].maLen);
-                            } else {
-                                updatemmi.updatenowlen(0);
-                            }
-                            // if(trainlisttest.list[code].isStandTrack == true){
-                            //   pointstand = null;
-                            //   if(data.body[i].directionType == "02"){
-                            //     pointstand = trainlisttest.list[code].curve.getPointAt(data.body[i].sectionOffsetPercent);
-                            //   }else{
-                            //     pointstand = trainlisttest.list[code].curve.getPointAt(1-data.body[i].sectionOffsetPercent);
-                            //   }
-                            //   console.log(data.body[i].sectionOffsetPercent)
-                            //   console.log(pointstand.x);
-                            //
-                            //   trainlisttest.list[code].position.x = pointstand.x;
-                            // }
-                        }
-                        if (driverswitch == '05' && code == drivingcode) {
-                            if (data.body[i].maLen) {
-                                updatemmi.updatenowlen(data.body[i].maLen);
-                            } else {
-                                updatemmi.updatenowlen(0);
-                            }
-                        }
-                        if (trainlisttest.list[code].status != data.body[i].directionType) {
-                            if (data.body[i].directionType == '02') { // 向右
-
-                                trainlisttest.list[code].progress = 0;
-                                const rotaposx = trainlisttest.list[code].children[5].matrixWorld.elements[12];
-                                const rotaposz = trainlisttest.list[code].children[0].matrixWorld.elements[14];
-                                trainlisttest.list[code].rotation.y = 0;
-                                trainlisttest.list[code].position.x = rotaposx;
-                                for (let tl = 0; tl < 6; tl++) {
-                                    trainlisttest.list[code].children[tl].position.z = rotaposz;
-                                }
-
-                                trainlisttest.list[code].progress = (rotaposx - rails.linkrail[data.body[i].linkCode].lp.x) / rails.linkrail[data.body[i].linkCode].lengthfact;
-                                trainlisttest.list[code].status = '02';
-                                trainlisttest.list[code].curve = rails.linkrail[data.body[i].linkCode].lineleft;
-                                trainlisttest.list[code].nextcurve = null;
-
-                                trainlisttest.list[code].len = rails.linkrail[data.body[i].linkCode].lengthfact;
-
-                            } else if (data.body[i].directionType == '03') { // 向左
-                                trainlisttest.list[code].progress = 0;
-                                const rotaposx = trainlisttest.list[code].children[5].matrixWorld.elements[12];
-                                const rotaposz = Math.abs(trainlisttest.list[code].children[0].matrixWorld.elements[14]);
-                                trainlisttest.list[code].rotation.y = Math.PI;
-                                trainlisttest.list[code].position.x = rotaposx;
-                                for (let tl = 0; tl < 6; tl++) {
-                                    trainlisttest.list[code].children[tl].position.z = -rotaposz;
-                                }
-                                trainlisttest.list[code].progress = 1 - (rotaposx - rails.linkrail[data.body[i].linkCode].lp.x) / rails.linkrail[data.body[i].linkCode].lengthfact;
-                                trainlisttest.list[code].status = '03';
-                                trainlisttest.list[code].curve = rails.linkrail[data.body[i].linkCode].lineright;
-                                trainlisttest.list[code].nextcurve = null;
-
-                                trainlisttest.list[code].len = rails.linkrail[data.body[i].linkCode].lengthfact;
-
-                            }
-                        }
-                        let nextcode;
-
-                        if (code == drivingcode) {
-                            // console.log(data.body[i].targetStation);
-                            // console.log("netpercent");
-                            // console.log(data.body[i].targetLinkPercent);
-                            // console.log(data.body[i].linkOffsetPercent);
-                            // console.log("3dpercent");
-                            // if(rails.stops[data.body[i].targetStation]){
-                            // 		console.log(rails.stops[data.body[i].targetStation].direct2.percent);
-                            // }
-                            //
-                            // console.log(trainlisttest.list[code].progress);
-                            // console.log(trainlisttest.list[code].pc);
-                            // console.log("===============");
-                            // console.log(data.body[i]);
-                            if (data.body[i].directionType == '02') {
-                                if (trainlisttest.list[code].stopstation != data.body[i].targetStation) {
-                                    trainlisttest.list[code].stopstation = data.body[i].targetStation;
-                                    if (data.body[i].targetStation) {
-                                        trainlisttest.list[code].pc = data.body[i].targetLinkPercent / rails.stops[data.body[i].targetStation].direct2.percent;
-                                        trainlisttest.list[code].targetpercent = rails.stops[data.body[i].targetStation].direct2.percent;
-                                        trainlisttest.list[code].linkOffsetPercent = data.body[i].linkOffsetPercent;
-                                        trainlisttest.list[code].targetLink = data.body[i].targetLink;
-
-                                        // trainlisttest.list[code].progress = trainlisttest.list[code].linkOffsetPercent*trainlisttest.list[code].pc;
-                                    }
-                                }
-
-                                trainlisttest.list[code].status = '02';
-                                nextcode = rails.linkrail[data.body[i].linkCode].rconnect;
-                                if (nextcode) {
-                                    // console.log(rails.linkrail[nextcode].lineleft.points);
-                                    trainlisttest.list[code].nextcurve = rails.linkrail[nextcode].lineleft;
-                                    trainlisttest.list[code].nextlen = rails.linkrail[nextcode].lengthfact;
-                                } else {
-
-                                    trainlisttest.list[code].nextlen = 0;
-                                }
-                            } else if (data.body[i].directionType == '03') {
-                                if (trainlisttest.list[code].stopstation != data.body[i].targetStation) {
-                                    trainlisttest.list[code].stopstation = data.body[i].targetStation;
-                                    if (data.body[i].targetStation) {
-                                        trainlisttest.list[code].pc = data.body[i].targetLinkPercent / rails.stops[data.body[i].targetStation].direct1.percent;
-                                        trainlisttest.list[code].targetpercent = rails.stops[data.body[i].targetStation].direct1.percent;
-                                        trainlisttest.list[code].linkOffsetPercent = data.body[i].linkOffsetPercent;
-                                        trainlisttest.list[code].targetLink = data.body[i].targetLink;
-                                        // trainlisttest.list[code].progress = (1-trainlisttest.list[code].linkOffsetPercent)*trainlisttest.list[code].pc;
-                                    }
-                                }
-                                trainlisttest.list[code].status = '03';
-                                nextcode = rails.linkrail[data.body[i].linkCode].lconnect;
-                                if (nextcode) {
-                                    trainlisttest.list[code].nextcurve = rails.linkrail[nextcode].lineright;
-                                    trainlisttest.list[code].nextlen = rails.linkrail[nextcode].lengthfact;
-                                } else {
-
-                                    trainlisttest.list[code].nextlen = 0;
-                                }
-                            }
-                            trainlisttest.list[code].nextcode = nextcode;
-
-                            // console.log(trainlisttest.list[code].nowcode);
-                            // console.log(trainlisttest.list[code].nextcode);
-                            // console.log(trainlisttest.list[code].curve.points);
-                            // console.log(trainlisttest.list[code].nextcurve.points);
-                            // console.log("=========================");
-
-                        } else {
-
-                            // trainlisttest.list[code].stopstation = data.body[i].targetStation;
-                            // // console.log(rails.stops[data.body[i].targetStation].direct2.percent);
-                            // trainlisttest.list[code].pc = data.body[i].targetLinkPercent/rails.stops[data.body[i].targetStation].direct2.percent;
-                            // trainlisttest.list[code].targetpercent = rails.stops[data.body[i].targetStation].direct2.percent;
-                            // trainlisttest.list[code].progress = data.body[i].linkOffsetPercent*trainlisttest.list[code].pc;
-                            // trainlisttest.list[code].linkOffsetPercent = data.body[i].linkOffsetPercent;
-                            // trainlisttest.list[code].targetLink = data.body[i].targetLink;
-
-                            let nextcode;
-                            if (data.body[i].directionType == '02') {
-                                if (rails.linkrail[data.body[i].linkCode].lineleft) {
-                                    nextcode = rails.linkrail[data.body[i].linkCode].rconnect;
-                                    trainlisttest.list[code].status = '02';
-                                    if (nextcode) {
-                                        trainlisttest.list[code].nextcurve = rails.linkrail[nextcode].lineleft;
-                                        trainlisttest.list[code].nextlen = rails.linkrail[nextcode].lengthfact;
-                                    }
-                                    trainlisttest.list[code].nowcode = data.body[i].linkCode;
-                                    trainlisttest.list[code].curve = rails.linkrail[data.body[i].linkCode].lineleft;
-                                    trainlisttest.list[code].len = rails.linkrail[data.body[i].linkCode].lengthfact;
-                                    trainlisttest.list[code].progress = data.body[i].linkOffsetPercent;
-                                    trainlisttest.list[code].linkOffsetPercent = data.body[i].linkOffsetPercent;
-                                    if (data.body[i].targetStation) {
-                                        trainlisttest.list[code].pc = data.body[i].targetLinkPercent / rails.stops[data.body[i].targetStation].direct2.percent;
-                                        trainlisttest.list[code].targetpercent = rails.stops[data.body[i].targetStation].direct2.percent;
-                                        trainlisttest.list[code].targetLink = data.body[i].targetLink;
-                                        trainlisttest.list[code].progress = data.body[i].linkOffsetPercent / trainlisttest.list[code].pc;
-                                    }
-                                    trainlisttest.list[code].speeds = parseFloat(trainlisttest.list[code].speed * 10 / 36 / 25 / trainlisttest.list[code].len);
-                                }
-                            } else if (data.body[i].directionType == '03') {
-                                if (rails.linkrail[data.body[i].linkCode].lineright) {
-                                    nextcode = rails.linkrail[data.body[i].linkCode].lconnect;
-                                    trainlisttest.list[code].status = '03';
-
-                                    if (nextcode) {
-                                        trainlisttest.list[code].nextcurve = rails.linkrail[nextcode].lineright;
-                                        trainlisttest.list[code].nextlen = rails.linkrail[nextcode].lengthfact;
-                                    }
-                                    trainlisttest.list[code].nowcode = data.body[i].linkCode;
-                                    trainlisttest.list[code].curve = rails.linkrail[data.body[i].linkCode].lineright;
-                                    trainlisttest.list[code].len = rails.linkrail[data.body[i].linkCode].lengthfact;
-                                    trainlisttest.list[code].progress = 1 - data.body[i].linkOffsetPercent;
-                                    trainlisttest.list[code].linkOffsetPercent = data.body[i].linkOffsetPercent;
-                                    if (data.body[i].targetStation) {
-                                        trainlisttest.list[code].pc = data.body[i].targetLinkPercent / rails.stops[data.body[i].targetStation].direct1.percent;
-                                        trainlisttest.list[code].targetpercent = rails.stops[data.body[i].targetStation].direct1.percent;
-                                        trainlisttest.list[code].targetLink = data.body[i].targetLink;
-                                        trainlisttest.list[code].progress = (1 - data.body[i].linkOffsetPercent) / trainlisttest.list[code].pc;
-                                    }
-                                    trainlisttest.list[code].speeds = parseFloat(trainlisttest.list[code].speed * 10 / 36 / 25 / trainlisttest.list[code].len);
-                                }
-                            }
-                            trainlisttest.list[code].nextcode = nextcode;
-                        }
-
-                        // console.log(data.body[i].linkOffsetPercent);
-                        // console.log(trainlisttest.list[code].progress);
-                        // console.log(trainlisttest.list[code].curve.points);
-                        // console.log(trainlisttest.list[code].nextcurve.points);
-                        // console.log(trainlisttest.list[code].len);
-                        // console.log(trainlisttest.list[code].nextlen);
-                        // console.log("==========================================");
-                    }
-                }
-
-            }
-        }
-    }
-
-    function simulationreset(data) {
-        // console.log(data);
-        for (const k in trainlisttest.list) {
-            trainlisttest.list[k].dispose = true;
-            trainlisttest.group.remove(trainlisttest.list[k]);
-            trainlisttest.list[k].stopstation = null;
-            trainlisttest.list[k].pc = null;
-            trainlisttest.list[k].targetpercent = null;
-            trainlisttest.list[k].progress = null;
-            trainlisttest.list[k].linkOffsetPercent = null;
-            trainlisttest.list[k].targetLink = null;
-            drivingcode = null;
-        }
-    }
-
-    function devicestatus(data) {
-        for (let i = data.body.length - 1; i >= 0; i--) {
-            // 0xFFFFFF
-            // 0xCD0000  红
-            // 0xEEEE00  黄
-            // 0x32CD32  绿
-            if (data.body[i]._type == 'Signal') {
-                if (signallist) {
-                    signalupdate(data.body[i]);
-                }
-            }
-
-            if (data.body[i]._type == 'StationStand' ) {
-                if (actions) {
-                    standupdate(data.body[i]);
-                }
-            }
-
-            if (data.body[i]._type == 'Switch') {
-                if (sectionlist) {
-                    switchupdate(data.body[i]);
-                }
-            }
-
-        }
-    }
-
-    function standupdate(data) {
-        code = data.code;
-        if ( actions[code]) {
-            if (data.screenDoorOpenStatus == '02' && actions[code].status == '01') {
-                actions[code].status = '00';
-            }
-            if (data.screenDoorOpenStatus == '02' && actions[code].status == '00') {
-                actions[code].status = '02';
-                actions[code].action.reset();
-                actions[code].action.time = 0;
-                actions[code].action.timeScale = 1;
-                actions[code].action.play();
-            }
-
-            if (data.screenDoorOpenStatus == '01' && actions[code].status == '02') {
-                actions[code].status = '00';
-            }
-            if (data.screenDoorOpenStatus == '01' && actions[code].status == '00') {
-                actions[code].status = '01';
-                actions[code].action.reset();
-                actions[code].action.time = actions[code].action._clip.duration;
-                actions[code].action.timeScale = -1;
-                actions[code].action.play();
-            }
-        }
-
-    }
-
-    function signalupdate(data) {
-        code = data.code;
-        if (data.lightType == '01') {
-            if (signallist.list[code].mesh.code) {
-                signallist.list[code].mesh.status = data.status;
-
-                // 55
-                // 33
-                // 77
-                // 关闭
-                if (data.status == '01') {
-                    signallist.list[code].mesh.getObjectByName('red').material.map = materials[0];
-                    signallist.list[code].mesh.getObjectByName('red').material.map.needsUpdate = true;
-                    signallist.list[code].mesh.getObjectByName('yellow').material.map = materials[3];
-                    signallist.list[code].mesh.getObjectByName('yellow').material.map.needsUpdate = true;
-                    signallist.list[code].mesh.getObjectByName('green').material.map = materials[3];
-                    signallist.list[code].mesh.getObjectByName('green').material.map.needsUpdate = true;
-
-                }
-                // 开放
-                if (data.status == '02') {
-                    signallist.list[code].mesh.getObjectByName('red').material.map = materials[3];
-                    signallist.list[code].mesh.getObjectByName('red').material.map.needsUpdate = true;
-                    signallist.list[code].mesh.getObjectByName('yellow').material.map = materials[3];
-                    signallist.list[code].mesh.getObjectByName('yellow').material.map.needsUpdate = true;
-                    signallist.list[code].mesh.getObjectByName('green').material.map = materials[2];
-                    signallist.list[code].mesh.getObjectByName('green').material.map.needsUpdate = true;
-                }
-                if (data.status == '03') {
-                    signallist.list[code].mesh.getObjectByName('red').material.map = materials[3];
-                    signallist.list[code].mesh.getObjectByName('red').material.map.needsUpdate = true;
-                    signallist.list[code].mesh.getObjectByName('yellow').material.map = materials[1];
-                    signallist.list[code].mesh.getObjectByName('yellow').material.map.needsUpdate = true;
-                    signallist.list[code].mesh.getObjectByName('green').material.map = materials[3];
-                    signallist.list[code].mesh.getObjectByName('green').material.map.needsUpdate = true;
-
-                }
-                // 引导
-                if (data.status == '03') {
-                    signallist.list[code].mesh.getObjectByName('red').material.map = materials[0];
-                    signallist.list[code].mesh.getObjectByName('red').material.map.needsUpdate = true;
-                    signallist.list[code].mesh.getObjectByName('yellow').material.map = materials[1];
-                    signallist.list[code].mesh.getObjectByName('yellow').material.map.needsUpdate = true;
-                    signallist.list[code].mesh.getObjectByName('green').material.map = materials[3];
-                    signallist.list[code].mesh.getObjectByName('green').material.map.needsUpdate = true;
-
-                }
-                // 封锁
-                if (data.status == '04') {
-                    signallist.list[code].mesh.getObjectByName('red').material.map = materials[3];
-                    signallist.list[code].mesh.getObjectByName('red').material.map.needsUpdate = true;
-                    signallist.list[code].mesh.getObjectByName('yellow').material.map = materials[3];
-                    signallist.list[code].mesh.getObjectByName('yellow').material.map.needsUpdate = true;
-                    signallist.list[code].mesh.getObjectByName('green').material.map = materials[3];
-                    signallist.list[code].mesh.getObjectByName('green').material.map.needsUpdate = true;
-
-                }
-                // 故障
-                if (data.status == '05') {
-                    signallist.list[code].mesh.getObjectByName('red').material.map = materials[3];
-                    signallist.list[code].mesh.getObjectByName('red').material.map.needsUpdate = true;
-                    signallist.list[code].mesh.getObjectByName('yellow').material.map = materials[3];
-                    signallist.list[code].mesh.getObjectByName('yellow').material.map.needsUpdate = true;
-                    signallist.list[code].mesh.getObjectByName('green').material.map = materials[3];
-                    signallist.list[code].mesh.getObjectByName('green').material.map.needsUpdate = true;
-
-                }
-
-            }
-
-        } else if (data.lightType == '02') {
-            if (signallist.list[code].mesh.code) {
-                signallist.list[code].mesh.getObjectByName('red').material.map = materials[3];
-                signallist.list[code].mesh.getObjectByName('red').material.map.needsUpdate = true;
-                signallist.list[code].mesh.getObjectByName('yellow').material.map = materials[3];
-                signallist.list[code].mesh.getObjectByName('yellow').material.map.needsUpdate = true;
-                signallist.list[code].mesh.getObjectByName('green').material.map = materials[3];
-                signallist.list[code].mesh.getObjectByName('green').material.map.needsUpdate = true;
-
-            }
-
-        }
-
-    }
-
-    function switchupdate(data) {
-        code = data.code;
-        for (let j = sectionlist.switchs.modellist.length - 1; j >= 0; j--) {
-            if (rails.switchrail[code]) {
-                if (rails.switchrail[code].locateType != data.locateType) {
-                    // console.log("道岔变化:"+code);
-                    if (data.locateType == '02') {
-                        // console.log("02   反位");
-                        if (actions[sectionlist.switchs.modellist[j].code]) {
-                            sectionlist.switchs.modellist[j].locateType = data.locateType;
-                            actions[sectionlist.switchs.modellist[j].code].reset();
-                            actions[sectionlist.switchs.modellist[j].code].time = 0;
-                            actions[sectionlist.switchs.modellist[j].code].timeScale = 1;
-                            actions[sectionlist.switchs.modellist[j].code].play();
-                        }
-
-                        rails.switchrail[code].locateType = '02';
-
-                        const testswitch = rails.switchrail[code];
-                        if (rails.switchrail[code].directtype == '1') {
-                            // console.log("道岔朝向1向左");
-                            // console.log("aleft:"+testswitch.clink);
-                            // console.log("cright:"+testswitch.alink);
-                            rails.linkrail[testswitch.alink].lconnect = testswitch.clink;
-                            rails.linkrail[testswitch.clink].rconnect = testswitch.alink;
-                        } else if (rails.switchrail[code].directtype == '2') {
-                            // console.log("道岔朝向2向右");
-                            // console.log("aright:"+testswitch.clink);
-                            // console.log("cleft:"+testswitch.alink);
-                            rails.linkrail[testswitch.alink].rconnect = testswitch.clink;
-                            rails.linkrail[testswitch.clink].lconnect = testswitch.alink;
-                        }
-
-                    } else if (data.locateType == '01') {
-                        // console.log("01   定位");
-                        if (actions[sectionlist.switchs.modellist[j].code]) {
-                            sectionlist.switchs.modellist[j].locateType = data.locateType;
-                            actions[sectionlist.switchs.modellist[j].code].reset();
-                            actions[sectionlist.switchs.modellist[j].code].time = actions[sectionlist.switchs.modellist[j].code]._clip.duration;
-                            actions[sectionlist.switchs.modellist[j].code].timeScale = -1;
-                            actions[sectionlist.switchs.modellist[j].code].play();
-                        }
-
-                        rails.switchrail[code].locateType = '01';
-                        const testswitch = rails.switchrail[code];
-                        if (rails.switchrail[code].directtype == '1') {
-                            // console.log("道岔朝向1向左");
-                            // console.log("aleft"+testswitch.blink);
-                            // console.log("cright:"+testswitch.alink);
-                            rails.linkrail[testswitch.alink].lconnect = testswitch.blink;
-                            rails.linkrail[testswitch.blink].rconnect = testswitch.alink;
-                        } else if (rails.switchrail[code].directtype == '2') {
-                            // console.log("道岔朝向2向右");
-                            // console.log("aright:"+testswitch.blink);
-                            // console.log("cleft:"+testswitch.alink);
-                            rails.linkrail[testswitch.alink].rconnect = testswitch.blink;
-                            rails.linkrail[testswitch.blink].lconnect = testswitch.alink;
-                        }
-
-                    }
-                }
-                j = 0;
-            }
-        }
-    }
-
-}
diff --git a/src/jlmap3d/jl3dmaintainer/jlmap3dmaintainer.js b/src/jlmap3d/jl3dmaintainer/jlmap3dmaintainer.js
index b473a1acb..91c00ae88 100644
--- a/src/jlmap3d/jl3dmaintainer/jlmap3dmaintainer.js
+++ b/src/jlmap3d/jl3dmaintainer/jlmap3dmaintainer.js
@@ -7,7 +7,7 @@ import { FBXLoader } from '@/jlmap3d/main/loaders/FBXLoader';
 import { JL3D_LOCAL_STATIC } from '@/api/jlmap3d/assets3d.js';
 
 //data
-import { Jl3ddata } from '@/jlmap3d/main/model/jl3ddata';
+import { Jl3ddata } from '@/jlmap3d/main/newmodel/jl3ddata';
 
 //setconfig
 import { SetCamera } from '@/jlmap3d/config/SetCamera';
@@ -30,7 +30,6 @@ import { getPublishMapVersion, getPublishMapDetail,getPublish3dMapDetail} from '
 //utils
 // import { UpdateTrain } from '@/jlmap3d/main/utils/UpdateTrain';
 import { UpdateTrain } from '@/jlmap3d/jl3dsimulation/connect/UpdateTrainTest';
-import { UpdateTrainNew } from '@/jlmap3d/jl3dsimulation/connect/UpdateTrainNew';
 // import { ReStart } from '@/jlmap3d/main/utils/ReStart';
 
 import {Stats} from '@/jlmap3d/main/lib/stats.min.js';
@@ -198,12 +197,7 @@ export function JLmap3dMaintainer(dom, data,skinCode,storemod,routegroup,project
 
       scope.webwork.onmessage = function (event) {
         //更新列车位置
-        // if(scope.datatype == "new"){
-        //
-        //   UpdateTrainNew(camera,trainlisttest);
-        // }else{
-        //   UpdateTrain(camera,trainlisttest);
-        // }
+
 
         if(camerarail.moveswitch == true){
           // console.log(camerarail.progress);
diff --git a/src/jlmap3d/jl3dmaintainer/maintainerload.js b/src/jlmap3d/jl3dmaintainer/maintainerload.js
index ac67a1cd0..97d886f15 100644
--- a/src/jlmap3d/jl3dmaintainer/maintainerload.js
+++ b/src/jlmap3d/jl3dmaintainer/maintainerload.js
@@ -1,11 +1,4 @@
 //componnent
-import {SectionList} from '@/jlmap3d/main/model/SectionList.js';
-import {SignalList} from '@/jlmap3d/main/model/SignalList.js';
-import {StationStandList} from '@/jlmap3d/main/model/StationStandList.js';
-import {TrainList} from '@/jlmap3d/main/model/TrainList.js';
-import {RealSectionList} from '@/jlmap3d/main/model/RealSectionList.js';
-import {LinkList} from '@/jlmap3d/main/model/LinkList.js';
-import {RailList} from '@/jlmap3d/main/model/RailList.js';
 
 import {TrainListN} from '@/jlmap3d/main/newmodel/TrainListN.js';
 import {SectionListN} from '@/jlmap3d/main/newmodel/SectionListN';
@@ -52,8 +45,6 @@ export function MaintainerLoad(data,scope,netdata,mapdata,camera,controls,scene)
 
     let mapdata = data;
     //初始化轨道和道岔
-    // lengthfact(data);
-
     // linklist = new LinkList();
     sectionlist = new SectionListN();
     signallist = new SignalListN();
@@ -177,39 +168,3 @@ export function MaintainerLoad(data,scope,netdata,mapdata,camera,controls,scene)
 
 
 }
-
-function lengthfact(data){
-  let linklist = [];
-  //console.log(data);
-  for(let i=0;i<data.linkList.length;i++){
-
-    let dx = Math.abs(data.linkList[i].lp.x - data.linkList[i].rp.x);
-    let dy = Math.abs(data.linkList[i].lp.y - data.linkList[i].rp.y);
-    let distance = Math.sqrt(Math.pow(dx,2)+Math.pow(dy,2));
-
-    let link = {
-      code:data.linkList[i].code,
-      lengthfact:data.linkList[i].lengthFact,
-      distance:distance
-    };
-    linklist.push(link);
-  }
-
-  let sectionlist = [];
-  for(let i=0;i<data.sectionList.length;i++){
-    for(let j=0;j<linklist.length;j++){
-      if(linklist[j].code == data.sectionList[i].linkCode){
-        let sectionoffset = data.sectionList[i].offsetRight - data.sectionList[i].offsetLeft;
-        let sectionlengthfact = sectionoffset/linklist[j].distance*linklist[j].lengthfact
-        let section = {
-          code:data.sectionList[i].code,
-          lengthfact:sectionoffset
-        };
-        sectionlist.push(section);
-        j = linklist.length;
-      }
-    }
-  }
-
-    //console.log(sectionlist);
-}
diff --git a/src/jlmap3d/jl3dpassflow/connect/passflowconnect.js b/src/jlmap3d/jl3dpassflow/connect/passflowconnect.js
index 64c4342df..30684c42b 100644
--- a/src/jlmap3d/jl3dpassflow/connect/passflowconnect.js
+++ b/src/jlmap3d/jl3dpassflow/connect/passflowconnect.js
@@ -4,7 +4,7 @@ import { getToken } from '@/utils/auth';
 import store from '@/store/index_APP_TARGET';
 
 // 定于仿真socket接口
-export function PassflowConnect(jl3dpass,deviceaction,toptrain,downtrain,routegroup) {
+export function PassflowConnect(deviceaction,toptrain,downtrain,routegroup,passerStation,passerAi) {
 	const scope = this;
 	this.teststomp = new StompClient();
 
@@ -32,7 +32,7 @@ export function PassflowConnect(jl3dpass,deviceaction,toptrain,downtrain,routegr
 
 		if(data.type == "DeviceCtrl_3D"){
 			if(data.body.type == "PSD"){
-				if(data.body.code == jl3dpass.nowstation.toppsd){
+				if(data.body.code == passerStation.nowStation.toppsd){
 					if(data.body.open == 0){
 
 						deviceaction.top.action.reset();
@@ -40,21 +40,21 @@ export function PassflowConnect(jl3dpass,deviceaction,toptrain,downtrain,routegr
 						deviceaction.top.action.timeScale = -1;
 						deviceaction.top.action.play();
 					}else{
-						jl3dpass.passerout("top")
+						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 == jl3dpass.nowstation.downpsd){
+				if(data.body.code == passerStation.nowStation.downpsd){
 					if(data.body.open == 0){
 						deviceaction.down.action.reset();
 						deviceaction.down.action.time = deviceaction.down.action._clip.duration;
 						deviceaction.down.action.timeScale = -1;
 						deviceaction.down.action.play();
 					}else{
-						jl3dpass.passerout("down");
+						passerAi.passerout("down");
 						deviceaction.down.action.reset();
 						deviceaction.down.action.time = 0;
 						deviceaction.down.action.timeScale = 1;
@@ -92,7 +92,7 @@ export function PassflowConnect(jl3dpass,deviceaction,toptrain,downtrain,routegr
 		if(data.type == "TrainRun_3D"){
 
 			for(let i=0,leni = data.body.length;i<leni;i++){
-				if(data.body[i].section == jl3dpass.nowstation.topsection){
+				if(data.body[i].section == passerStation.nowStation.topsection){
 					if(toptrain.nowcode != data.body[i].code){
 						toptrain.nowcode = data.body[i].code;
 					}
@@ -104,7 +104,7 @@ export function PassflowConnect(jl3dpass,deviceaction,toptrain,downtrain,routegr
 					}
 				}
 
-				if(data.body[i].section == jl3dpass.nowstation.downsection){
+				if(data.body[i].section == passerStation.nowStation.downsection){
 					if(downtrain.nowcode != data.body[i].code){
 						downtrain.nowcode = data.body[i].code;
 					}
diff --git a/src/jlmap3d/jl3dpassflow/jl3dpassflow.js b/src/jlmap3d/jl3dpassflow/jl3dpassflow.js
deleted file mode 100644
index fdaee1232..000000000
--- a/src/jlmap3d/jl3dpassflow/jl3dpassflow.js
+++ /dev/null
@@ -1,854 +0,0 @@
-import { Staticmodel } from '@/jlmap3d/jl3dpassflow/config.js';
-//loader
-import { FBXLoader } from '@/jlmap3d/main/loaders/FBXLoader';
-import { OrbitControls } from '@/jlmap3d/main/control/OrbitControls';
-
-import { ModelManager } from '@/jlmap3d/jl3dpassflow/loader.js';
-import { SkeletonUtils } from '@/jlmap3d/main/utils/SkeletonUtils.js';
-import StompClient from '@/utils/sock';
-import { Loading } from 'element-ui';
-var clock = new THREE.Clock();
-let scene,camerass,renderer;
-let rendermode = 0;
-
-var mixers = [];
-var testmesh1,testmesh2;
-var humans = [];
-var checkdoor1 = [];
-var checkdoor2 = [];
-var station;
-var zhajiinmodel;
-var zhajioutmodel;
-var monitor;
-let ids = 0;
-var rungroup = new THREE.Group();
-let originhuman1 = null;
-let originhuman2 = null;
-let originanima1 = null;
-let originanima2 = null;
-let lefttrain = null;
-let righttrain = null;
-let moveanimatelist = [];
-
-let zhajiin = [];
-let zhajiout = [];
-
-let deviceaction = [];
-
-for(let i=0;i<5;i++){
-	checkdoor1[i]={
-		id:"c1"+i,
-		status:0,
-		pos:[],
-		max:10
-	};
-}
-
-for(let i=0;i<5;i++){
-	let zhaji = {
-		id:"in0"+(i+1),
-		status:0,
-		waiting:0
-	}
-	zhajiin.push(zhaji);
-}
-
-for(let i=0;i<5;i++){
-	let zhaji = {
-		id:"out0"+(i+1),
-		status:0,
-		waiting:0
-	}
-	zhajiout.push(zhaji);
-}
-
-let stationleft = [];
-let stationright = [];
-
-for(let i=0;i<22;i++){
-	let sl = {
-		id:"left"+i,
-		status:0,
-		waiting:0
-	}
-	stationleft.push(sl);
-}
-
-for(let i=0;i<22;i++){
-	let sr = {
-		id:"right"+i,
-		status:0,
-		waiting:0
-	}
-	stationright.push(sr);
-}
-
-var windowWidth = window.innerWidth ;
-var windowHeight = window.innerHeight;
-var views = [
-			{
-				left: 0,
-				bottom: 0,
-				width: 0.5,
-				height: 0.5,
-				background: new THREE.Color( 0.5, 0.5, 0.7 ),
-				eye: [ 3.7, 16, 26 ],
-				up: [3.7, 10 ,16 ],
-				fov: 30
-			},
-			{
-				left: 0,
-				bottom: 0.5,
-				width: 0.5,
-				height: 0.5,
-				background: new THREE.Color( 0.5, 0.5, 0.7 ),
-				eye: [ 3.7,17,-4 ],
-				up: [  3.7, 10 ,16],
-				fov: 30
-			},
-			{
-				left: 0.5,
-				bottom: 0,
-				width: 0.5,
-				height: 0.5,
-				background: new THREE.Color( 0.7, 0.5, 0.5 ),
-				eye: [ -60, 6,11],
-				up: [ -59, 5.9,11 ],
-				fov: 45
-			},
-			{
-				left: 0.5,
-				bottom: 0.5,
-				width: 0.5,
-				height: 0.5,
-				background: new THREE.Color( 0.5, 0.7, 0.7 ),
-				eye: [ -7,17,2],
-				up: [-7, 10, 8],
-				fov: 60
-			}
-		];
-
-export function Jl3dpassflow(dom) {
-	var scope = this;
-
-	this.dom = dom;
-	this.nowcode = null;
-	this.animateswitch = false;
-	this.signallights = [];
-	this.mixers = [];
-	this.showmodel = null;
-	//初始化webgl渲染
-	renderer = new THREE.WebGLRenderer({ antialias: true });
-
-	renderer.setClearColor(new THREE.Color(0x000000));
-	renderer.setSize(dom.offsetWidth, dom.offsetHeight);
-
-	this.dom.appendChild(renderer.domElement);
-
-	//定义相机
-
-	camerass = new THREE.PerspectiveCamera(70, dom.offsetWidth / dom.offsetHeight, 0.01, 1000);
-	camerass.position.set(0, 80, 40);
-	camerass.aspect = dom.offsetWidth / dom.offsetHeight;
-	camerass.updateProjectionMatrix();
-
-	for ( var ii = 0; ii < views.length; ++ ii ) {
-
-			var view = views[ ii ];
-			var camera = new THREE.PerspectiveCamera( view.fov, window.innerWidth / window.innerHeight, 1, 200 );
-			camera.position.fromArray( view.eye );
-			camera.lookAt( view.up[0],view.up[1],view.up[2] );
-			view.camera = camera;
-
-		}
-
-
-
-	//定义场景(渲染容器)
-	scene = new THREE.Scene();
-	scene.background = new THREE.Color(0xa0a0a0);
-
-	var mesh = new THREE.Mesh(new THREE.PlaneBufferGeometry(200, 200), new THREE.MeshPhongMaterial({ color: 0x999999, depthWrite: false }));
-	mesh.rotation.x = - Math.PI / 2;
-	mesh.receiveShadow = true;
-	scene.add(mesh);
-
-	var grid = new THREE.GridHelper(200, 20, 0x000000, 0x000000);
-	grid.material.opacity = 0.2;
-	grid.material.transparent = true;
-	scene.add(grid);
-
-
-	//定义全局光
-	let ambientLight = new THREE.AmbientLight(0xffffff, 1.3);
-	scene.add(ambientLight);
-
-	//
-	// var spotLight = new THREE.SpotLight(0xffffff);
-	// spotLight.position.set(-50, 60, 15);
-	// spotLight.castShadow = true;
-	// spotLight.shadow.mapSize.width = 1024;
-	// spotLight.shadow.mapSize.height = 1024;
-	// scene.add(spotLight);
-
-
-
-	this.controls = new THREE.OrbitControls(camerass, dom);
-	this.controls.maxPolarAngle = Math.PI / 2;
-	this.controls.minPolarangle = Math.PI / 5;
-	this.controls.maxDistance = 800;
-	this.controls.screenSpacePanning = true;
-	this.controls.update();
-	this.selectmodel = null;
-
-	window.onresize = function () {
-
-		renderer.setSize(scope.dom.offsetWidth, scope.dom.offsetHeight);
-		windowWidth = scope.dom.offsetWidth ;
-		windowHeight = scope.dom.offsetHeight;
-
-		camerass.aspect = scope.dom.offsetWidth / scope.dom.offsetHeight;
-		camerass.updateProjectionMatrix();
-	}
-
-	this.anime = null;
-
-	this.modelmanager = new ModelManager();
-  let loadingInstance = Loading.service({ fullscreen: true });
-	this.modelmanager.loadpromise(Staticmodel, scope.mixers).then(function (data) {
-		// console.log(scope.modelmanager);
-		initstationanimation(scope.modelmanager.station.mesh);
-		initzhajiinaimation(scope.modelmanager.zhajiin.mesh);
-		initzhajioutanimation(scope.modelmanager.zhajiout.mesh);
-		monitor = scope.modelmanager.monitor.mesh;
-		scene.add(monitor);
-		originhuman1 = scope.modelmanager.man1.mesh;
-		originhuman2 =  scope.modelmanager.man2.mesh;
-		let mixer1 = new THREE.AnimationMixer( originhuman1 );
-		let mixer2 = new THREE.AnimationMixer( originhuman2 );
-		originanima1 = originhuman1.animations[ 0 ];
-		originanima2 = originhuman2.animations[ 0 ];
-		originhuman1.remove(originhuman1.children[2]);
-		scene.add(rungroup);
-	  loadingInstance.close();
-
-		scope.switchrender(false);
-
-		animate();
-	})
-
-	let checkobject = setInterval(function(){
-		// console.log(originhuman1);
-		if(originhuman1){
-			console.log("start");
-			clearInterval(checkobject);
-			//进站控制
-			setInterval(function(){
-				// console.log("ww");
-				// console.log(humans.length);
-				if(humans){
-					// console.log(humans.length);
-					if(humans.length<500){
-						newhumancreate();
-					}
-					// console.log(humans.length);
-					for(let i=0;i<humans.length;i++){
-						// console.log(humans[i]);
-
-						if(humans[i].status == 0){
-
-							if(humans[i].stage == 1){
-										let points = [];
-										points.push(new THREE.Vector3(humans[i].mesh.position.x,humans[i].mesh.position.y,humans[i].mesh.position.z));
-										points.push(new THREE.Vector3(humans[i].mesh.position.x,humans[i].mesh.position.y,humans[i].mesh.position.z-5));
-										zhajicontrol("in",humans[i].doors);
-										moveanimateinit(humans[i],i,points,i,0.02);
-							}
-							if(humans[i].stage == 2){
-								let points = [];
-								points.push(new THREE.Vector3(humans[i].mesh.position.x,humans[i].mesh.position.y,humans[i].mesh.position.z));
-								points.push(new THREE.Vector3(12,10,12.9));
-								points.push(new THREE.Vector3(28,1.7,12.9));
-								points.push(new THREE.Vector3(34,1.7,12.9));
-
-								//1--left
-								//2-- right
-								if(humans[i].direct == 1){
-									points.push(new THREE.Vector3(34,1.7,16));
-									for(let j =0;j<22;j++){
-										if(stationleft[j].waiting == 0){
-
-											points.push(new THREE.Vector3(51-j*5,1.7,22));
-
-											points.push(new THREE.Vector3(51-j*5,1.7,23));
-
-											humans[i].doors = j;
-											stationright[j].waiting = 1;
-											moveanimateinit(humans[i],i,points,i,0.002);
-										 	j =22;
-										}
-									}
-								}else{
-									points.push(new THREE.Vector3(34,1.7,16));
-									points.push(new THREE.Vector3(14,1.7,17));
-									points.push(new THREE.Vector3(14,1.7,3));
-									for(let j =0;j<22;j++){
-										if(stationright[j].waiting == 0){
-
-											points.push(new THREE.Vector3(51-j*5,1.7,3));
-
-											points.push(new THREE.Vector3(51-j*5,1.7,2));
-											humans[i].doors = j;
-											stationright[j].waiting = 1;
-											moveanimateinit(humans[i],i,points,i,0.002);
-										 	j =22;
-										}
-									}
-								}
-								moveanimateinit(humans[i],i,points,i,0.002);
-							}
-							//出站
-							if(humans[i].stage == 3){
-								let points = [];
-								points.push(new THREE.Vector3(humans[i].mesh.position.x,humans[i].mesh.position.y,humans[i].mesh.position.z));
-								if(humans[i].doors<11){
-									if(humans[i].direct == 1){
-										points.push(new THREE.Vector3(10,1.7,17));
-									}else{
-										points.push(new THREE.Vector3(8,1.7,5));
-									}
-									points.push(new THREE.Vector3(8,1.7,13));
-									points.push(new THREE.Vector3(5,1.7,13));
-									points.push(new THREE.Vector3(-4,6,13));
-								}else{
-									if(humans[i].direct == 1){
-										points.push(new THREE.Vector3(-19,1.7,17));
-									}else{
-										points.push(new THREE.Vector3(-18,1.7,6.4));
-									}
-									points.push(new THREE.Vector3(-18,1.7,13));
-									points.push(new THREE.Vector3(-12,1.7,13));
-									points.push(new THREE.Vector3(-7,6.8,12));
-								}
-								points.push(new THREE.Vector3(-5,10,4));
-								points.push(new THREE.Vector3(14,10,3));
-								var j = Math.floor(Math.random()*(4-1+1))+1;
-								points.push(new THREE.Vector3(19,10,-2+j*1.4));
-
-								humans[i].doors = j;
-								moveanimateinit(humans[i],i,points,i,0.002);
-							}
-							if(humans[i].stage == 4){
-
-									let points = [];
-									points.push(new THREE.Vector3(humans[i].mesh.position.x,humans[i].mesh.position.y,humans[i].mesh.position.z));
-
-									points.push(new THREE.Vector3(humans[i].mesh.position.x+4,humans[i].mesh.position.y,humans[i].mesh.position.z));
-
-									if(humans[i].direct == 1){
-										points.push(new THREE.Vector3(33,10,25));
-									}else{
-										points.push(new THREE.Vector3(33.5,10,-5));
-									}
-									zhajicontrol("out",humans[i].doors);
-									moveanimateinit(humans[i],i,points,i,0.002);
-							}
-						}
-					}
-				}
-			},1000);
-		};
-	},1000);
-
-	this.switchrender = function(mode){
-		if(mode){
-			rendermode = 0;
-			renderer.setViewport( 0, 0, scope.dom.offsetWidth, scope.dom.offsetHeight );
-			renderer.setScissor( 0, 0, scope.dom.offsetWidth, scope.dom.offsetHeight );
-			renderer.setScissorTest( false );
-			renderer.setSize(scope.dom.offsetWidth, scope.dom.offsetHeight);
-			camerass.aspect = dom.offsetWidth / dom.offsetHeight;
-			camerass.updateProjectionMatrix();
-		}else{
-			rendermode = 1;
-		}
-	}
-	//循环渲染函数
-	function animate() {
-		// console.log(rendermode);
-		if(rendermode == 0){
-			renderer.render(scene, camerass);
-			scope.controls.update();
-		}else{
-			monitorrender();
-		}
-
-		let delta = clock.getDelta();
-
-    for(let i=mixers.length-1;i>=0;i--){
-      if ( mixers[i] && mixers[i].runplay == true){
-        mixers[i].update( delta );
-      }
-    }
-    moveanimateupdate();
-
-		requestAnimationFrame(animate);
-
-	}
-
-	function moveanimateinit(model,name,points,index,speed){
-
-    let curve =  new THREE.CatmullRomCurve3(points);
-    curve.curvrtype = "chordal";
-    // curve动画轨迹
-    // progress动画进度
-    // enable当前动画开关
-    // speed动画速度
-
-    let animate = {
-      name:index,
-      index:index,
-      curve:curve,
-      progress:0,
-      directchange:false,
-      enable:true,
-      status:"start",
-      speed:speed,
-    };
-   	humans[index].runrail = animate;
-		humans[index].status = 1;
-    humans[index].action.play();
-    humans[index].mixer.runplay = true;
-    moveanimatelist.push(animate);
-  }
-
-	function moveanimateupdate(){
-			if(humans.length>0){
-				for(let i=0;i<humans.length;i++){
-							if(humans[i].runrail.enable){
-									// 动画播放结束
-									if(humans[i].runrail.progress>=1){
-										// let point = humans[i].runrail.curve.getPointAt(1);
-										//更新模型坐标
-										// console.log(moveanimatelist);
-										if(humans[i].status == 1){
-											humans[i].runrail.enable = false;
-											humans[i].runrail.progress = 1;
-											humans[i].mixer.runplay = false;
-											humans[i].action.stop();
-											humans[i].status = 0;
-
-											if(humans[i].stage == 4){
-
-												rungroup.remove(humans[i].mesh);
-												// humans.splice(i,1);
-											}
-
-											if(humans[i].stage == 3){
-
-												if(humans[i].direct == 1){
-
-													stationleft[humans[i].doors].waiting = 0;
-												}else{
-
-													stationright[humans[i].doors].waiting = 0;
-												}
-												humans[i].stage = 4;
-
-											}
-
-											if(humans[i].stage == 2){
-												humans[i].stage = 3;
-
-											}
-
-											if(humans[i].stage == 1){
-
-
-												humans[i].stage = 2;
-
-											}
-
-											if(humans[i].stage == 0){
-												// console.log(humans[i].doors);
-												zhajiin[humans[i].doors].waiting = 0;
-												humans[i].stage = 1;
-											}
-
-											moveanimatelist.splice(i,1);
-
-										}
-
-									}else{
-							//根据动画进度获取动画轨迹上点
-
-										let point = humans[i].runrail.curve.getPointAt(humans[i].runrail.progress);
-
-										//更新模型坐标
-										humans[i].mesh.position.x = point.x;
-										humans[i].mesh.position.y = point.y;
-										humans[i].mesh.position.z = point.z;
-										if((humans[i].runrail.progress+0.001)<1){
-											let tangent = humans[i].runrail.curve.getPointAt(humans[i].runrail.progress+0.001);
-											humans[i].mesh.lookAt(new THREE.Vector3(tangent.x,humans[i].mesh.position.y,tangent.z));
-										}
-
-										humans[i].runrail.progress += humans[i].runrail.speed;
-										point = null;
-
-									}
-
-							}
-						}
-			}
-		}
-
-		function newhumancreate(){
-			var direct = Math.floor(Math.random()*(3-1+1))+1;
-			var mantype = Math.floor(Math.random()*(3-1+1))+1;
-			// console.log(direct);
-			let points = [];
-			let newhuman;
-			if(mantype == 1){
-				newhuman = THREE.SkeletonUtils.clone( originhuman1 );
-				newhuman.animations = [];
-				newhuman.animations.push(originanima1.clone());
-			}else{
-				newhuman = THREE.SkeletonUtils.clone( originhuman2 );
-				newhuman.animations = [];
-				newhuman.animations.push(originanima2.clone());
-			}
-			if(direct == 1|| direct == 2){
-				newhuman.position.set(32,10,25);
-				points.push(new THREE.Vector3(32,10,25));
-				points.push(new THREE.Vector3(26,10,21));
-				points.push(new THREE.Vector3(18,10,18));
-			}else{
-				newhuman.position.set(32,10,-5);
-				points.push(new THREE.Vector3(32,10,-5));
-				points.push(new THREE.Vector3(26,10,12));
-				points.push(new THREE.Vector3(24,10,17));
-				points.push(new THREE.Vector3(18,10,18));
-			}
-
-			let j = Math.floor(Math.random()*(4-1+1))+1;
-			points.push(new THREE.Vector3(-0.5+j*1.4,10,18.5));
-			// zhajiin[j].waiting = 1;
-
-			let mixer = new THREE.AnimationMixer( newhuman );
-			mixer.runplay = false;
-			let action = mixer.clipAction( newhuman.animations[ 0 ] );
-
-			var stationdirection = Math.floor(Math.random()*(2-1+1))+1;
-			let newone = {
-				id:humans.length,
-				mesh:newhuman,
-				status:1,
-				stage:0,
-				direct:stationdirection,
-				doorstatus:null,
-				doors:j,
-				action:action,
-				mixer:mixer,
-				runrail:null
-			};
-
-			humans.push(newone);
-			mixers.push(mixer);
-			rungroup.add(newhuman);
-
-
-			moveanimateinit(newone,humans.length,points,newone.id,0.002);
-
-					// return newone;
-		}
-
-		function initstationanimation(object){
-			let mixer = new THREE.AnimationMixer( object );
-
-			let newclip = object.animations[ 0 ];
-			for(let j=0;j<object.children.length;j++){
-
-				if(object.children[j].name == "top"){
-					object.children[j].animations = [];
-					object.children[j].animations.push(newclip.clone());
-
-					let mixer = new THREE.AnimationMixer(  object.children[j] );
-
-					let action =mixer.clipAction( object.children[j].animations[0])
-					action.setLoop(THREE.LoopOnce);
-					action.clampWhenFinished = true;
-					// action.play();
-					mixer.runplay = true;
-					mixers.push(mixer);
-					let device = {
-						action:action,
-						mixer:mixer,
-					};
-					deviceaction[object.children[j].name] = device;
-				}
-				if(object.children[j].name == "down"){
-					object.children[j].animations = [];
-					object.children[j].animations.push(newclip.clone());
-
-					let mixer = new THREE.AnimationMixer( object.children[j] );
-
-
-					let action =mixer.clipAction( object.children[j].animations[0])
-					// action.play();
-					action.setLoop(THREE.LoopOnce);
-					action.clampWhenFinished = true;
-					mixer.runplay = true;
-					mixers.push(mixer);
-					let device = {
-						action:action,
-						mixer:mixer,
-					};
-					deviceaction[object.children[j].name] = device;
-				}
-      }
-			station = object;
-	    scene.add(object);
-
-		}
-
-		function initzhajiinaimation(object){
-			let mixer = new THREE.AnimationMixer(  object );
-			let newclip = object.animations[ 0 ];
-			let newzhaji = object;
-			for(let i=0;i<newzhaji.children.length;i++){
-				if(newzhaji.children[i].name == "in01"){
-					newzhaji.children[i].animations = [];
-					newzhaji.children[i].animations.push(newclip.clone());
-
-					let mixer = new THREE.AnimationMixer(  newzhaji.children[i] );
-
-					let action =mixer.clipAction( newzhaji.children[i].animations[0]);
-					action.setLoop(THREE.LoopOnce);
-					action.clampWhenFinished = true;
-					mixer.runplay = true;
-					mixers.push(mixer);
-					let device = {
-						action:action,
-						mixer:mixer,
-					};
-					deviceaction[object.children[i].name] = device;
-				}
-				if(newzhaji.children[i].name == "in02"){
-					newzhaji.children[i].animations = [];
-					newzhaji.children[i].animations.push(newclip.clone());
-
-					let mixer = new THREE.AnimationMixer(  newzhaji.children[i] );
-
-					let action =mixer.clipAction( newzhaji.children[i].animations[0]);
-					action.setLoop(THREE.LoopOnce);
-					action.clampWhenFinished = true;
-					mixer.runplay = true;
-					mixers.push(mixer);
-					let device = {
-						action:action,
-						mixer:mixer,
-					};
-					deviceaction[object.children[i].name] = device;
-				}
-				if(newzhaji.children[i].name == "in03"){
-					newzhaji.children[i].animations = [];
-					newzhaji.children[i].animations.push(newclip.clone());
-
-					let mixer = new THREE.AnimationMixer(  newzhaji.children[i] );
-
-					let action =mixer.clipAction( newzhaji.children[i].animations[0]);
-					action.setLoop(THREE.LoopOnce);
-					action.clampWhenFinished = true;
-					mixer.runplay = true;
-					mixers.push(mixer);
-					let device = {
-						action:action,
-						mixer:mixer,
-					};
-					deviceaction[object.children[i].name] = device;
-				}
-				if(newzhaji.children[i].name == "in04"){
-					newzhaji.children[i].animations = [];
-					newzhaji.children[i].animations.push(newclip.clone());
-
-					let mixer = new THREE.AnimationMixer(  newzhaji.children[i] );
-
-					let action =mixer.clipAction( newzhaji.children[i].animations[0]);
-					action.setLoop(THREE.LoopOnce);
-					action.clampWhenFinished = true;
-					mixer.runplay = true;
-					mixers.push(mixer);
-					let device = {
-						action:action,
-						mixer:mixer,
-					};
-					deviceaction[object.children[i].name] = device;
-				}
-				if(newzhaji.children[i].name == "in05"){
-					newzhaji.children[i].animations = [];
-					newzhaji.children[i].animations.push(newclip.clone());
-
-					let mixer = new THREE.AnimationMixer(  newzhaji.children[i] );
-
-					let action =mixer.clipAction( newzhaji.children[i].animations[0]);
-					action.setLoop(THREE.LoopOnce);
-					action.clampWhenFinished = true;
-					mixer.runplay = true;
-					mixers.push(mixer);
-					let device = {
-						action:action,
-						mixer:mixer,
-					};
-					deviceaction[object.children[i].name] = device;
-				}
-
-			}
-			zhajiinmodel = newzhaji;
-    	scene.add(newzhaji);
-
-		}
-
-		function initzhajioutanimation(object){
-			let mixer = new THREE.AnimationMixer(  object );
-			let newclip = object.animations[ 0 ];
-			let newzhaji = object;
-			for(let i=0;i<newzhaji.children.length;i++){
-
-				if(newzhaji.children[i].name == "out01"){
-					newzhaji.children[i].animations = [];
-					newzhaji.children[i].animations.push(newclip.clone());
-
-					let mixer = new THREE.AnimationMixer(  newzhaji.children[i] );
-
-					let action =mixer.clipAction( newzhaji.children[i].animations[0]);
-					action.setLoop(THREE.LoopOnce);
-					action.clampWhenFinished = true;
-					mixer.runplay = true;
-					mixers.push(mixer);
-					let device = {
-						action:action,
-						mixer:mixer,
-					};
-					deviceaction[object.children[i].name] = device;
-				}
-				if(newzhaji.children[i].name == "out02"){
-					newzhaji.children[i].animations = [];
-					newzhaji.children[i].animations.push(newclip.clone());
-
-					let mixer = new THREE.AnimationMixer(  newzhaji.children[i] );
-
-					let action =mixer.clipAction( newzhaji.children[i].animations[0]);
-					action.setLoop(THREE.LoopOnce);
-					action.clampWhenFinished = true;
-					mixer.runplay = true;
-					mixers.push(mixer);
-					let device = {
-						action:action,
-						mixer:mixer,
-					};
-					deviceaction[object.children[i].name] = device;
-				}
-				if(newzhaji.children[i].name == "out03"){
-					newzhaji.children[i].animations = [];
-					newzhaji.children[i].animations.push(newclip.clone());
-
-					let mixer = new THREE.AnimationMixer(  newzhaji.children[i] );
-
-					let action =mixer.clipAction( newzhaji.children[i].animations[0]);
-					action.setLoop(THREE.LoopOnce);
-					action.clampWhenFinished = true;
-					mixer.runplay = true;
-					mixers.push(mixer);
-					let device = {
-						action:action,
-						mixer:mixer,
-					};
-					deviceaction[object.children[i].name] = device;
-				}
-				if(newzhaji.children[i].name == "out04"){
-					newzhaji.children[i].animations = [];
-					newzhaji.children[i].animations.push(newclip.clone());
-
-					let mixer = new THREE.AnimationMixer(  newzhaji.children[i] );
-
-					let action =mixer.clipAction( newzhaji.children[i].animations[0]);
-					action.setLoop(THREE.LoopOnce);
-					action.clampWhenFinished = true;
-					mixer.runplay = true;
-					mixers.push(mixer);
-					let device = {
-						action:action,
-						mixer:mixer,
-					};
-					deviceaction[object.children[i].name] = device;
-				}
-				if(newzhaji.children[i].name == "out05"){
-					newzhaji.children[i].animations = [];
-					newzhaji.children[i].animations.push(newclip.clone());
-
-					let mixer = new THREE.AnimationMixer(  newzhaji.children[i] );
-
-					let action =mixer.clipAction( newzhaji.children[i].animations[0]);
-					action.setLoop(THREE.LoopOnce);
-					action.clampWhenFinished = true;
-					mixer.runplay = true;
-					mixers.push(mixer);
-					let device = {
-						action:action,
-						mixer:mixer,
-					};
-					deviceaction[object.children[i].name] = device;
-				}
-
-			}
-			zhajioutmodel = newzhaji
-    	scene.add(newzhaji);
-		}
-
-		function zhajicontrol(type,door){
-
-			let devicenum = door-1;
-			if(type == "in"){
-				deviceaction[zhajiin[devicenum].id].action.reset();
-				deviceaction[zhajiin[devicenum].id].action.time = 0;
-				deviceaction[zhajiin[devicenum].id].action.timeScale = 1;
-				deviceaction[zhajiin[devicenum].id].action.play();
-			}else if(type == "out"){
-				deviceaction[zhajiout[devicenum].id].action.reset();
-				deviceaction[zhajiout[devicenum].id].action.time = 0;
-				deviceaction[zhajiout[devicenum].id].action.timeScale = 1;
-				deviceaction[zhajiout[devicenum].id].action.play();
-			}
-
-		}
-		function monitorrender() {
-
-				// updateSize();
-
-				for ( var ii = 0; ii < views.length; ++ ii ) {
-
-					var view = views[ ii ];
-					var camera = view.camera;
-
-					// view.updateCamera( camera, scene, mouseX, mouseY );
-
-					var left = Math.floor( windowWidth * view.left );
-					var bottom = Math.floor( windowHeight * view.bottom );
-					var width = Math.floor( windowWidth * view.width );
-					var height = Math.floor( windowHeight * view.height );
-
-					renderer.setViewport( left, bottom, width, height );
-					renderer.setScissor( left, bottom, width, height );
-					renderer.setScissorTest( true );
-
-					camera.aspect = width / height;
-					camera.updateProjectionMatrix();
-
-					renderer.render( scene, camera );
-
-				}
-
-			}
-
-}
diff --git a/src/jlmap3d/jl3dpassflow/jl3dpassflownew.js b/src/jlmap3d/jl3dpassflow/jl3dpassflownew.js
index 1e75f8a60..07d59d8d7 100644
--- a/src/jlmap3d/jl3dpassflow/jl3dpassflownew.js
+++ b/src/jlmap3d/jl3dpassflow/jl3dpassflownew.js
@@ -1,179 +1,63 @@
 import { Staticmodel } from '@/jlmap3d/jl3dpassflow/config.js';
+//静态资源文件路劲
 import { JL3D_LOCAL_STATIC } from '@/api/jlmap3d/assets3d.js';
-
 //loader
 import { FBXLoader } from '@/jlmap3d/main/loaders/FBXLoader';
-import { OBJLoader } from '@/jlmap3d/main/loaders/OBJLoader';
-
+//轨道视角控制
 import { OrbitControls } from '@/jlmap3d/main/control/OrbitControls';
-
+//模型管理器
 import { ModelManager } from '@/jlmap3d/jl3dpassflow/loader.js';
+//骨骼动画模型辅助工具
 import { SkeletonUtils } from '@/jlmap3d/main/utils/SkeletonUtils.js';
-
-import { Pathfinding } from '@/jlmap3d/utils/pathfinder/Pathfinding.js';
-import { ZoneManager } from '@/jlmap3d/jl3dpassflow/model/zonemanager.js';
-
-import {Materialload} from '@/jlmap3d/main/loaders/Materialload.js';
-
+//获取信息接口
 import { getPublishMapVersion, getPublishMapDetail,getPublish3dMapDetail} from '@/api/jlmap3d/load3ddata';
-
+//cctv站台对象
+import { PasserStation } from '@/jlmap3d/jl3dpassflow/model/passerstation.js';
+//cctv检票机对象
+import { PasserCheckDoor } from '@/jlmap3d/jl3dpassflow/model/passercheckdoor.js';
+//cctv列车对象
+import { PasserTrain } from '@/jlmap3d/jl3dpassflow/model/passertrain.js';
+//cctv行人对象
+import { PasserHuman } from '@/jlmap3d/jl3dpassflow/model/passerhuman.js';
+//cctv渲染器
+import { PasserRender } from '@/jlmap3d/jl3dpassflow/passerrender/passerrender.js';
+//cctv行人ai
+import { PasserAi } from '@/jlmap3d/jl3dpassflow/passerai/passerai.js';
+//行人寻路相关工具
+import { ZoneManager } from '@/jlmap3d/jl3dpassflow/model/zonemanager.js';
+import { PathFinder } from '@/jlmap3d/jl3dpassflow/passerai/pathfinder.js';
+//cctv通信工具
 import { PassflowConnect } from '@/jlmap3d/jl3dpassflow/connect/passflowconnect.js';
+
 import StompClient from '@/utils/sock';
 import store from '@/store/index_APP_TARGET';
 // import { Loading } from 'element-ui';
 import {Stats} from '@/jlmap3d/main/lib/stats.min.js';
 
-
+//动画播放相关
 let clock = new THREE.Clock();
 let delta;
+
 let scene,camerass,renderer;
-let rendermode = 0;
+
 let aiswitch = 0;
-
+//动画组
 let mixers = [];
-let testmesh1,testmesh2;
-let humans = [];
-let checkdoor1 = [];
-let checkdoor2 = [];
-let station;
-let zhajiinmodel;
-let zhajioutmodel;
+//车站摄像机模型
 let monitor;
-let ids = 0;
 
-let humanlist = new THREE.Group();
-
-let originhuman1 = null;
-let originhuman2 = null;
-let originanima1 = null;
-let originanima2 = null;
-let toptrain = null;
-let downtrain = null;
-let zhajiin = [];
-let zhajiout = [];
+//寻路相关对象
+let passerZone = new ZoneManager();
+let pathFinder = new PathFinder();
+let path;
 
+//设备动画action组
 let deviceaction = [];
+//控制帧率的webworker线程
+let passerWebWork = new Worker(JL3D_LOCAL_STATIC+"/workertest/passsimulation/station.js");
 
-let stationwebwork = new Worker(JL3D_LOCAL_STATIC+"/workertest/passsimulation/station.js");
-
-let stationzon = new ZoneManager();
 //老版本临时ai控制
 let olddataai = false;
-for(let i=0;i<5;i++){
-	checkdoor1[i]={
-		id:"c1"+i,
-		status:0,
-		pos:[],
-		max:10
-	};
-}
-
-for(let i=0;i<5;i++){
-	let zhaji = {
-		id:"in0"+(i+1),
-		status:0,
-		waiting:0
-	}
-	zhajiin.push(zhaji);
-}
-
-for(let i=0;i<5;i++){
-	let zhaji = {
-		id:"out0"+(i+1),
-		status:0,
-		waiting:0
-	}
-	zhajiout.push(zhaji);
-}
-
-let stationleft = [];
-let stationright = [];
-
-for(let i=0;i<22;i++){
-	let sl = {
-		id:"left"+i,
-		status:0,
-		waiting:0
-	}
-	stationleft.push(sl);
-}
-
-for(let i=0;i<22;i++){
-	let sr = {
-		id:"right"+i,
-		status:0,
-		waiting:0
-	}
-	stationright.push(sr);
-}
-
-let windowWidth = window.innerWidth ;
-let windowHeight = window.innerHeight;
-let views4 = [
-			{
-				left: 0,
-				bottom: 0,
-				width: 0.24,
-				height: 0.5,
-				background: new THREE.Color( 0.5, 0.5, 0.7 ),
-				eye: [ 3.7, 16, 26 ],
-				up: [3.7, 10 ,16 ],
-				fov: 30
-			},
-			{
-				left:0.25,
-				bottom: 0,
-				width: 0.24,
-				height: 0.5,
-				background: new THREE.Color( 0.5, 0.5, 0.7 ),
-				eye: [ 3.7,17,-4 ],
-				up: [  3.7, 10 ,16],
-				fov: 30
-			},
-			{
-				left: 0.5,
-				bottom: 0,
-				width: 0.24,
-				height: 0.5,
-				background: new THREE.Color( 0.7, 0.5, 0.5 ),
-				eye: [ -60, 6,11],
-				up: [ -59, 5.9,11 ],
-				fov: 45
-			},
-			{
-				left: 0.75,
-				bottom: 0,
-				width: 0.24,
-				height: 0.5,
-				background: new THREE.Color( 0.5, 0.7, 0.7 ),
-				eye: [ -7,17,2],
-				up: [-7, 10, 8],
-				fov: 60
-			}
-		];
-
-let views2 = [
-			{
-				left: 0,
-				bottom: 0,
-				width: 0.5,
-				height: 0.5,
-				background: new THREE.Color( 0.5, 0.5, 0.7 ),
-				eye: [ 3.7, 16, 26 ],
-				up: [3.7, 10 ,16 ],
-				fov: 60
-			},
-			{
-				left: 0.5,
-				bottom: 0,
-				width: 0.5,
-				height: 0.5,
-				background: new THREE.Color( 0.7, 0.5, 0.5 ),
-				eye: [ -60, 6,11],
-				up: [ -59, 5.9,11 ],
-				fov: 60
-			},
-		];
 
 export function Jl3dpassflow(dom,skinCode,routegroup,viewMap) {
 
@@ -181,236 +65,46 @@ export function Jl3dpassflow(dom,skinCode,routegroup,viewMap) {
 	// dom.appendChild( stats.dom );
 
 	let scope = this;
-	initView(viewMap);
+
 	this.dom = dom;
 	this.nowcode = null;
 	this.animateswitch = false;
 	this.signallights = [];
 	this.mixers = [];
 	this.showmodel = null;
-	//替换材质组(站台的)
-	this.stationtexture = [];
-	//初始化webgl渲染
-	renderer = new THREE.WebGLRenderer({ antialias: true });
-
-	renderer.setClearColor(new THREE.Color(0x000000));
-	renderer.setSize(dom.offsetWidth, dom.offsetHeight);
-  renderer.sortObjects = true;
-	windowWidth = dom.offsetWidth ;
-	windowHeight = dom.offsetHeight;
-
-	this.dom.appendChild(renderer.domElement);
 
 	//定义相机
-
 	camerass = new THREE.PerspectiveCamera(70, dom.offsetWidth / dom.offsetHeight, 0.01, 1000);
 	camerass.position.set(0, 80, 40);
 	camerass.aspect = dom.offsetWidth / dom.offsetHeight;
 	camerass.updateProjectionMatrix();
 
-	for ( let ii = 0; ii < views4.length; ++ ii ) {
-
-		let view = views4[ ii ];
-		let camera = new THREE.PerspectiveCamera( view.fov, window.innerWidth / window.innerHeight, 1, 200 );
-		camera.position.fromArray( view.eye );
-		camera.lookAt( view.up[0],view.up[1],view.up[2] );
-		view.camera = camera;
-
-	}
-	for ( let ii = 0; ii < views2.length; ++ ii ) {
-
-		let view = views2[ ii ];
-		let camera = new THREE.PerspectiveCamera( view.fov, window.innerWidth / window.innerHeight, 1, 200 );
-		camera.position.fromArray( view.eye );
-		camera.lookAt( view.up[0],view.up[1],view.up[2] );
-		view.camera = camera;
-
-	}
-
-
-
 	//定义场景(渲染容器)
 	scene = new THREE.Scene();
 	scene.background = new THREE.Color(0xa0a0a0);
 
-	// let mesh = new THREE.Mesh(new THREE.PlaneBufferGeometry(200, 200), new THREE.MeshPhongMaterial({ color: 0x999999, depthWrite: false }));
-	// mesh.rotation.x = - Math.PI / 2;
-	// mesh.receiveShadow = true;
-	// scene.add(mesh);
-	//
-	// let grid = new THREE.GridHelper(200, 20, 0x000000, 0x000000);
-	// grid.material.opacity = 0.2;
-	// grid.material.transparent = true;
-	// scene.add(grid);
-
+	let passerRender = new PasserRender(viewMap);
+	passerRender.initView(dom,scene,camerass);
 
 	//定义全局光
 	let ambientLight = new THREE.AmbientLight(0xffffff, 1.3);
 	scene.add(ambientLight);
 
-	//
-	// let spotLight = new THREE.SpotLight(0xffffff);
-	// spotLight.position.set(-50, 60, 15);
-	// spotLight.castShadow = true;
-	// spotLight.shadow.mapSize.width = 1024;
-	// spotLight.shadow.mapSize.height = 1024;
-	// scene.add(spotLight);
-
-
-
-	this.controls = new THREE.OrbitControls(camerass, dom);
-	this.controls.maxPolarAngle = Math.PI / 2;
-	this.controls.minPolarangle = Math.PI / 5;
-	this.controls.maxDistance = 800;
-	this.controls.screenSpacePanning = true;
-	this.controls.update();
+	let controls = new THREE.OrbitControls(camerass, dom);
+	controls.maxPolarAngle = Math.PI / 2;
+	controls.minPolarangle = Math.PI / 5;
+	controls.maxDistance = 800;
+	controls.screenSpacePanning = true;
+	controls.update();
 	this.selectmodel = null;
 
-
-
-	const ZONE = 'level';
-	const SPEED = 10;
-	const OFFSET = 0.2;
-
-	THREE.Pathfinding = Pathfinding;
-
-	let level, navmesh;
-
-	let groupID, path;
-
-	let playerPosition = new THREE.Vector3( -3.5, 0.5, 5.5 );
-	let targetPosition = new THREE.Vector3();
-
-	let pathfinder = new THREE.Pathfinding();
 	// let mouse = new THREE.Vector2();
 	let raycaster = new THREE.Raycaster();
 
-	//上车控制开关
-	let toppasserin = false;
-	let downpasserin = false;
-	//下车控制开关
-	let toppasseron = false;
-	let downpasseron = false;
+	let humanlist = new THREE.Group();
+	let passerHuman = new PasserHuman();
 
-
-	let loader = new THREE.OBJLoader();
-
-	// load a resource
-	loader.load(
-		// resource URL
-		JL3D_LOCAL_STATIC+'/jl3d/path/path.obj',
-		// called when resource is loaded
-		function ( object ) {
-
-
-			// console.time('createZone()');
-			const zone = THREE.Pathfinding.createZone(object.children[0].geometry);
-			// console.timeEnd('createZone()');
-
-			pathfinder.setZoneData( ZONE, zone );
-
-			const navWireframe = new THREE.Mesh(object.children[0].geometry, new THREE.MeshBasicMaterial({
-				color: 0x808080,
-				wireframe: true
-			}));
-			navWireframe.position.y = OFFSET / 2;
-			// scene.add(navWireframe);
-
-			navmesh = object.children[0];
-			// scene.add(navmesh);
-
-			// Set the player's navigation mesh group
-			groupID = pathfinder.getGroup( ZONE, playerPosition );
-
-		},
-		// called when loading is in progresses
-		function ( xhr ) {
-
-			console.log( ( xhr.loaded / xhr.total * 100 ) + '% loaded' );
-
-		},
-		// called when loading has errors
-		function ( error ) {
-
-			console.log( 'An error happened' );
-
-		}
-	);
-	// document.addEventListener( 'mouseup', onDocumentMouseUp, false );
-
-	// function onDocumentMouseUp (event) {
-	//
-	// 	mouse.x = ( event.clientX / window.innerWidth ) * 2 - 1;
-	// 	mouse.y = - ( event.clientY / window.innerHeight ) * 2 + 1;
-	//
-	//
-	// 	camerass.updateMatrixWorld();
-	//
-	// 	raycaster.setFromCamera( mouse, camerass );
-	//
-	// 	const intersects = raycaster.intersectObject( navmesh );
-	//
-	// 	if ( !intersects.length ) return;
-	// 	console.log(intersects[0].point);
-	// 	targetPosition.copy( intersects[0].point );
-	//
-	// 	// Teleport on ctrl/cmd click or RMB.
-	// 	if (event.metaKey || event.ctrlKey || event.button === 2) {
-	//
-	// 		path = null;
-	// 		originhuman1.position.copy( playerPosition.copy( targetPosition ) );
-	//
-	// 		return;
-	//
-	// 	}
-	//
-	// 	path = pathfinder.findPath( playerPosition, targetPosition, ZONE, groupID );
-	//
-	// 	let points = [];
-	// 	points.push(new THREE.Vector3(originhuman1.position.x,originhuman1.position.y,originhuman1.position.z));
-	// 	for(let i=0;i<path.length;i++){
-	// 		points.push(path[i]);
-	// 	}
-	// 	originhuman1.curve =  new THREE.CatmullRomCurve3(points);
-  //   originhuman1.curve.curvrtype = "centripetal";
-	// 	originhuman1.progress = 0;
-	// 	console.log(path);
-	//
-	// }
-
-	function tick ( dt ) {
-
-		if(originhuman1.curve){
-			if(originhuman1.progress<1){
-				let point = originhuman1.curve.getPointAt(originhuman1.progress);
-
-				//更新模型坐标
-				originhuman1.position.x = point.x;
-				originhuman1.position.y = point.y;
-				originhuman1.position.z = point.z;
-				if((originhuman1.progress+0.001)<1){
-					let tangent = originhuman1.curve.getPointAt(originhuman1.progress+0.001);
-					originhuman1.lookAt(new THREE.Vector3(tangent.x,originhuman1.position.y,tangent.z));
-				}
-
-				originhuman1.progress += 0.05;
-			}else{
-				playerPosition.copy( originhuman1.position )
-			}
-
-		}
-
-	}
-
-	window.onresize = function () {
-
-		renderer.setSize(scope.dom.offsetWidth, scope.dom.offsetHeight);
-		windowWidth = scope.dom.offsetWidth ;
-		windowHeight = scope.dom.offsetHeight;
-
-		camerass.aspect = scope.dom.offsetWidth / scope.dom.offsetHeight;
-		camerass.updateProjectionMatrix();
-	}
+	let passerAi = new PasserAi(passerZone,pathFinder);
 
 	this.anime = null;
 
@@ -418,237 +112,77 @@ export function Jl3dpassflow(dom,skinCode,routegroup,viewMap) {
   // let loadingInstance = Loading.service({ fullscreen: true });
 
 	this.nowstation = null;
+
 	let stationlist = [];
 	let socktest = null;
+	let passerStation = new PasserStation();
+	let passerCheckDoor = new PasserCheckDoor();
+	let passerTrain = new PasserTrain();
 
 	getPublish3dMapDetail(skinCode).then(netdata3d => {
+		passerStation.loadMaterial(netdata3d);
 		this.modelmanager.loadpromise(JSON.parse(netdata3d.data.assets).cctvAssetList, scope.mixers).then(function (data) {
-			// console.log(scope.modelmanager);
-			initstationanimation(scope.modelmanager.station.mesh);
-			initzhajiinaimation(scope.modelmanager.zhajiin.mesh);
-			initzhajioutanimation(scope.modelmanager.zhajiout.mesh);
-			inittrain(scope.modelmanager.train.mesh);
-			scene.add(scope.modelmanager.section.mesh);
-			// scene.add(scope.modelmanager.train.mesh);
 
-			level = scope.modelmanager.station.mesh;
+			passerStation.initStationAnimation(scope.modelmanager.station.mesh,mixers,deviceaction,scene);
+			passerCheckDoor.initCheckDoorInAnimation(scope.modelmanager.zhajiin.mesh,mixers,deviceaction,scene);
+			passerCheckDoor.initCheckDoorOutAnimation(scope.modelmanager.zhajiout.mesh,mixers,deviceaction,scene);
+
+			passerTrain.initTrain(scope.modelmanager.train.mesh,mixers,deviceaction,scene);
+
+			scene.add(scope.modelmanager.section.mesh);
 
 			monitor = scope.modelmanager.monitor.mesh;
 			scene.add(monitor);
 
-			Materialload(scope,JSON.parse(netdata3d.data.assets).stationTextureList[0]);
+
 
 			getPublishMapDetail(skinCode).then(netdata => {
-				scope.switchviews(4);
-				inithumans();
-				initstationlist(netdata.data.stationList,netdata.data.stationStandList,netdata.data.psdList);
-				socktest = new PassflowConnect(scope,deviceaction,toptrain,downtrain,routegroup);
+				scope.switchviews('4views');
+				passerHuman.initHumans(scope.modelmanager.man1.mesh,scope.modelmanager.man2.mesh);
+				scene.add(humanlist);
+				passerStation.initStationList(netdata.data.stationList,netdata.data.stationStandList,netdata.data.psdList);
+				socktest = new PassflowConnect(deviceaction,passerTrain.toptrain,passerTrain.downtrain,routegroup,passerStation,passerAi);
 
+				store.dispatch('app/animationsClose');
+
+				let checkobject = setInterval(function(){
+
+					clearInterval(checkobject);
+					//进站控制
+					startWorker();
+					passerWebWork.postMessage("on");
+
+				},1000);
 			});
 
-			// loadingInstance.close();
-			store.dispatch('app/animationsClose');
 			animate();
 		})
 	});
-	function initView(viewMap){
-		if(viewMap == "normal"){
-			views4 = [
-				{
-					left: 0,
-					bottom: 0,
-					width: 0.5,
-					height: 0.5,
-					background: new THREE.Color( 0.5, 0.5, 0.7 ),
-					eye: [ 3.7, 16, 26 ],
-					up: [3.7, 10 ,16 ],
-					fov: 30
-				},
-				{
-					left: 0,
-					bottom: 0.5,
-					width: 0.5,
-					height: 0.5,
-					background: new THREE.Color( 0.5, 0.5, 0.7 ),
-					eye: [ 3.7,17,-4 ],
-					up: [  3.7, 10 ,16],
-					fov: 30
-				},
-				{
-					left: 0.5,
-					bottom: 0,
-					width: 0.5,
-					height: 0.5,
-					background: new THREE.Color( 0.7, 0.5, 0.5 ),
-					eye: [ -60, 6,11],
-					up: [ -59, 5.9,11 ],
-					fov: 45
-				},
-				{
-					left: 0.5,
-					bottom: 0.5,
-					width: 0.5,
-					height: 0.5,
-					background: new THREE.Color( 0.5, 0.7, 0.7 ),
-					eye: [ -7,17,2],
-					up: [-7, 10, 8],
-					fov: 60
-				}
-			];
 
-			views2 = [
-				{
-					left: 0,
-					bottom: 0,
-					width: 0.5,
-					height: 1,
-					background: new THREE.Color( 0.5, 0.5, 0.7 ),
-					eye: [ 3.7, 16, 26 ],
-					up: [3.7, 10 ,16 ],
-					fov: 60
-				},
-				{
-					left: 0.5,
-					bottom: 0,
-					width: 0.5,
-					height: 1,
-					background: new THREE.Color( 0.7, 0.5, 0.5 ),
-					eye: [ -60, 6,11],
-					up: [ -59, 5.9,11 ],
-					fov: 60
-				},
-			];
-		}else{
-			views4 = [
-				{
-					left: 0,
-					bottom: 0,
-					width: 0.24,
-					height: 0.5,
-					background: new THREE.Color( 0.5, 0.5, 0.7 ),
-					eye: [ 3.7, 16, 26 ],
-					up: [3.7, 10 ,16 ],
-					fov: 30
-				},
-				{
-					left:0.25,
-					bottom: 0,
-					width: 0.24,
-					height: 0.5,
-					background: new THREE.Color( 0.5, 0.5, 0.7 ),
-					eye: [ 3.7,17,-4 ],
-					up: [  3.7, 10 ,16],
-					fov: 30
-				},
-				{
-					left: 0.5,
-					bottom: 0,
-					width: 0.24,
-					height: 0.5,
-					background: new THREE.Color( 0.7, 0.5, 0.5 ),
-					eye: [ -60, 6,11],
-					up: [ -59, 5.9,11 ],
-					fov: 45
-				},
-				{
-					left: 0.75,
-					bottom: 0,
-					width: 0.24,
-					height: 0.5,
-					background: new THREE.Color( 0.5, 0.7, 0.7 ),
-					eye: [ -7,17,2],
-					up: [-7, 10, 8],
-					fov: 60
-				}
-			];
-
-			views2 = [
-				{
-					left: 0,
-					bottom: 0,
-					width: 0.5,
-					height: 0.5,
-					background: new THREE.Color( 0.5, 0.5, 0.7 ),
-					eye: [ 3.7, 16, 26 ],
-					up: [3.7, 10 ,16 ],
-					fov: 60
-				},
-				{
-					left: 0.5,
-					bottom: 0,
-					width: 0.5,
-					height: 0.5,
-					background: new THREE.Color( 0.7, 0.5, 0.5 ),
-					eye: [ -60, 6,11],
-					up: [ -59, 5.9,11 ],
-					fov: 60
-				},
-			];
-
-		}
-	}
-	function inithumans(){
-		originhuman1 = scope.modelmanager.man1.mesh;
-		originhuman1.progress = 1;
-		// scene.add(originhuman1);
-		originhuman2 =  scope.modelmanager.man2.mesh;
-
-		let mixer1 = new THREE.AnimationMixer( originhuman1 );
-		let mixer2 = new THREE.AnimationMixer( originhuman2 );
-		originanima1 = originhuman1.animations[ 0 ];
-		originanima2 = originhuman2.animations[ 0 ];
-		originhuman1.remove(originhuman1.children[2]);
-		scene.add(humanlist);
-		// scene.add(scope.modelmanager.man1.mesh);
-	}
-
-
-	let checkobject = setInterval(function(){
-		// console.log(originhuman1);
-		if(originhuman1){
-			clearInterval(checkobject);
-			//进站控制
-			startWorker();
-			stationwebwork.postMessage("on");
-
-			// passerwebwork.postMessage("on");
-
-		};
-	},1000);
 	this.changestation = function(stationname){
-		for(let i=0,leni=stationlist.length;i<leni;i++){
-			if(stationlist[i].name == stationname){
-				scope.nowstation = stationlist[i];
-				scope.resetscene();
-				if(scope.stationtexture["stationlist"]){
-					scope.modelmanager.station.mesh.getObjectByName("zhantaiming").material.map = scope.stationtexture[scope.nowstation.code];
-					scope.modelmanager.station.mesh.getObjectByName("zhantaiming").material.map.needsUpdate = true;
-				}
-				i=leni;
-			}
-		}
+		passerStation.changestation(stationname);
+		scope.resetscene();
 	}
 
 	this.resetscene = function(){
 		aiswitch = 1;
-		toppasserin = false;
-		downpasserin = false;
+		passerAi.toppasserin = false;
+		passerAi.downpasserin = false;
 		//下车控制开关
-		toppasseron = false;
-		downpasseron = false;
+		passerAi.toppasseron = false;
+		passerAi.downpasseron = false;
 
-		toptrain.nowcode = null;
-		downtrain.nowcode = null;
+		passerTrain.toptrain.nowcode = null;
+		passerTrain.downtrain.nowcode = null;
 		// humanlist = new THREE.Group();
 		for(let j=0; j<humanlist.children.length;j++){
-			// scope.uncache(humanlist.children[j]);
 
 			humanlist.remove(humanlist.children[j]);
 			j--;
 			// j--;
 		}
-		toptrain.position.y = -20000;
-		downtrain.position.y = -20000;
+		passerTrain.toptrain.position.y = -20000;
+		passerTrain.downtrain.position.y = -20000;
 
 		deviceaction.down.action.reset();
 		deviceaction.down.action.time = deviceaction.down.action._clip.duration;
@@ -659,17 +193,17 @@ export function Jl3dpassflow(dom,skinCode,routegroup,viewMap) {
 		deviceaction.top.action.time = deviceaction.down.action._clip.duration;
 		deviceaction.top.action.timeScale = -1;
 		deviceaction.top.action.play();
-		for(let an=toptrain.action.top.length-1;an>=0;an--){
-			toptrain.action.top[an].reset();
-			toptrain.action.top[an].time = toptrain.action.top[an]._clip.duration;
-			toptrain.action.top[an].timeScale = -1;
-			toptrain.action.top[an].play();
+		for(let an=passerTrain.toptrain.action.top.length-1;an>=0;an--){
+			passerTrain.toptrain.action.top[an].reset();
+			passerTrain.toptrain.action.top[an].time = passerTrain.toptrain.action.top[an]._clip.duration;
+			passerTrain.toptrain.action.top[an].timeScale = -1;
+			passerTrain.toptrain.action.top[an].play();
 		}
-		for(let an=toptrain.action.down.length-1;an>=0;an--){
-			toptrain.action.down[an].reset();
-			toptrain.action.down[an].time = toptrain.action.down[an]._clip.duration;
-			toptrain.action.down[an].timeScale = -1;
-			toptrain.action.down[an].play();
+		for(let an=passerTrain.toptrain.action.down.length-1;an>=0;an--){
+			passerTrain.toptrain.action.down[an].reset();
+			passerTrain.toptrain.action.down[an].time = passerTrain.toptrain.action.down[an]._clip.duration;
+			passerTrain.toptrain.action.down[an].timeScale = -1;
+			passerTrain.toptrain.action.down[an].play();
 		}
 		// for(let an=actions.length-1;an>=0;an--){
 		// 	actions[an].reset();
@@ -678,172 +212,38 @@ export function Jl3dpassflow(dom,skinCode,routegroup,viewMap) {
 		// 	actions[an].play();
 		// }
 		setTimeout(function(){
-			initpasser();
+			passerAi.initPasser(humanlist,passerHuman);
 			aiswitch = 0;
 		}, 2000);
 
 	}
 
-	this.uncache = function(uncachemodel){
-		if(uncachemodel){
-			uncachemodel.mixer.uncacheAction();
-			uncachemodel.traverse( function ( child ) {
-				if ( child.isMesh ) {
-					child.geometry.dispose();
-					child.material.dispose();
-				}
-			} );
-		}
-
-	}
-
-	this.passerout = function(direct){
-		// console.log(direct);
-		if(direct == "top"){
-			// console.log("toppasser");
-			// console.log(stationzon.list["standtop"]);
-			toppasseron = true;
-			setTimeout(function(){
-				toppasseron = false
-				toppasserin = true;
-
-				setTimeout(function(){
-					toppasserin = false;
-				}, 20000);
-			}, 5000);
-		}
-		if(direct == "down"){
-			// console.log("downpasser");
-			// console.log(stationzon.list["standdown"]);
-			downpasseron = true;
-			setTimeout(function(){
-				downpasseron = false;
-				downpasserin = true;
-				setTimeout(function(){
-					downpasserin = false;
-				}, 20000);
-			}, 5000);
-		}
-	}
-
-	this.switchviews = function(viewmode){
-		if(viewmode == 4){
-			rendermode = 4;
-		}
-		if(viewmode == 2){
-			rendermode = 2;
-		}
-		if(viewmode == 1){
-			rendermode = 1;
-		}
-		if(viewmode == "auto"){
-
-			rendermode = 0;
-			renderer.setViewport( 0, 0, scope.dom.offsetWidth, scope.dom.offsetHeight );
-			renderer.setScissor( 0, 0, scope.dom.offsetWidth, scope.dom.offsetHeight );
-			renderer.setScissorTest( false );
-			renderer.setSize(scope.dom.offsetWidth, scope.dom.offsetHeight);
-			camerass.aspect = dom.offsetWidth / dom.offsetHeight;
-			camerass.updateProjectionMatrix();
-		}
-	}
-
-	function initpasser(){
-
-		for(let i=0;i<3;i++){
-
-			newhumancreate(stationzon.getinitposition("enter1"),0);
-		}
-		for(let i=0;i<3;i++){
-			newhumancreate(stationzon.getinitposition("enter2"),0);
-		}
-		for(let i=0;i<3;i++){
-			newhumancreate(stationzon.getinitposition("security"),1);
-		}
-		// for(let i=0;i<2;i++){
-		// 	// newhumancreate(stationzon.getinitposition("entergate"),3);
-		// }
-		for(let i=0;i<6;i++){
-			let standdata = stationzon.getstandposition("standtop");
-			newhumancreate(standdata.point,4,"top",standdata.door);
-		}
-		for(let i=0;i<6;i++){
-			let standdata = stationzon.getstandposition("standdown");
-			newhumancreate(standdata.point,4,"down",standdata.door);
-		}
-		// for(let i=0;i<5;i++){
-		// 	// newhumancreate(stationzon.getinitposition("exitgate"),6);
-		// }
-	}
-
-	function speciTest(){
-		// stats.update();
-	 if(aiswitch == 0){
-		 moveanimateupdate();
-		 passerai();
-
-		 delta = clock.getDelta();
-		 // tick(delta);
-
-		 for(let i=mixers.length-1;i>=0;i--){
-			 if(mixers[i]._actions[0].isRunning()){
-				 mixers[i].update( delta );
-			 }
-		 }
-		 for(let i=humanlist.children.length-1;i>=0;i--){
-			 if(humanlist.children[i].mixer._actions[0].isRunning()){
-				 humanlist.children[i].mixer.update( delta );
-			 }
-		 }
-	 }
-	}
 	function startWorker(){
-		initpasser();
+		passerAi.initPasser(humanlist,passerHuman);
 		let updateaianimate = setInterval(
 			function(){
 				// console.log("?");
-				 if(aiswitch == 0){
-					 moveanimateupdate();
-					 passerai();
+				if(aiswitch == 0){
+					passerHuman.moveAnimateUpdate(humanlist,olddataai,passerHuman);
+					passerAi.aiUpdate(humanlist,passerHuman,passerCheckDoor,deviceaction);
 
-					 delta = clock.getDelta();
-					 // tick(delta);
+					delta = clock.getDelta();
 
-					 for(let i=mixers.length-1;i>=0;i--){
-						 if(mixers[i]._actions[0].isRunning()){
-							 mixers[i].update( delta );
-						 }
+					for(let i=mixers.length-1;i>=0;i--){
+					 if(mixers[i]._actions[0].isRunning()){
+						 mixers[i].update( delta );
 					 }
-					 for(let i=humanlist.children.length-1;i>=0;i--){
-						 if(humanlist.children[i].mixer._actions[0].isRunning()){
-							 humanlist.children[i].mixer.update( delta );
-						 }
+					}
+					for(let i=humanlist.children.length-1;i>=0;i--){
+					 if(humanlist.children[i].mixer._actions[0].isRunning()){
+						 humanlist.children[i].mixer.update( delta );
 					 }
-				 }
-			}, 100);
-		// passerwebwork.onmessage = function (event) {
-		//
-		// 	 stats.update();
-		// 	if(aiswitch == 0){
-		// 		moveanimateupdate();
-		// 		passerai();
-		//
-		// 		delta = clock.getDelta();
-		// 		// tick(delta);
-		//
-		// 		for(let i=mixers.length-1;i>=0;i--){
-		// 			if(mixers[i]._actions[0].isRunning()){
-		// 				mixers[i].update( delta );
-		// 			}
-		// 		}
-		// 		for(let i=humanlist.children.length-1;i>=0;i--){
-		// 			if(humanlist.children[i].mixer._actions[0].isRunning()){
-		// 				humanlist.children[i].mixer.update( delta );
-		// 			}
-		// 		}
-		// 	}
-		// };
-		stationwebwork.onmessage = function (event) {
+					}
+				}
+			}
+		, 100);
+
+		passerWebWork.onmessage = function (event) {
 			if(aiswitch == 0){
 				// console.log(humanlist.children.length);
 				if(humanlist.children.length < 80){
@@ -851,23 +251,23 @@ export function Jl3dpassflow(dom,skinCode,routegroup,viewMap) {
 					//1--top
 					//2-- down
 					if(direct == 1){
-						newhumancreate(stationzon.getzoneposition("enter1"),0);
+						passerHuman.newHumanCreate(humanlist,passerZone.getzoneposition("enter1"),0);
 					}else{
-						newhumancreate(stationzon.getzoneposition("enter2"),0);
+						passerHuman.newHumanCreate(humanlist,passerZone.getzoneposition("enter2"),0);
 					}
-					if(toppasseron){
-						for(let i=0,leni=stationzon.list["standtop"].doorpoints.length;i<leni;i++ ){
+					if(passerAi.toppasseron){
+						for(let i=0,leni=passerZone.list["standtop"].doorpoints.length;i<leni;i++ ){
 							setTimeout(function(){
-								newhumancreate(stationzon.list["standtop"].doorpoints[i],5,"top",i);
+								passerHuman.newHumanCreate(humanlist,passerZone.list["standtop"].doorpoints[i],5,"top",i);
 							}, Math.random()*1000);
 
 						}
 					}
-					if(downpasseron){
+					if(passerAi.downpasseron){
 
-						for(let i=0,leni=stationzon.list["standdown"].doorpoints.length;i<leni;i++ ){
+						for(let i=0,leni=passerZone.list["standdown"].doorpoints.length;i<leni;i++ ){
 							setTimeout(function(){
-								newhumancreate(stationzon.list["standdown"].doorpoints[i],5,"down",i);
+								passerHuman.newHumanCreate(humanlist,passerZone.list["standdown"].doorpoints[i],5,"down",i);
 						 	}, Math.random()*1000);
 						}
 					}
@@ -879,866 +279,22 @@ export function Jl3dpassflow(dom,skinCode,routegroup,viewMap) {
 
 	//循环渲染函数
 	function animate() {
-		// console.log(rendermode);
-		if(rendermode == 4){
-			render4view();
-		}
-		if(rendermode == 2){
-			render2view();
-		}
-		// speciTest();
-		// else if(rendermode == 1){
-		// 	render4view();
-		// }
-		if(rendermode == 0){
-			renderer.render(scene, camerass);
-			scope.controls.update();
-		}
+		passerRender.update();
 
+		if(passerRender.state == "freeview"){
+			controls.update();
+		}
 		// delta = clock.getDelta();
-		// tick(delta);
 		requestAnimationFrame(animate);
 
 	}
 
-	function passerai(){
-			for(let i=0;i<humanlist.children.length;i++){
-				// console.log(humans[i]);
-
-				if(humanlist.children[i].status == 0){
-					//stage = 0 进入车站
-					if(humanlist.children[i].stage == 0){
-						let points = [];
-						points.push(new THREE.Vector3(humanlist.children[i].position.x,humanlist.children[i].position.y,humanlist.children[i].position.z));
-
-						groupID = pathfinder.getGroup( ZONE, 	points[0] );
-						targetPosition = stationzon.getzoneposition("security");
-						path = pathfinder.findPath( points[0], targetPosition, ZONE, groupID );
-
-						for(let i=0;i<path.length;i++){
-							points.push(new THREE.Vector3(path[i].x,path[i].y,path[i].z));
-						}
-						moveanimateinit(humanlist.children[i],i,points,i);
-						// console.log(path);
-					}
-
-					//stage = 1 前往进站闸机
-					if(humanlist.children[i].stage == 1){
-						let points = [];
-						points.push(new THREE.Vector3(humanlist.children[i].position.x,humanlist.children[i].position.y,humanlist.children[i].position.z));
-
-							groupID = pathfinder.getGroup( ZONE, 	points[0] );
-							targetPosition = stationzon.getgateposition("entergate");
-							path = pathfinder.findPath( points[0], targetPosition.point, ZONE, groupID );
-							humanlist.children[i].door = targetPosition.door;
-						for(let i=0;i<path.length;i++){
-								points.push(new THREE.Vector3(path[i].x,path[i].y,path[i].z));
-							}
-							moveanimateinit(humanlist.children[i],i,points,i);
-					}
-
-					//stage = 2 过闸机
-					if(humanlist.children[i].stage == 2){
-							let points = [];
-							points.push(new THREE.Vector3(humanlist.children[i].position.x,humanlist.children[i].position.y,humanlist.children[i].position.z));
-							points.push(new THREE.Vector3(humanlist.children[i].position.x,humanlist.children[i].position.y,humanlist.children[i].position.z-5));
-							zhajicontrol("in",humanlist.children[i].door);
-							moveanimateinit(humanlist.children[i],i,points,i);
-					}
-
-					//stage = 3 前往站台
-					if(humanlist.children[i].stage == 3){
-
-						let direct = Math.floor(Math.random()*(2))+1;
-						// console.log(direct);
-						let points = [];
-						points.push(new THREE.Vector3(humanlist.children[i].position.x,humanlist.children[i].position.y,humanlist.children[i].position.z));
-						// points.push(new THREE.Vector3(11.81,9.8,13.11));
-
-						//1--top
-						//2-- down
-						if(direct == 1){
-							groupID = pathfinder.getGroup( ZONE, 	points[0] );
-							targetPosition = stationzon.getstandposition("standtop");
-							path = pathfinder.findPath( points[0], targetPosition.point, ZONE, groupID );
-							humanlist.children[i].direct = "top";
-						}else{
-							groupID = pathfinder.getGroup( ZONE, 	points[0] );
-							targetPosition = stationzon.getstandposition("standdown");
-							path = pathfinder.findPath( points[0], targetPosition.point, ZONE, groupID );
-							humanlist.children[i].direct = "down";
-						}
-						if(path[0].y<9.84){
-							points.push(new THREE.Vector3(11.81,9.8,13.11));
-							points.push(new THREE.Vector3(29.5,1.77,13.16));
-
-						}
-						for(let i=0;i<path.length;i++){
-							points.push(new THREE.Vector3(path[i].x,path[i].y,path[i].z));
-						}
-						humanlist.children[i].door = targetPosition.door;
-						moveanimateinit(humanlist.children[i],i,points,i);
-					}
-
-					//stage = 4 上车
-					if(humanlist.children[i].stage == 4){
-						if(toppasserin && humanlist.children[i].direct == "top"){
-
-
-							let points = [];
-							points.push(new THREE.Vector3(humanlist.children[i].position.x,humanlist.children[i].position.y,humanlist.children[i].position.z));
-
-							points.push(stationzon.list["standtop"].doorpoints[humanlist.children[i].door]);
-
-							if(points[1] == undefined){
-
-							}else{
-								moveanimateinit(humanlist.children[i],i,points,i);
-							}
-						}
-
-
-
-						if(downpasserin && humanlist.children[i].direct == "down"){
-							let points = [];
-							points.push(new THREE.Vector3(humanlist.children[i].position.x,humanlist.children[i].position.y,humanlist.children[i].position.z));
-
-							points.push(stationzon.list["standdown"].doorpoints[humanlist.children[i].door]);
-
-							if(points[1] == undefined){
-
-							}else{
-								moveanimateinit(humanlist.children[i],i,points,i);
-							}
-							// console.log(points);
-						}
-
-					}
-
-					//stage = 5 下车
-					if(humanlist.children[i].stage == 5){
-						let points = [];
-						points.push(new THREE.Vector3(humanlist.children[i].position.x,humanlist.children[i].position.y,humanlist.children[i].position.z));
-						if(humanlist.children[i].direct == "top"){
-							points.push(new THREE.Vector3(humanlist.children[i].position.x,humanlist.children[i].position.y,humanlist.children[i].position.z+5));
-						}
-						if(humanlist.children[i].direct == "down"){
-							points.push(new THREE.Vector3(humanlist.children[i].position.x,humanlist.children[i].position.y,humanlist.children[i].position.z-5));
-						}
-						groupID = pathfinder.getGroup( ZONE, 	points[1] );
-						targetPosition = stationzon.getgateposition("exitgate");
-						path = pathfinder.findPath( points[1], targetPosition.point, ZONE, groupID );
-						humanlist.children[i].door = targetPosition.door;
-						for(let i=0;i<path.length;i++){
-							points.push(new THREE.Vector3(path[i].x,path[i].y,path[i].z));
-						}
-						moveanimateinit(humanlist.children[i],i,points,i);
-					}
-
-					//stage = 6 前往出站闸机
-					// if(humanlist.children[i].stage == 6){
-					// 	let points = [];
-					// 	points.push(new THREE.Vector3(humanlist.children[i].position.x,humanlist.children[i].position.y,humanlist.children[i].position.z));
-					//
-					// 		groupID = pathfinder.getGroup( ZONE, 	points[0] );
-					// 		targetPosition = stationzon.getgateposition("exitgate");
-					// 		path = pathfinder.findPath( points[0], targetPosition, ZONE, groupID );
-					//
-					// 		for(let i=0;i<path.length;i++){
-					// 			points.push(new THREE.Vector3(path[i].x,path[i].y,path[i].z));
-					// 		}
-					// 		moveanimateinit(humanlist.children[i],i,points,i);
-					// }
-
-					//stage = 7 出闸机
-					if(humanlist.children[i].stage == 7){
-							let points = [];
-							points.push(new THREE.Vector3(humanlist.children[i].position.x,humanlist.children[i].position.y,humanlist.children[i].position.z));
-							points.push(new THREE.Vector3(humanlist.children[i].position.x+5,humanlist.children[i].position.y,humanlist.children[i].position.z));
-							zhajicontrol("out",humanlist.children[i].door);
-							moveanimateinit(humanlist.children[i],i,points,i);
-					}
-
-					//stage = 8 出站
-					if(humanlist.children[i].stage == 8){
-						let direct = Math.floor(Math.random()*(3-1+1))+1;
-						let points = [];
-						points.push(new THREE.Vector3(humanlist.children[i].position.x,humanlist.children[i].position.y,humanlist.children[i].position.z));
-
-						//1--top
-						//2-- down
-						if(direct == 1){
-							groupID = pathfinder.getGroup( ZONE, 	points[0] );
-							targetPosition = stationzon.getzoneposition("exit1");
-							path = pathfinder.findPath( points[0], targetPosition, ZONE, groupID );
-						}else{
-							groupID = pathfinder.getGroup( ZONE, 	points[0] );
-							targetPosition = stationzon.getzoneposition("exit2");
-							path = pathfinder.findPath( points[0], targetPosition, ZONE, groupID );
-						}
-
-						for(let i=0;i<path.length;i++){
-							points.push(new THREE.Vector3(path[i].x,path[i].y,path[i].z));
-						}
-						moveanimateinit(humanlist.children[i],i,points,i);
-
-					}
-				}
-			}
-
+	window.onresize = function () {
+		passerRender.reSize(scope.dom.offsetWidth,scope.dom.offsetHeight);
 	}
 
-	function moveanimateinit(model,name,points,index){
-		model.status = 1;
-    let curve =  new THREE.CatmullRomCurve3(points);
-    curve.curvrtype = "catmullrom";
-		// curve.getLength();
-    // curve动画轨迹
-    // progress动画进度
-    // enable当前动画开关
-    // speed动画速度
-		// console.log(curve);
-
-    model.action.play();
-		model.progress = 0;
-		model.runrail = curve;
-		model.speed = 0.2/curve.getLength();
-  }
-
-	function moveanimateupdate(){
-		for(let i=0;i<humanlist.children.length;i++){
-			if(humanlist.children[i].status == 1){
-				if(humanlist.children[i].progress>=1){
-					//更新模型坐标
-					if(humanlist.children[i].status == 1){
-
-
-						humanlist.children[i].progress = 1;
-						humanlist.children[i].action.stop();
-						humanlist.children[i].status = 0;
-
-						if(humanlist.children[i].stage == 8){
-							scope.uncache(humanlist.children[i]);
-							humanlist.remove(humanlist.children[i]);
-							i--;
-						}else if(humanlist.children[i].stage == 7){
-							humanlist.children[i].stage = 8;
-						}
-						// else if(humanlist.children[i].stage == 6){
-						//
-						// 	humanlist.children[i].stage = 7;
-						//
-						// }
-						else if(humanlist.children[i].stage == 5){
-
-							humanlist.children[i].stage = 7;
-
-						}else if(humanlist.children[i].stage == 4){
-							scope.uncache(humanlist.children[i]);
-							humanlist.remove(humanlist.children[i]);
-							i--;
-						}else if(humanlist.children[i].stage == 3){
-
-							humanlist.children[i].stage = 4;
-							if(olddataai){
-								humanlist.children[i].stage = 5;
-							}
-
-						}else if(humanlist.children[i].stage == 2){
-							humanlist.children[i].stage = 3;
-
-						}else if(humanlist.children[i].stage == 1){
-
-
-							humanlist.children[i].stage = 2;
-
-						}else if(humanlist.children[i].stage == 0){
-							// // console.log(humans[i].doors);
-							// zhajiin[humanlist.children[i].doors].waiting = 0;
-							humanlist.children[i].stage = 1;
-						}
-
-					}
-
-				}else{
-		//根据动画进度获取动画轨迹上点
-					// console.log(i);
-					// console.log(humanlist.children[i].runrail);
-					// console.log(humanlist.children[i].progress);
-					let point = humanlist.children[i].runrail.getPointAt(humanlist.children[i].progress);
-
-					//更新模型坐标
-					humanlist.children[i].position.x = point.x;
-					humanlist.children[i].position.y = point.y;
-					humanlist.children[i].position.z = point.z;
-					if((humanlist.children[i].progress+0.001)<1){
-						let tangent = humanlist.children[i].runrail.getPointAt(humanlist.children[i].progress+0.001);
-						humanlist.children[i].lookAt(new THREE.Vector3(tangent.x,humanlist.children[i].position.y,tangent.z));
-					}
-
-					humanlist.children[i].progress += humanlist.children[i].speed;
-					point = null;
-
-				}
-			}
-		}
+	this.switchviews = function(viewmode){
+		passerRender.changeRenderMode(viewmode);
 	}
 
-	function newhumancreate(position,stage,direct,door){
-			let mantype = Math.floor(Math.random()*(3-1+1))+1;
-			let newhuman;
-			if(mantype == 1){
-				newhuman = THREE.SkeletonUtils.clone( originhuman1 );
-				newhuman.animations = [];
-				newhuman.animations.push(originanima1.clone());
-			}else{
-				newhuman = THREE.SkeletonUtils.clone( originhuman2 );
-				newhuman.animations = [];
-				newhuman.animations.push(originanima2.clone());
-			}
-
-			let mixer = new THREE.AnimationMixer( newhuman );
-			newhuman.position.copy(position);
-			newhuman.status = 0;
-
-			newhuman.stage = stage;
-			if(direct){
-				if(direct == "top"){
-					newhuman.rotation.y = Math.PI;
-				}
-				newhuman.direct = direct;
-			}else{
-				newhuman.direct = null;
-			}
-
-			newhuman.doorstatus = null;
-			if(door){
-				newhuman.door = door;
-			}else{
-				newhuman.door = null;
-			}
-
-			newhuman.action = mixer.clipAction( newhuman.animations[ 0 ] );
-			newhuman.mixer = mixer;
-			newhuman.runrail = null;
-			newhuman.speed = 0;
-			newhuman.mixer = mixer;
-			humanlist.add(newhuman);
-			// console.log(humanlist.children.length);
-		}
-		function initstationlist(stationdata,standdata,psddata){
-
-			let list = [];
-			if(psddata){
-				for(let i=0,leni = standdata.length;i<leni;i++){
-					for(let j=0,lenj = psddata.length;j<lenj;j++){
-						if(standdata[i].code == psddata[j].standCode){
-							standdata[i].name = psddata[j].code;
-						}
-					}
-				}
-				for(let i=0,leni = stationdata.length;i<leni;i++){
-					if(stationdata[i].depot == false){
-						list[stationdata[i].name] = [];
-						for(let j=0,lenj = standdata.length;j<lenj;j++){
-							if(standdata[j].stationCode == stationdata[i].code){
-								list[stationdata[i].name].push(standdata[j]);
-							}
-						}
-					}
-				}
-				for(let k in list){
-					if(list[k].length>0){
-						let stationobject = {
-							code : list[k][0].stationCode,
-							name : k,
-							toppsd:null,
-							downpsd:null,
-							topsection:null,
-							downsection:null,
-						};
-						if(list[k][0].position.y<list[k][1].position.y){
-							stationobject.toppsd = list[k][0].name;
-							stationobject.downpsd = list[k][1].name;
-							stationobject.topsection = list[k][0].standTrackCode;
-							stationobject.downsection = list[k][1].standTrackCode;
-						}else{
-							stationobject.toppsd = list[k][1].name;
-							stationobject.downpsd = list[k][0].name;
-							stationobject.topsection = list[k][1].standTrackCode;
-							stationobject.downsection = list[k][0].standTrackCode;
-						}
-						stationlist.push(stationobject);
-					}
-
-				}
-
-				scope.nowstation = stationlist[0];
-				if(scope.stationtexture["stationlist"]){
-					scope.modelmanager.station.mesh.getObjectByName("zhantailiebiao").material.map =scope.stationtexture["stationlist"];
-					scope.modelmanager.station.mesh.getObjectByName("zhantailiebiao").material.map.needsUpdate = true;
-					if(scope.modelmanager.station.mesh.getObjectByName("menkuangyanse")){
-						scope.modelmanager.station.mesh.getObjectByName("menkuangyanse").material.map =scope.stationtexture["pingbimen"];
-						scope.modelmanager.station.mesh.getObjectByName("menkuangyanse").material.map.needsUpdate = true;
-					}
-					scope.modelmanager.station.mesh.getObjectByName("zhantaiming").material.map = scope.stationtexture[scope.nowstation.code];
-					scope.modelmanager.station.mesh.getObjectByName("zhantaiming").material.map.needsUpdate = true;
-
-				}
-
-				updatestationlist(stationlist);
-			}else{
-				olddataai = true;
-			}
-
-
-
-
-			// console.log(scope.nowstation);
-		}
-		function inittrain(object){
-			let ntracks1,ntracks2,tclip,fclip;
-
-      ntracks1 = object.animations.slice(16,27);
-
-      tclip = new THREE.AnimationClip("three",2,ntracks1);
-
-      ntracks2 = object.animations.slice(0,15);
-
-      fclip = new THREE.AnimationClip("four",2,ntracks2);
-
-			object.traverse( function ( child ) {
-
-				if ( child.isMesh ) {
-					child.renderOrder = 8;
-				}
-
-			} );
-
-
-      toptrain = object.clone(true);
-			toptrain.nowcode = null;
-			toptrain.action = {
-        top:[],
-        down:[]
-      };
-			let points1 = [];
-			points1.push(new THREE.Vector3(-71,0.06,-6.3));
-			points1.push(new THREE.Vector3(60.73,0.06,-6.3));
-
-
-			toptrain.curve = new THREE.CatmullRomCurve3(points1);
-
-			downtrain = object.clone(true);
-			downtrain.nowcode = null;
-			downtrain.action = {
-        top:[],
-        down:[]
-      };
-			let points2 = [];
-			points2.push(new THREE.Vector3(-71,0.06,28.68));
-			points2.push(new THREE.Vector3(60.73,0.06,28.68));
-			downtrain.curve = new THREE.CatmullRomCurve3(points2);
-
-
-			inittrainanimation(toptrain,tclip,fclip);
-			inittrainanimation(downtrain,tclip,fclip);
-
-
-			toptrain.position.z = -20;
-			toptrain.position.y = -20000;
-			toptrain.rotation.y = Math.PI;
-			downtrain.position.z = 40;
-			downtrain.position.y = -20000;
-			scene.add(toptrain);
-			scene.add(downtrain);
-		}
-
-		function inittrainanimation(train,tclip,fclip){
-			for(let j=0;j<train.children.length;j++){
-        if(train.children[j].name == "c1" || train.children[j].name == "c6"){
-           for(let n=0,lenn = train.children[j].children.length;n<lenn;n++){
-             if(train.children[j].children[n].name == "top"){
-               train.children[j].children[n].animations = [];
-               train.children[j].children[n].animations.push(tclip.clone());
-               let mixer = new THREE.AnimationMixer(  train.children[j].children[n] );
-               mixers.push(mixer);
-               let action = mixer.clipAction( train.children[j].children[n].animations[ 0 ] );
-               action.setLoop(THREE.LoopOnce);
-               action.clampWhenFinished = true;
-               train.action.top.push(action);
-               mixers.push(mixer);
-             }
-             if(train.children[j].children[n].name == "down"){
-               train.children[j].children[n].animations = [];
-               train.children[j].children[n].animations.push(tclip.clone());
-               let mixer = new THREE.AnimationMixer(  train.children[j].children[n] );
- 						 	 mixers.push(mixer);
-               let action = mixer.clipAction( train.children[j].children[n].animations[ 0 ] );
-               action.setLoop(THREE.LoopOnce);
-               action.clampWhenFinished = true;
-               train.action.down.push(action);
-               mixers.push(mixer);
-             }
-           }
-         }else{
-           for(let n=0,lenn = train.children[j].children.length;n<lenn;n++){
-               if(train.children[j].children[n].name == "top"){
-                 train.children[j].children[n].animations = [];
-                 train.children[j].children[n].animations.push(fclip.clone());
-                 let mixer = new THREE.AnimationMixer(  train.children[j].children[n] );
-                 mixers.push(mixer);
-                 let action = mixer.clipAction( train.children[j].children[n].animations[ 0 ] );
-                 action.setLoop(THREE.LoopOnce);
-                 action.clampWhenFinished = true;
-                 train.action.top.push(action);
-                 mixers.push(mixer);
-               }
-               if(train.children[j].children[n].name == "down"){
-                 train.children[j].children[n].animations = [];
-                 train.children[j].children[n].animations.push(fclip.clone());
-                 let mixer = new THREE.AnimationMixer(  train.children[j].children[n] );
-                 mixers.push(mixer);
-                 let action = mixer.clipAction( train.children[j].children[n].animations[ 0 ] );
-                 action.setLoop(THREE.LoopOnce);
-                 action.clampWhenFinished = true;
-                 train.action.down.push(action);
-                 mixers.push(mixer);
-               }
-           }
-         }
-      }
-		}
-		function initstationanimation(object){
-			let mixer = new THREE.AnimationMixer( object );
-
-			let newclip = object.animations[ 0 ];
-			for(let j=0;j<object.children.length;j++){
-
-				if(object.children[j].name == "top"){
-					// let geometry = new THREE.BoxBufferGeometry( 50, 50, 50 );
-					// let material = new THREE.MeshBasicMaterial( {color: 0x00ff00} );
-					// let cube = new THREE.Mesh( geometry, material );
-					// cube.position.copy(object.children[j].position);
-					// scene.add( cube );
-					object.children[j].animations = [];
-					object.children[j].animations.push(newclip.clone());
-
-					let mixer = new THREE.AnimationMixer(  object.children[j] );
-
-					let action =mixer.clipAction( object.children[j].animations[0])
-					action.setLoop(THREE.LoopOnce);
-					action.clampWhenFinished = true;
-					// action.play();
-
-					mixers.push(mixer);
-					let device = {
-						action:action,
-						mixer:mixer,
-					};
-					deviceaction[object.children[j].name] = device;
-				}
-				if(object.children[j].name == "down"){
-					object.children[j].animations = [];
-					object.children[j].animations.push(newclip.clone());
-
-					let mixer = new THREE.AnimationMixer( object.children[j] );
-
-
-					let action =mixer.clipAction( object.children[j].animations[0])
-					// action.play();
-					action.setLoop(THREE.LoopOnce);
-					action.clampWhenFinished = true;
-
-					mixers.push(mixer);
-					let device = {
-						action:action,
-						mixer:mixer,
-					};
-					deviceaction[object.children[j].name] = device;
-				}
-      }
-			station = object;
-			object.traverse( function ( child ) {
-
-				if ( child.isMesh ) {
-					child.renderOrder = 9;
-				}
-
-			} );
-			// console.log(deviceaction);
-	    scene.add(object);
-
-		}
-
-		function initzhajiinaimation(object){
-			let mixer = new THREE.AnimationMixer(  object );
-			let newclip = object.animations[ 0 ];
-			let newzhaji = object;
-			for(let i=0;i<newzhaji.children.length;i++){
-				if(newzhaji.children[i].name == "in01"){
-					newzhaji.children[i].animations = [];
-					newzhaji.children[i].animations.push(newclip.clone());
-
-					let mixer = new THREE.AnimationMixer(  newzhaji.children[i] );
-
-					let action =mixer.clipAction( newzhaji.children[i].animations[0]);
-					action.setLoop(THREE.LoopOnce);
-					action.clampWhenFinished = true;
-
-					mixers.push(mixer);
-					let device = {
-						action:action,
-						mixer:mixer,
-					};
-					deviceaction[object.children[i].name] = device;
-				}
-				if(newzhaji.children[i].name == "in02"){
-					newzhaji.children[i].animations = [];
-					newzhaji.children[i].animations.push(newclip.clone());
-
-					let mixer = new THREE.AnimationMixer(  newzhaji.children[i] );
-
-					let action =mixer.clipAction( newzhaji.children[i].animations[0]);
-					action.setLoop(THREE.LoopOnce);
-					action.clampWhenFinished = true;
-
-					mixers.push(mixer);
-					let device = {
-						action:action,
-						mixer:mixer,
-					};
-					deviceaction[object.children[i].name] = device;
-				}
-				if(newzhaji.children[i].name == "in03"){
-					newzhaji.children[i].animations = [];
-					newzhaji.children[i].animations.push(newclip.clone());
-
-					let mixer = new THREE.AnimationMixer(  newzhaji.children[i] );
-
-					let action =mixer.clipAction( newzhaji.children[i].animations[0]);
-					action.setLoop(THREE.LoopOnce);
-					action.clampWhenFinished = true;
-
-					mixers.push(mixer);
-					let device = {
-						action:action,
-						mixer:mixer,
-					};
-					deviceaction[object.children[i].name] = device;
-				}
-				if(newzhaji.children[i].name == "in04"){
-					newzhaji.children[i].animations = [];
-					newzhaji.children[i].animations.push(newclip.clone());
-
-					let mixer = new THREE.AnimationMixer(  newzhaji.children[i] );
-
-					let action =mixer.clipAction( newzhaji.children[i].animations[0]);
-					action.setLoop(THREE.LoopOnce);
-					action.clampWhenFinished = true;
-
-					mixers.push(mixer);
-					let device = {
-						action:action,
-						mixer:mixer,
-					};
-					deviceaction[object.children[i].name] = device;
-				}
-				if(newzhaji.children[i].name == "in05"){
-					newzhaji.children[i].animations = [];
-					newzhaji.children[i].animations.push(newclip.clone());
-
-					let mixer = new THREE.AnimationMixer(  newzhaji.children[i] );
-
-					let action =mixer.clipAction( newzhaji.children[i].animations[0]);
-					action.setLoop(THREE.LoopOnce);
-					action.clampWhenFinished = true;
-
-					mixers.push(mixer);
-					let device = {
-						action:action,
-						mixer:mixer,
-					};
-					deviceaction[object.children[i].name] = device;
-				}
-
-			}
-			zhajiinmodel = newzhaji;
-    	scene.add(newzhaji);
-
-		}
-
-		function initzhajioutanimation(object){
-			let mixer = new THREE.AnimationMixer(  object );
-			let newclip = object.animations[ 0 ];
-			let newzhaji = object;
-			for(let i=0;i<newzhaji.children.length;i++){
-
-				if(newzhaji.children[i].name == "out01"){
-					newzhaji.children[i].animations = [];
-					newzhaji.children[i].animations.push(newclip.clone());
-
-					let mixer = new THREE.AnimationMixer(  newzhaji.children[i] );
-
-					let action =mixer.clipAction( newzhaji.children[i].animations[0]);
-					action.setLoop(THREE.LoopOnce);
-					action.clampWhenFinished = true;
-
-					mixers.push(mixer);
-					let device = {
-						action:action,
-						mixer:mixer,
-					};
-					deviceaction[object.children[i].name] = device;
-				}
-				if(newzhaji.children[i].name == "out02"){
-					newzhaji.children[i].animations = [];
-					newzhaji.children[i].animations.push(newclip.clone());
-
-					let mixer = new THREE.AnimationMixer(  newzhaji.children[i] );
-
-					let action =mixer.clipAction( newzhaji.children[i].animations[0]);
-					action.setLoop(THREE.LoopOnce);
-					action.clampWhenFinished = true;
-
-					mixers.push(mixer);
-					let device = {
-						action:action,
-						mixer:mixer,
-					};
-					deviceaction[object.children[i].name] = device;
-				}
-				if(newzhaji.children[i].name == "out03"){
-					newzhaji.children[i].animations = [];
-					newzhaji.children[i].animations.push(newclip.clone());
-
-					let mixer = new THREE.AnimationMixer(  newzhaji.children[i] );
-
-					let action =mixer.clipAction( newzhaji.children[i].animations[0]);
-					action.setLoop(THREE.LoopOnce);
-					action.clampWhenFinished = true;
-
-					mixers.push(mixer);
-					let device = {
-						action:action,
-						mixer:mixer,
-					};
-					deviceaction[object.children[i].name] = device;
-				}
-				if(newzhaji.children[i].name == "out04"){
-					newzhaji.children[i].animations = [];
-					newzhaji.children[i].animations.push(newclip.clone());
-
-					let mixer = new THREE.AnimationMixer(  newzhaji.children[i] );
-
-					let action =mixer.clipAction( newzhaji.children[i].animations[0]);
-					action.setLoop(THREE.LoopOnce);
-					action.clampWhenFinished = true;
-
-					mixers.push(mixer);
-					let device = {
-						action:action,
-						mixer:mixer,
-					};
-					deviceaction[object.children[i].name] = device;
-				}
-				if(newzhaji.children[i].name == "out05"){
-					newzhaji.children[i].animations = [];
-					newzhaji.children[i].animations.push(newclip.clone());
-
-					let mixer = new THREE.AnimationMixer(  newzhaji.children[i] );
-
-					let action =mixer.clipAction( newzhaji.children[i].animations[0]);
-					action.setLoop(THREE.LoopOnce);
-					action.clampWhenFinished = true;
-
-					mixers.push(mixer);
-					let device = {
-						action:action,
-						mixer:mixer,
-					};
-					deviceaction[object.children[i].name] = device;
-				}
-
-			}
-			zhajioutmodel = newzhaji
-    	scene.add(newzhaji);
-		}
-
-		function zhajicontrol(type,door){
-			// console.log(door);
-			// console.log(zhajiin);
-
-			let devicenum = door;
-			if(type == "in"){
-				deviceaction[zhajiin[devicenum].id].action.reset();
-				deviceaction[zhajiin[devicenum].id].action.time = 0;
-				deviceaction[zhajiin[devicenum].id].action.timeScale = 1;
-				deviceaction[zhajiin[devicenum].id].action.play();
-			}else if(type == "out"){
-				deviceaction[zhajiout[devicenum].id].action.reset();
-				deviceaction[zhajiout[devicenum].id].action.time = 0;
-				deviceaction[zhajiout[devicenum].id].action.timeScale = 1;
-				deviceaction[zhajiout[devicenum].id].action.play();
-			}
-
-		}
-
-		let specilView,specilCamera,specilLeft,specilBottom,specilWidth,specilHeight;
-		function render4view() {
-
-			// updateSize();
-			for ( let ii = 0; ii < 4; ii ++ ) {
-
-				specilView = views4[ ii ];
-				specilCamera = specilView.camera;
-
-				// view.updateCamera( camera, scene, mouseX, mouseY );
-
-				specilLeft = Math.floor( windowWidth * specilView.left );
-				specilBottom = Math.floor( windowHeight * specilView.bottom );
-				specilWidth = Math.floor( windowWidth * specilView.width );
-				specilHeight = Math.floor( windowHeight * specilView.height );
-
-				renderer.setViewport( specilLeft,specilBottom,specilWidth,specilHeight );
-				renderer.setScissor( specilLeft,specilBottom,specilWidth,specilHeight );
-				renderer.setScissorTest( true );
-
-				specilCamera.aspect = specilWidth / specilHeight;
-				specilCamera.updateProjectionMatrix();
-
-				renderer.render( scene, specilCamera );
-
-			}
-		}
-
-		function render2view() {
-
-			// updateSize();
-
-			for ( let ii = 0; ii < 2; ii ++ ) {
-
-				specilView = views2[ ii ];
-				specilCamera = specilView.camera;
-
-				// view.updateCamera( camera, scene, mouseX, mouseY );
-
-				specilLeft = Math.floor( windowWidth * specilView.left );
-				specilBottom = Math.floor( windowHeight * specilView.bottom );
-				specilWidth = Math.floor( windowWidth * specilView.width );
-				specilHeight = Math.floor( windowHeight * specilView.height );
-
-				renderer.setViewport( specilLeft,specilBottom,specilWidth,specilHeight );
-				renderer.setScissor( specilLeft,specilBottom,specilWidth,specilHeight );
-				renderer.setScissorTest( true );
-
-				specilCamera.aspect = specilWidth / specilHeight;
-				specilCamera.updateProjectionMatrix();
-
-				renderer.render( scene, specilCamera );
-
-			}
-
-		}
-
 }
diff --git a/src/jlmap3d/jl3dpassflow/loader.js b/src/jlmap3d/jl3dpassflow/loader.js
index b06796566..f1f58b5d5 100644
--- a/src/jlmap3d/jl3dpassflow/loader.js
+++ b/src/jlmap3d/jl3dpassflow/loader.js
@@ -1,5 +1,5 @@
 import { BASE_ASSET_API } from '@/api/jlmap3d/assets3d.js';
-
+//模型管理器
 export function ModelManager(){
   let scope = this;
 
@@ -65,7 +65,7 @@ export function ModelManager(){
     action:null
   };
 
-
+  //读取模型
   this.loadpromise = function (data,mixers){
     let initlist = [];
     for(let i=0,leni=data.length;i<leni;i++){
@@ -95,7 +95,7 @@ export function ModelManager(){
         initlist.push(fbxpromise(data[i],mixers,scope.section));
       }
     }
-
+    //promise按顺序加载
     return new Promise(function(resolve, reject){
 
       Promise.all(initlist).then((result) => {
@@ -108,18 +108,13 @@ export function ModelManager(){
   }
 
 }
-
+//fbx模型加载
 function fbxpromise(asset,mixers,model){
   return new Promise(function(resolve, reject){
     var loader = new THREE.FBXLoader();
     loader.load( BASE_ASSET_API+asset.url, function ( object ) {
-      // let mixer = new THREE.AnimationMixer( object );
-      // object.traverse( function ( child ) {
-      // 	if ( child.isMesh ) {
-      // 		child.castShadow = true;
-      // 		child.receiveShadow = true;
-      // 	}
-      // } );
+
+      //列车模型子物体重新排序
       if(asset.type == "cctvTrain"){
         // let mixer = new THREE.AnimationMixer( object );
         let realtrain = new THREE.Group();
diff --git a/src/jlmap3d/jl3dpassflow/model/passercheckdoor.js b/src/jlmap3d/jl3dpassflow/model/passercheckdoor.js
new file mode 100644
index 000000000..9f87578d3
--- /dev/null
+++ b/src/jlmap3d/jl3dpassflow/model/passercheckdoor.js
@@ -0,0 +1,230 @@
+export function  PasserCheckDoor(data) {
+	var scope = this;
+	//入口闸机组
+	this.zhajiin = [];
+	//出口闸机组
+	this.zhajiout = [];
+	//定义闸机状态
+	for(let i=0;i<5;i++){
+		let zhaji = {
+			id:"in0"+(i+1),
+			status:0,
+			waiting:0
+		}
+		scope.zhajiin.push(zhaji);
+	}
+	for(let i=0;i<5;i++){
+		let zhaji = {
+			id:"out0"+(i+1),
+			status:0,
+			waiting:0
+		}
+		scope.zhajiout.push(zhaji);
+	}
+	//初始化闸机动画
+	this.initCheckDoorInAnimation = function(object,mixers ,deviceaction ,scene){
+		let mixer = new THREE.AnimationMixer(  object );
+		let newclip = object.animations[ 0 ];
+		let newzhaji = object;
+		for(let i=0;i<newzhaji.children.length;i++){
+			if(newzhaji.children[i].name == "in01"){
+				newzhaji.children[i].animations = [];
+				newzhaji.children[i].animations.push(newclip.clone());
+
+				let mixer = new THREE.AnimationMixer(  newzhaji.children[i] );
+
+				let action =mixer.clipAction( newzhaji.children[i].animations[0]);
+				action.setLoop(THREE.LoopOnce);
+				action.clampWhenFinished = true;
+
+				mixers.push(mixer);
+				let device = {
+					action:action,
+					mixer:mixer,
+				};
+				deviceaction[object.children[i].name] = device;
+			}
+			if(newzhaji.children[i].name == "in02"){
+				newzhaji.children[i].animations = [];
+				newzhaji.children[i].animations.push(newclip.clone());
+
+				let mixer = new THREE.AnimationMixer(  newzhaji.children[i] );
+
+				let action =mixer.clipAction( newzhaji.children[i].animations[0]);
+				action.setLoop(THREE.LoopOnce);
+				action.clampWhenFinished = true;
+
+				mixers.push(mixer);
+				let device = {
+					action:action,
+					mixer:mixer,
+				};
+				deviceaction[object.children[i].name] = device;
+			}
+			if(newzhaji.children[i].name == "in03"){
+				newzhaji.children[i].animations = [];
+				newzhaji.children[i].animations.push(newclip.clone());
+
+				let mixer = new THREE.AnimationMixer(  newzhaji.children[i] );
+
+				let action =mixer.clipAction( newzhaji.children[i].animations[0]);
+				action.setLoop(THREE.LoopOnce);
+				action.clampWhenFinished = true;
+
+				mixers.push(mixer);
+				let device = {
+					action:action,
+					mixer:mixer,
+				};
+				deviceaction[object.children[i].name] = device;
+			}
+			if(newzhaji.children[i].name == "in04"){
+				newzhaji.children[i].animations = [];
+				newzhaji.children[i].animations.push(newclip.clone());
+
+				let mixer = new THREE.AnimationMixer(  newzhaji.children[i] );
+
+				let action =mixer.clipAction( newzhaji.children[i].animations[0]);
+				action.setLoop(THREE.LoopOnce);
+				action.clampWhenFinished = true;
+
+				mixers.push(mixer);
+				let device = {
+					action:action,
+					mixer:mixer,
+				};
+				deviceaction[object.children[i].name] = device;
+			}
+			if(newzhaji.children[i].name == "in05"){
+				newzhaji.children[i].animations = [];
+				newzhaji.children[i].animations.push(newclip.clone());
+
+				let mixer = new THREE.AnimationMixer(  newzhaji.children[i] );
+
+				let action =mixer.clipAction( newzhaji.children[i].animations[0]);
+				action.setLoop(THREE.LoopOnce);
+				action.clampWhenFinished = true;
+
+				mixers.push(mixer);
+				let device = {
+					action:action,
+					mixer:mixer,
+				};
+				deviceaction[object.children[i].name] = device;
+			}
+
+		}
+		scene.add(newzhaji);
+
+	}
+	//初始化闸机动画
+	this.initCheckDoorOutAnimation = function(object,mixers ,deviceaction ,scene){
+		let mixer = new THREE.AnimationMixer(  object );
+		let newclip = object.animations[ 0 ];
+		let newzhaji = object;
+		for(let i=0;i<newzhaji.children.length;i++){
+			if(newzhaji.children[i].name == "out01"){
+				newzhaji.children[i].animations = [];
+				newzhaji.children[i].animations.push(newclip.clone());
+				let mixer = new THREE.AnimationMixer(  newzhaji.children[i] );
+				let action =mixer.clipAction( newzhaji.children[i].animations[0]);
+				action.setLoop(THREE.LoopOnce);
+				action.clampWhenFinished = true;
+				mixers.push(mixer);
+				let device = {
+					action:action,
+					mixer:mixer,
+				};
+				deviceaction[object.children[i].name] = device;
+			}
+			if(newzhaji.children[i].name == "out02"){
+				newzhaji.children[i].animations = [];
+				newzhaji.children[i].animations.push(newclip.clone());
+
+				let mixer = new THREE.AnimationMixer(  newzhaji.children[i] );
+
+				let action =mixer.clipAction( newzhaji.children[i].animations[0]);
+				action.setLoop(THREE.LoopOnce);
+				action.clampWhenFinished = true;
+
+				mixers.push(mixer);
+				let device = {
+					action:action,
+					mixer:mixer,
+				};
+				deviceaction[object.children[i].name] = device;
+			}
+			if(newzhaji.children[i].name == "out03"){
+				newzhaji.children[i].animations = [];
+				newzhaji.children[i].animations.push(newclip.clone());
+
+				let mixer = new THREE.AnimationMixer(  newzhaji.children[i] );
+
+				let action =mixer.clipAction( newzhaji.children[i].animations[0]);
+				action.setLoop(THREE.LoopOnce);
+				action.clampWhenFinished = true;
+
+				mixers.push(mixer);
+				let device = {
+					action:action,
+					mixer:mixer,
+				};
+				deviceaction[object.children[i].name] = device;
+			}
+			if(newzhaji.children[i].name == "out04"){
+				newzhaji.children[i].animations = [];
+				newzhaji.children[i].animations.push(newclip.clone());
+
+				let mixer = new THREE.AnimationMixer(  newzhaji.children[i] );
+
+				let action =mixer.clipAction( newzhaji.children[i].animations[0]);
+				action.setLoop(THREE.LoopOnce);
+				action.clampWhenFinished = true;
+
+				mixers.push(mixer);
+				let device = {
+					action:action,
+					mixer:mixer,
+				};
+				deviceaction[object.children[i].name] = device;
+			}
+			if(newzhaji.children[i].name == "out05"){
+				newzhaji.children[i].animations = [];
+				newzhaji.children[i].animations.push(newclip.clone());
+
+				let mixer = new THREE.AnimationMixer(  newzhaji.children[i] );
+
+				let action =mixer.clipAction( newzhaji.children[i].animations[0]);
+				action.setLoop(THREE.LoopOnce);
+				action.clampWhenFinished = true;
+
+				mixers.push(mixer);
+				let device = {
+					action:action,
+					mixer:mixer,
+				};
+				deviceaction[object.children[i].name] = device;
+			}
+
+		}
+		scene.add(newzhaji);
+	}
+	//闸机动画控制
+	this.checkDoorControl = function(type,door,deviceaction){
+		let devicenum = door;
+
+		if(type == "in"){
+			let checkDoorId = scope.zhajiin[devicenum].id;
+			deviceaction[checkDoorId].action.reset();
+			deviceaction[checkDoorId].action.time = 0;
+			deviceaction[checkDoorId].action.timeScale = 1;
+			deviceaction[checkDoorId].action.play();
+		}else if(type == "out"){
+			let checkDoorId = scope.zhajiout[devicenum].id;
+			deviceaction[checkDoorId].action.reset();
+			deviceaction[checkDoorId].action.time = 0;
+			deviceaction[checkDoorId].action.timeScale = 1;
+			deviceaction[checkDoorId].action.play();
+		}
+	}
+}
diff --git a/src/jlmap3d/jl3dpassflow/model/passerhuman.js b/src/jlmap3d/jl3dpassflow/model/passerhuman.js
new file mode 100644
index 000000000..ee7369d80
--- /dev/null
+++ b/src/jlmap3d/jl3dpassflow/model/passerhuman.js
@@ -0,0 +1,174 @@
+export function  PasserHuman() {
+  let scope = this;
+
+  //初始人物模型和动画
+  let originhuman1 = null;
+  let originhuman2 = null;
+  let originanima1 = null;
+  let originanima2 = null;
+  //初始化人物模型动画
+  this.initHumans = function(object1,object2,mixers,deviceaction,scene){
+    originhuman1 = object1;
+    originhuman1.progress = 1;
+    // scene.add(originhuman1);
+    originhuman2 =  object2;
+
+    let mixer1 = new THREE.AnimationMixer( originhuman1 );
+    let mixer2 = new THREE.AnimationMixer( originhuman2 );
+    originanima1 = originhuman1.animations[ 0 ];
+    originanima2 = originhuman2.animations[ 0 ];
+    originhuman1.remove(originhuman1.children[2]);
+
+  }
+  //创建新的乘客
+  this.newHumanCreate = function(humanlist,position,stage,direct,door){
+    let mantype = Math.floor(Math.random()*(3-1+1))+1;
+    let newhuman;
+    if(mantype == 1){
+      newhuman = THREE.SkeletonUtils.clone( originhuman1 );
+      newhuman.animations = [];
+      newhuman.animations.push(originanima1.clone());
+    }else{
+      newhuman = THREE.SkeletonUtils.clone( originhuman2 );
+      newhuman.animations = [];
+      newhuman.animations.push(originanima2.clone());
+    }
+
+    let mixer = new THREE.AnimationMixer( newhuman );
+    newhuman.position.copy(position);
+    newhuman.status = 0;
+
+    newhuman.stage = stage;
+    if(direct){
+      if(direct == "top"){
+        newhuman.rotation.y = Math.PI;
+      }
+      newhuman.direct = direct;
+    }else{
+      newhuman.direct = null;
+    }
+
+    newhuman.doorstatus = null;
+    if(door){
+      newhuman.door = door;
+    }else{
+      newhuman.door = null;
+    }
+
+    newhuman.action = mixer.clipAction( newhuman.animations[ 0 ] );
+    newhuman.mixer = mixer;
+    newhuman.runrail = null;
+    newhuman.speed = 0;
+    newhuman.mixer = mixer;
+    humanlist.add(newhuman);
+    // console.log(humanlist.children.length);
+  }
+  //定义新模型走路动画
+  this.initMoveAnimate = function(model,name,points,index){
+    model.status = 1;
+    let curve =  new THREE.CatmullRomCurve3(points);
+    curve.curvrtype = "catmullrom";
+    // curve.getLength();
+    // curve动画轨迹
+    // progress动画进度
+    // enable当前动画开关
+    // speed动画速度
+    // console.log(curve);
+
+    model.action.play();
+    model.progress = 0;
+    model.runrail = curve;
+    model.speed = 0.2/curve.getLength();
+  }
+  //更新人物列表中人物的动画
+  this.moveAnimateUpdate = function(humanlist,olddataai,passerHuman){
+    for(let i=0;i<humanlist.children.length;i++){
+			if(humanlist.children[i].status == 1){
+				if(humanlist.children[i].progress>=1){
+					//更新模型坐标
+					if(humanlist.children[i].status == 1){
+
+
+						humanlist.children[i].progress = 1;
+						humanlist.children[i].action.stop();
+						humanlist.children[i].status = 0;
+
+						if(humanlist.children[i].stage == 8){
+							passerHuman.uncache(humanlist.children[i]);
+							humanlist.remove(humanlist.children[i]);
+							i--;
+						}else if(humanlist.children[i].stage == 7){
+							humanlist.children[i].stage = 8;
+						}
+						// else if(humanlist.children[i].stage == 6){
+						//
+						// 	humanlist.children[i].stage = 7;
+						//
+						// }
+						else if(humanlist.children[i].stage == 5){
+
+							humanlist.children[i].stage = 7;
+
+						}else if(humanlist.children[i].stage == 4){
+							passerHuman.uncache(humanlist.children[i]);
+							humanlist.remove(humanlist.children[i]);
+							i--;
+						}else if(humanlist.children[i].stage == 3){
+
+							humanlist.children[i].stage = 4;
+							if(olddataai){
+								humanlist.children[i].stage = 5;
+							}
+
+						}else if(humanlist.children[i].stage == 2){
+							humanlist.children[i].stage = 3;
+
+						}else if(humanlist.children[i].stage == 1){
+
+
+							humanlist.children[i].stage = 2;
+
+						}else if(humanlist.children[i].stage == 0){
+							// // console.log(humans[i].doors);
+							// zhajiin[humanlist.children[i].doors].waiting = 0;
+							humanlist.children[i].stage = 1;
+						}
+
+					}
+
+				}else{
+		//根据动画进度获取动画轨迹上点
+					// console.log(i);
+					// console.log(humanlist.children[i].runrail);
+					// console.log(humanlist.children[i].progress);
+					let point = humanlist.children[i].runrail.getPointAt(humanlist.children[i].progress);
+
+					//更新模型坐标
+					humanlist.children[i].position.x = point.x;
+					humanlist.children[i].position.y = point.y;
+					humanlist.children[i].position.z = point.z;
+					if((humanlist.children[i].progress+0.001)<1){
+						let tangent = humanlist.children[i].runrail.getPointAt(humanlist.children[i].progress+0.001);
+						humanlist.children[i].lookAt(new THREE.Vector3(tangent.x,humanlist.children[i].position.y,tangent.z));
+					}
+
+					humanlist.children[i].progress += humanlist.children[i].speed;
+					point = null;
+
+				}
+			}
+		}
+  }
+  //离开车站释放缓存
+  this.uncache = function(uncachemodel){
+    if(uncachemodel){
+			uncachemodel.mixer.uncacheAction();
+			uncachemodel.traverse( function ( child ) {
+				if ( child.isMesh ) {
+					child.geometry.dispose();
+					child.material.dispose();
+				}
+			} );
+		}
+  }
+}
diff --git a/src/jlmap3d/jl3dpassflow/model/passerstation.js b/src/jlmap3d/jl3dpassflow/model/passerstation.js
new file mode 100644
index 000000000..05ca190a2
--- /dev/null
+++ b/src/jlmap3d/jl3dpassflow/model/passerstation.js
@@ -0,0 +1,176 @@
+import {Materialload} from '@/jlmap3d/main/loaders/Materialload.js';
+
+export function  PasserStation() {
+	var scope = this;
+  this.stationMesh = null;
+  this.stationleft = [];
+  this.stationright = [];
+  //替换材质组(站台的)
+  this.stationtexture = [];
+
+  this.stationlist = [];
+
+	this.nowStation = null;
+
+  for(let i=0;i<22;i++){
+  	let sl = {
+  		id:"left"+i,
+  		status:0,
+  		waiting:0
+  	}
+  	scope.stationleft.push(sl);
+  }
+
+  for(let i=0;i<22;i++){
+  	let sr = {
+  		id:"right"+i,
+  		status:0,
+  		waiting:0
+  	}
+  	scope.stationright.push(sr);
+  }
+	//初始化车站模型动画
+  this.initStationAnimation = function( object,mixers ,deviceaction ,scene){
+    let mixer = new THREE.AnimationMixer( object ,mixers ,deviceaction ,scene);
+
+    let newclip = object.animations[ 0 ];
+    for(let j=0;j<object.children.length;j++){
+
+      if(object.children[j].name == "top"){
+        // let geometry = new THREE.BoxBufferGeometry( 50, 50, 50 );
+        // let material = new THREE.MeshBasicMaterial( {color: 0x00ff00} );
+        // let cube = new THREE.Mesh( geometry, material );
+        // cube.position.copy(object.children[j].position);
+        // scene.add( cube );
+        object.children[j].animations = [];
+        object.children[j].animations.push(newclip.clone());
+
+        let mixer = new THREE.AnimationMixer(  object.children[j] );
+
+        let action =mixer.clipAction( object.children[j].animations[0])
+        action.setLoop(THREE.LoopOnce);
+        action.clampWhenFinished = true;
+        // action.play();
+
+        mixers.push(mixer);
+        let device = {
+          action:action,
+          mixer:mixer,
+        };
+        deviceaction[object.children[j].name] = device;
+      }
+      if(object.children[j].name == "down"){
+        object.children[j].animations = [];
+        object.children[j].animations.push(newclip.clone());
+
+        let mixer = new THREE.AnimationMixer( object.children[j] );
+
+
+        let action =mixer.clipAction( object.children[j].animations[0])
+        // action.play();
+        action.setLoop(THREE.LoopOnce);
+        action.clampWhenFinished = true;
+
+        mixers.push(mixer);
+        let device = {
+          action:action,
+          mixer:mixer,
+        };
+        deviceaction[object.children[j].name] = device;
+      }
+    }
+    object.traverse( function ( child ) {
+
+      if ( child.isMesh ) {
+        child.renderOrder = 9;
+      }
+
+    } );
+    scope.stationMesh = object;
+    // console.log(deviceaction);
+    scene.add(object);
+
+  }
+	//初始化车站名称数据
+  this.initStationList = function(stationdata,standdata,psddata){
+    let list = [];
+    if(psddata){
+      for(let i=0,leni = standdata.length;i<leni;i++){
+        for(let j=0,lenj = psddata.length;j<lenj;j++){
+          if(standdata[i].code == psddata[j].standCode){
+            standdata[i].name = psddata[j].code;
+          }
+        }
+      }
+      for(let i=0,leni = stationdata.length;i<leni;i++){
+        if(stationdata[i].depot == false){
+          list[stationdata[i].name] = [];
+          for(let j=0,lenj = standdata.length;j<lenj;j++){
+            if(standdata[j].stationCode == stationdata[i].code){
+              list[stationdata[i].name].push(standdata[j]);
+            }
+          }
+        }
+      }
+      for(let k in list){
+        if(list[k].length>0){
+          let stationobject = {
+            code : list[k][0].stationCode,
+            name : k,
+            toppsd:null,
+            downpsd:null,
+            topsection:null,
+            downsection:null,
+          };
+          if(list[k][0].position.y<list[k][1].position.y){
+            stationobject.toppsd = list[k][0].name;
+            stationobject.downpsd = list[k][1].name;
+            stationobject.topsection = list[k][0].standTrackCode;
+            stationobject.downsection = list[k][1].standTrackCode;
+          }else{
+            stationobject.toppsd = list[k][1].name;
+            stationobject.downpsd = list[k][0].name;
+            stationobject.topsection = list[k][1].standTrackCode;
+            stationobject.downsection = list[k][0].standTrackCode;
+          }
+          scope.stationlist.push(stationobject);
+        }
+
+      }
+
+      scope.nowStation = scope.stationlist[0];
+      if(scope.stationtexture["stationlist"]){
+        scope.stationMesh.getObjectByName("zhantailiebiao").material.map =scope.stationtexture["stationlist"];
+        scope.stationMesh.getObjectByName("zhantailiebiao").material.map.needsUpdate = true;
+        if(scope.stationMesh.getObjectByName("menkuangyanse")){
+          scope.stationMesh.getObjectByName("menkuangyanse").material.map =scope.stationtexture["pingbimen"];
+          scope.stationMesh.getObjectByName("menkuangyanse").material.map.needsUpdate = true;
+        }
+        scope.stationMesh.getObjectByName("zhantaiming").material.map = scope.stationtexture[scope.nowStation.code];
+        scope.stationMesh.getObjectByName("zhantaiming").material.map.needsUpdate = true;
+      }
+      updatestationlist(scope.stationlist);
+    }else{
+      olddataai = true;
+    }
+  }
+	//加载线路车站名贴图
+	this.loadMaterial = function(netdata3d){
+		Materialload(scope,JSON.parse(netdata3d.data.assets).stationTextureList[0]);
+	}
+	//更换场景车站
+  this.changestation = function(stationname){
+    for(let i=0,leni=scope.stationlist.length;i<leni;i++){
+      if(scope.stationlist[i].name == stationname){
+        scope.nowStation = scope.stationlist[i];
+
+        if(scope.stationtexture["stationlist"]){
+          scope.stationMesh.getObjectByName("zhantaiming").material.map = scope.stationtexture[scope.nowStation.code];
+          scope.stationMesh.getObjectByName("zhantaiming").material.map.needsUpdate = true;
+        }
+        i=leni;
+      }
+    }
+  }
+
+}
diff --git a/src/jlmap3d/jl3dpassflow/model/passertrain.js b/src/jlmap3d/jl3dpassflow/model/passertrain.js
new file mode 100644
index 000000000..457f9e903
--- /dev/null
+++ b/src/jlmap3d/jl3dpassflow/model/passertrain.js
@@ -0,0 +1,121 @@
+export function  PasserTrain() {
+ let scope = this;
+ this.toptrain = null;
+ this.downtrain = null;
+ //初始化列车模型动画
+ this.initTrain = function(object,mixers,deviceaction,scene){
+   let ntracks1,ntracks2,tclip,fclip;
+
+   ntracks1 = object.animations.slice(16,27);
+
+   tclip = new THREE.AnimationClip("three",2,ntracks1);
+
+   ntracks2 = object.animations.slice(0,15);
+
+   fclip = new THREE.AnimationClip("four",2,ntracks2);
+
+   object.traverse( function ( child ) {
+
+     if ( child.isMesh ) {
+       child.renderOrder = 8;
+     }
+
+   } );
+
+
+   scope.toptrain = object.clone(true);
+   scope.toptrain.nowcode = null;
+   scope.toptrain.action = {
+     top:[],
+     down:[]
+   };
+   let points1 = [];
+   points1.push(new THREE.Vector3(-71,0.06,-6.3));
+   points1.push(new THREE.Vector3(60.73,0.06,-6.3));
+
+
+   scope.toptrain.curve = new THREE.CatmullRomCurve3(points1);
+
+   scope.downtrain = object.clone(true);
+   scope.downtrain.nowcode = null;
+   scope.downtrain.action = {
+     top:[],
+     down:[]
+   };
+   let points2 = [];
+   points2.push(new THREE.Vector3(-71,0.06,28.68));
+   points2.push(new THREE.Vector3(60.73,0.06,28.68));
+   scope.downtrain.curve = new THREE.CatmullRomCurve3(points2);
+
+
+   inittrainanimation(scope.toptrain,tclip,fclip,mixers);
+   inittrainanimation(scope.downtrain,tclip,fclip,mixers);
+
+
+   scope.toptrain.position.z = -20;
+   scope.toptrain.position.y = -20000;
+   scope.toptrain.rotation.y = Math.PI;
+   scope.downtrain.position.z = 40;
+   scope.downtrain.position.y = -20000;
+   scene.add(scope.toptrain);
+   scene.add(scope.downtrain);
+ }
+ //初始化车门动画
+ function inittrainanimation(train,tclip,fclip,mixers){
+    for(let j=0;j<train.children.length;j++){
+      if(train.children[j].name == "c1" || train.children[j].name == "c6"){
+         for(let n=0,lenn = train.children[j].children.length;n<lenn;n++){
+           if(train.children[j].children[n].name == "top"){
+             train.children[j].children[n].animations = [];
+             train.children[j].children[n].animations.push(tclip.clone());
+             let mixer = new THREE.AnimationMixer(  train.children[j].children[n] );
+             mixers.push(mixer);
+             let action = mixer.clipAction( train.children[j].children[n].animations[ 0 ] );
+             action.setLoop(THREE.LoopOnce);
+             action.clampWhenFinished = true;
+             train.action.top.push(action);
+             mixers.push(mixer);
+           }
+           if(train.children[j].children[n].name == "down"){
+             train.children[j].children[n].animations = [];
+             train.children[j].children[n].animations.push(tclip.clone());
+             let mixer = new THREE.AnimationMixer(  train.children[j].children[n] );
+             mixers.push(mixer);
+             let action = mixer.clipAction( train.children[j].children[n].animations[ 0 ] );
+             action.setLoop(THREE.LoopOnce);
+             action.clampWhenFinished = true;
+             train.action.down.push(action);
+             mixers.push(mixer);
+           }
+         }
+       }else{
+         for(let n=0,lenn = train.children[j].children.length;n<lenn;n++){
+           if(train.children[j].children[n].name == "top"){
+             train.children[j].children[n].animations = [];
+             train.children[j].children[n].animations.push(fclip.clone());
+             let mixer = new THREE.AnimationMixer(  train.children[j].children[n] );
+             mixers.push(mixer);
+             let action = mixer.clipAction( train.children[j].children[n].animations[ 0 ] );
+             action.setLoop(THREE.LoopOnce);
+             action.clampWhenFinished = true;
+             train.action.top.push(action);
+             mixers.push(mixer);
+           }
+           if(train.children[j].children[n].name == "down"){
+             train.children[j].children[n].animations = [];
+             train.children[j].children[n].animations.push(fclip.clone());
+             let mixer = new THREE.AnimationMixer(  train.children[j].children[n] );
+             mixers.push(mixer);
+             let action = mixer.clipAction( train.children[j].children[n].animations[ 0 ] );
+             action.setLoop(THREE.LoopOnce);
+             action.clampWhenFinished = true;
+             train.action.down.push(action);
+             mixers.push(mixer);
+           }
+         }
+       }
+    }
+  }
+
+
+}
diff --git a/src/jlmap3d/jl3dpassflow/model/zonemanager.js b/src/jlmap3d/jl3dpassflow/model/zonemanager.js
index 8d282a4b8..7ebeaf819 100644
--- a/src/jlmap3d/jl3dpassflow/model/zonemanager.js
+++ b/src/jlmap3d/jl3dpassflow/model/zonemanager.js
@@ -1,5 +1,5 @@
 import { ZoneModel } from '@/jlmap3d/jl3dpassflow/model/zonemodel.js';
-
+//进站区域1
 let enter1 = {
   code : '001',
   name : "enter1",
@@ -11,7 +11,7 @@ let enter1 = {
     new THREE.Vector3(32,9.8,-6)
   ]
 };
-
+//进站区域2
 let enter2 = {
   code : '002',
   name : "enter2",
@@ -23,7 +23,7 @@ let enter2 = {
     new THREE.Vector3(32,9.8,31.5)
   ]
 };
-
+//安检区域
 let security = {
   code : '003',
   name : "security",
@@ -35,7 +35,7 @@ let security = {
     new THREE.Vector3(21,9.8,21)
   ]
 };
-
+//进方向闸机区域
 let entergate = {
   code : '004',
   name : "entergate",
@@ -50,7 +50,7 @@ let entergate = {
     new THREE.Vector3(0.7,9.8,18.1)
   ]
 };
-
+//站台上车区域
 let standtop = {
   code : '005',
   name : "standtop",
@@ -86,7 +86,7 @@ let standtop = {
     new THREE.Vector3(-63.5,1.77,-1.8)
   ]
 };
-
+//站台下车区域
 let standdown = {
   code : '006',
   name : "standdown",
@@ -123,6 +123,7 @@ let standdown = {
   ]
 };
 //4是刚下车状态
+//出方向闸机区域
 let exitgate = {
   code : '007',
   name : "exitgate",
@@ -137,7 +138,7 @@ let exitgate = {
     new THREE.Vector3(18,9.8,5.4)
   ]
 };
-
+//出站台区域1
 let exit1 = {
   code : '008',
   name : "exit1",
@@ -149,7 +150,7 @@ let exit1 = {
     new THREE.Vector3(30.5,9.8,-7.4)
   ]
 };
-
+//出站台区域2
 let exit2 = {
   code : '009',
   name : "exit2",
@@ -163,6 +164,7 @@ let exit2 = {
 };
 let enternum = 0;
 let exitnum = 0;
+//区域管理器
 export function ZoneManager() {
 
 	var scope = this;
@@ -172,7 +174,7 @@ export function ZoneManager() {
   this.list = [];
 
   initzone();
-
+  //初始化区域对象
   function initzone(){
     scope.list[enter1.name] = new ZoneModel(enter1);
     scope.list[enter2.name] = new ZoneModel(enter2);
@@ -184,7 +186,7 @@ export function ZoneManager() {
     scope.list[exit1.name] = new ZoneModel(exit1);
     scope.list[exit2.name] = new ZoneModel(exit2);
   }
-
+  //获取区域范围内点
   this.getinitposition = function(name){
     // console.log(scope.list[name]);
     let randompoint = new THREE.Vector3(0,scope.list[name].randompoint.y,0);
@@ -246,6 +248,7 @@ export function ZoneManager() {
     };
     return standdata;
   }
+
   this.getgateposition = function(name){
     let randompoint = new THREE.Vector3(0,0,0);
 
diff --git a/src/jlmap3d/jl3dpassflow/passerai/passerai.js b/src/jlmap3d/jl3dpassflow/passerai/passerai.js
new file mode 100644
index 000000000..c89ac546c
--- /dev/null
+++ b/src/jlmap3d/jl3dpassflow/passerai/passerai.js
@@ -0,0 +1,256 @@
+
+
+export function  PasserAi(zone,finder) {
+  let scope = this;
+
+  //下车控制开关
+	this.toppasseron = false;
+	this.downpasseron = false;
+  //上车控制开关
+  this.toppasserin = false;
+  this.downpasserin = false;
+  let passerZone = zone;
+  let pathFinder = finder;
+
+	let path;
+	let playerPosition = new THREE.Vector3( -3.5, 0.5, 5.5 );
+	let targetPosition = new THREE.Vector3();
+  //生成下车出站人物
+  this.passerout = function(direct){
+    // console.log(direct);
+    if(direct == "top"){
+      // console.log("toppasser");
+      scope.toppasseron = true;
+      setTimeout(function(){
+        scope.toppasseron = false
+        scope.toppasserin = true;
+
+        setTimeout(function(){
+          scope.toppasserin = false;
+        }, 20000);
+      }, 5000);
+    }
+    if(direct == "down"){
+      // console.log("downpasser");
+      scope.downpasseron = true;
+      setTimeout(function(){
+        scope.downpasseron = false;
+        scope.downpasserin = true;
+        setTimeout(function(){
+          scope.downpasserin = false;
+        }, 20000);
+      }, 5000);
+    }
+  }
+
+  //初始化加载人物
+  this.initPasser = function(humanlist,passerHuman){
+    for(let i=0;i<3;i++){
+
+			passerHuman.newHumanCreate(humanlist,passerZone.getinitposition("enter1"),0);
+		}
+		for(let i=0;i<3;i++){
+			passerHuman.newHumanCreate(humanlist,passerZone.getinitposition("enter2"),0);
+		}
+		for(let i=0;i<3;i++){
+			passerHuman.newHumanCreate(humanlist,passerZone.getinitposition("security"),1);
+		}
+		// for(let i=0;i<2;i++){
+		// 	// passerHuman.newHumanCreate(humanlist,passerZone.getinitposition("entergate"),3);
+		// }
+		for(let i=0;i<6;i++){
+			let standdata = passerZone.getstandposition("standtop");
+			passerHuman.newHumanCreate(humanlist,standdata.point,4,"top",standdata.door);
+		}
+		for(let i=0;i<6;i++){
+			let standdata = passerZone.getstandposition("standdown");
+			passerHuman.newHumanCreate(humanlist,standdata.point,4,"down",standdata.door);
+		}
+  }
+
+  //人物站台阶段更新
+  this.aiUpdate = function(humanlist,passerHuman,passerCheckDoor,deviceaction){
+    for(let i=0;i<humanlist.children.length;i++){
+      // console.log(humans[i]);
+
+      if(humanlist.children[i].status == 0){
+        //stage = 0 进入车站
+        if(humanlist.children[i].stage == 0){
+          let points = [];
+          points.push(new THREE.Vector3(humanlist.children[i].position.x,humanlist.children[i].position.y,humanlist.children[i].position.z));
+
+          targetPosition = passerZone.getzoneposition("security");
+
+          path = pathFinder.find(points[0],targetPosition);
+
+          for(let i=0;i<path.length;i++){
+            points.push(new THREE.Vector3(path[i].x,path[i].y,path[i].z));
+          }
+          passerHuman.initMoveAnimate(humanlist.children[i],i,points,i);
+          // console.log(path);
+        }
+
+        //stage = 1 前往进站闸机
+        if(humanlist.children[i].stage == 1){
+          let points = [];
+          points.push(new THREE.Vector3(humanlist.children[i].position.x,humanlist.children[i].position.y,humanlist.children[i].position.z));
+
+            targetPosition = passerZone.getgateposition("entergate");
+
+            path = pathFinder.find(points[0],targetPosition.point);
+
+            humanlist.children[i].door = targetPosition.door;
+            for(let i=0;i<path.length;i++){
+              points.push(new THREE.Vector3(path[i].x,path[i].y,path[i].z));
+            }
+            passerHuman.initMoveAnimate(humanlist.children[i],i,points,i);
+        }
+
+        //stage = 2 过闸机
+        if(humanlist.children[i].stage == 2){
+            let points = [];
+            points.push(new THREE.Vector3(humanlist.children[i].position.x,humanlist.children[i].position.y,humanlist.children[i].position.z));
+            points.push(new THREE.Vector3(humanlist.children[i].position.x,humanlist.children[i].position.y,humanlist.children[i].position.z-5));
+
+            passerCheckDoor.checkDoorControl("in",humanlist.children[i].door,deviceaction)
+            passerHuman.initMoveAnimate(humanlist.children[i],i,points,i);
+        }
+
+        //stage = 3 前往站台
+        if(humanlist.children[i].stage == 3){
+
+          let direct = Math.floor(Math.random()*(2))+1;
+          // console.log(direct);
+          let points = [];
+          points.push(new THREE.Vector3(humanlist.children[i].position.x,humanlist.children[i].position.y,humanlist.children[i].position.z));
+          // points.push(new THREE.Vector3(11.81,9.8,13.11));
+
+          //1--top
+          //2-- down
+          if(direct == 1){
+            targetPosition = passerZone.getstandposition("standtop");
+            path = pathFinder.find(points[0],targetPosition.point);
+            humanlist.children[i].direct = "top";
+          }else{
+            targetPosition = passerZone.getstandposition("standdown");
+            path = pathFinder.find(points[0],targetPosition.point);
+            humanlist.children[i].direct = "down";
+          }
+          if(path[0].y<9.84){
+            points.push(new THREE.Vector3(11.81,9.8,13.11));
+            points.push(new THREE.Vector3(29.5,1.77,13.16));
+
+          }
+          for(let i=0;i<path.length;i++){
+            points.push(new THREE.Vector3(path[i].x,path[i].y,path[i].z));
+          }
+          humanlist.children[i].door = targetPosition.door;
+          passerHuman.initMoveAnimate(humanlist.children[i],i,points,i);
+        }
+
+        //stage = 4 上车
+        if(humanlist.children[i].stage == 4){
+          if(scope.toppasserin && humanlist.children[i].direct == "top"){
+
+
+            let points = [];
+            points.push(new THREE.Vector3(humanlist.children[i].position.x,humanlist.children[i].position.y,humanlist.children[i].position.z));
+
+            points.push(passerZone.list["standtop"].doorpoints[humanlist.children[i].door]);
+
+            if(points[1] == undefined){
+
+            }else{
+              passerHuman.initMoveAnimate(humanlist.children[i],i,points,i);
+            }
+          }
+
+
+
+          if(scope.downpasserin && humanlist.children[i].direct == "down"){
+            let points = [];
+            points.push(new THREE.Vector3(humanlist.children[i].position.x,humanlist.children[i].position.y,humanlist.children[i].position.z));
+
+            points.push(passerZone.list["standdown"].doorpoints[humanlist.children[i].door]);
+
+            if(points[1] == undefined){
+
+            }else{
+              passerHuman.initMoveAnimate(humanlist.children[i],i,points,i);
+            }
+            // console.log(points);
+          }
+
+        }
+
+        //stage = 5 下车
+        if(humanlist.children[i].stage == 5){
+          let points = [];
+          points.push(new THREE.Vector3(humanlist.children[i].position.x,humanlist.children[i].position.y,humanlist.children[i].position.z));
+          if(humanlist.children[i].direct == "top"){
+            points.push(new THREE.Vector3(humanlist.children[i].position.x,humanlist.children[i].position.y,humanlist.children[i].position.z+5));
+          }
+          if(humanlist.children[i].direct == "down"){
+            points.push(new THREE.Vector3(humanlist.children[i].position.x,humanlist.children[i].position.y,humanlist.children[i].position.z-5));
+          }
+          targetPosition = passerZone.getgateposition("exitgate");
+          path = pathFinder.find(points[1],targetPosition.point);
+          humanlist.children[i].door = targetPosition.door;
+          for(let i=0;i<path.length;i++){
+            points.push(new THREE.Vector3(path[i].x,path[i].y,path[i].z));
+          }
+          passerHuman.initMoveAnimate(humanlist.children[i],i,points,i);
+        }
+
+        //stage = 6 前往出站闸机
+        // if(humanlist.children[i].stage == 6){
+        // 	let points = [];
+        // 	points.push(new THREE.Vector3(humanlist.children[i].position.x,humanlist.children[i].position.y,humanlist.children[i].position.z));
+        //
+        // 		groupID = pathfinder.getGroup( ZONE, 	points[0] );
+        // 		targetPosition = passerZone.getgateposition("exitgate");
+        // 		path = pathfinder.findPath( points[0], targetPosition, ZONE, groupID );
+        //
+        // 		for(let i=0;i<path.length;i++){
+        // 			points.push(new THREE.Vector3(path[i].x,path[i].y,path[i].z));
+        // 		}
+        // 		passerHuman.initMoveAnimate(humanlist.children[i],i,points,i);
+        // }
+
+        //stage = 7 出闸机
+        if(humanlist.children[i].stage == 7){
+            let points = [];
+            points.push(new THREE.Vector3(humanlist.children[i].position.x,humanlist.children[i].position.y,humanlist.children[i].position.z));
+            points.push(new THREE.Vector3(humanlist.children[i].position.x+5,humanlist.children[i].position.y,humanlist.children[i].position.z));
+
+            passerCheckDoor.checkDoorControl("out",humanlist.children[i].door,deviceaction)
+            passerHuman.initMoveAnimate(humanlist.children[i],i,points,i);
+        }
+
+        //stage = 8 出站
+        if(humanlist.children[i].stage == 8){
+          let direct = Math.floor(Math.random()*(3-1+1))+1;
+          let points = [];
+          points.push(new THREE.Vector3(humanlist.children[i].position.x,humanlist.children[i].position.y,humanlist.children[i].position.z));
+
+          //1--top
+          //2-- down
+          if(direct == 1){
+            targetPosition = passerZone.getzoneposition("exit1");
+            path = pathFinder.find(points[0],targetPosition);
+          }else{
+            targetPosition = passerZone.getzoneposition("exit2");
+            path = pathFinder.find(points[0],targetPosition);
+          }
+
+          for(let i=0;i<path.length;i++){
+            points.push(new THREE.Vector3(path[i].x,path[i].y,path[i].z));
+          }
+          passerHuman.initMoveAnimate(humanlist.children[i],i,points,i);
+
+        }
+      }
+    }
+
+  }
+}
diff --git a/src/jlmap3d/jl3dpassflow/passerai/pathfinder.js b/src/jlmap3d/jl3dpassflow/passerai/pathfinder.js
new file mode 100644
index 000000000..039f833dc
--- /dev/null
+++ b/src/jlmap3d/jl3dpassflow/passerai/pathfinder.js
@@ -0,0 +1,69 @@
+import { JL3D_LOCAL_STATIC } from '@/api/jlmap3d/assets3d.js';
+import { Pathfinding } from '@/jlmap3d/utils/pathfinder/Pathfinding.js';
+import { OBJLoader } from '@/jlmap3d/main/loaders/OBJLoader';
+
+export function PathFinder(){
+  let scope = this;
+  this.navmesh = null;
+
+  const ZONE = 'level';
+	const SPEED = 10;
+	const OFFSET = 0.2;
+	THREE.Pathfinding = Pathfinding;
+	let groupID,path,level;
+	let playerPosition = new THREE.Vector3( -3.5, 0.5, 5.5 );
+
+	let pathFinder = new THREE.Pathfinding();
+
+
+
+	let loaderObj = new THREE.OBJLoader();
+
+	// load a resource
+	loaderObj.load(
+		// resource URL
+		JL3D_LOCAL_STATIC+'/jl3d/path/path.obj',
+		// called when resource is loaded
+		function ( object ) {
+
+
+			// console.time('createZone()');
+
+			const zone = THREE.Pathfinding.createZone(object.children[0].geometry);
+			// console.timeEnd('createZone()');
+
+			pathFinder.setZoneData( ZONE, zone );
+
+			const navWireframe = new THREE.Mesh(object.children[0].geometry, new THREE.MeshBasicMaterial({
+				color: 0x808080,
+				wireframe: true
+			}));
+			navWireframe.position.y = OFFSET / 2;
+			// scene.add(navWireframe);
+
+			scope.navmesh = object;
+
+
+			groupID = pathFinder.getGroup( ZONE, playerPosition );
+
+		},
+		// called when loading is in progresses
+		function ( xhr ) {
+
+			console.log( ( xhr.loaded / xhr.total * 100 ) + '% loaded' );
+
+		},
+		// called when loading has errors
+		function ( error ) {
+
+			console.log( 'An error happened' );
+
+		}
+	);
+  this.find = function(startPoint,targetPosition){
+    groupID = pathFinder.getGroup( ZONE, 	startPoint );
+    let resultPath = pathFinder.findPath( startPoint, targetPosition, ZONE, groupID );
+
+    return resultPath;
+  }
+}
diff --git a/src/jlmap3d/jl3dpassflow/passerrender/passerrender.js b/src/jlmap3d/jl3dpassflow/passerrender/passerrender.js
new file mode 100644
index 000000000..311f77213
--- /dev/null
+++ b/src/jlmap3d/jl3dpassflow/passerrender/passerrender.js
@@ -0,0 +1,66 @@
+import { FourViewRender } from '@/jlmap3d/jl3dpassflow/passerrender/renderstate/fourviewrender.js';
+import { TwoViewRender } from '@/jlmap3d/jl3dpassflow/passerrender/renderstate/twoviewrender.js';
+import { FreeViewRender } from '@/jlmap3d/jl3dpassflow/passerrender/renderstate/freeviewrender.js';
+
+export function  PasserRender(mapmode) {
+  let scope = this;
+
+  this.state = null;
+
+  this.nowrender = null;
+
+
+  this.windowWidth = null;
+	this.windowHeight = null;
+
+  let fourViewRender = new FourViewRender();
+  let twoViewRender = new TwoViewRender();
+  let freeViewRender = new FreeViewRender();
+
+  let renderer = null;
+
+  this.initView = function(dom,scene,camerass){
+
+    scope.windowWidth = dom.offsetWidth ;
+    scope.windowHeight = dom.offsetHeight;
+
+    renderer = new THREE.WebGLRenderer({ antialias: true });
+    renderer.setClearColor(new THREE.Color(0x000000));
+    renderer.setViewport( 0, 0, scope.windowWidth, scope.windowHeight);
+    renderer.setScissor( 0, 0, scope.windowWidth, scope.windowHeight);
+    renderer.setScissorTest( false );
+    renderer.setSize(scope.windowWidth, scope.windowHeight);
+    renderer.sortObjects = true;
+    dom.appendChild(renderer.domElement);
+
+    fourViewRender.initRender(renderer,dom,scene);
+    twoViewRender.initRender(renderer,dom,scene);
+    freeViewRender.initRender(renderer,dom,scene,camerass);
+    //
+
+    scope.state = "4views";
+    scope.nowrender = fourViewRender;
+  }
+
+  this.changeRenderMode = function(mode){
+    if(mode == "4views"){
+      scope.nowrender = fourViewRender;
+
+    }
+    if(mode == "2views"){
+      scope.nowrender = twoViewRender;
+    }
+    if(mode == "freeview"){
+      scope.nowrender = freeViewRender;
+    }
+    scope.nowrender.changeRender();
+  }
+
+  this.reSize = function(offsetWidth,offsetHeight){
+    scope.nowrender.reSize(offsetWidth,offsetHeight);
+  }
+
+  this.update = function(){
+    scope.nowrender.update();
+  }
+}
diff --git a/src/jlmap3d/jl3dpassflow/passerrender/renderstate/fourviewrender.js b/src/jlmap3d/jl3dpassflow/passerrender/renderstate/fourviewrender.js
new file mode 100644
index 000000000..f40b78563
--- /dev/null
+++ b/src/jlmap3d/jl3dpassflow/passerrender/renderstate/fourviewrender.js
@@ -0,0 +1,115 @@
+export function  FourViewRender() {
+  let scope = this;
+
+  let renderer = null;
+
+  let windowWidth = null;
+  let windowHeight = null;
+  let renderScene = null;
+  let specilView,
+      specilCamera,
+      specilLeft,
+      specilBottom,
+      specilWidth,
+      specilHeight;
+
+  let views4 = [
+    {
+      left: 0,
+      bottom: 0,
+      width: 0.5,
+      height: 0.5,
+      background: new THREE.Color( 0.5, 0.5, 0.7 ),
+      eye: [ 3.7, 16, 26 ],
+      up: [3.7, 10 ,16 ],
+      fov: 30
+    },
+    {
+      left: 0,
+      bottom: 0.5,
+      width: 0.5,
+      height: 0.5,
+      background: new THREE.Color( 0.5, 0.5, 0.7 ),
+      eye: [ 3.7,17,-4 ],
+      up: [  3.7, 10 ,16],
+      fov: 30
+    },
+    {
+      left: 0.5,
+      bottom: 0,
+      width: 0.5,
+      height: 0.5,
+      background: new THREE.Color( 0.7, 0.5, 0.5 ),
+      eye: [ -60, 6,11],
+      up: [ -59, 5.9,11 ],
+      fov: 45
+    },
+    {
+      left: 0.5,
+      bottom: 0.5,
+      width: 0.5,
+      height: 0.5,
+      background: new THREE.Color( 0.5, 0.7, 0.7 ),
+      eye: [ -7,17,2],
+      up: [-7, 10, 8],
+      fov: 60
+    }
+  ];
+
+  for ( let ii = 0; ii < views4.length; ++ ii ) {
+
+		let view = views4[ ii ];
+		let camera = new THREE.PerspectiveCamera( view.fov, window.innerWidth / window.innerHeight, 1, 200 );
+		camera.position.fromArray( view.eye );
+		camera.lookAt( view.up[0],view.up[1],view.up[2] );
+		view.camera = camera;
+
+	}
+
+  this.initRender = function(render,dom,scene){
+
+    windowWidth = dom.offsetWidth ;
+    windowHeight = dom.offsetHeight;
+    renderScene = scene;
+
+    renderer = render;
+
+  }
+
+  this.changeRender = function(){
+    renderer.setClearColor(new THREE.Color(0x000000));
+    renderer.setSize(windowWidth, windowHeight);
+    renderer.sortObjects = true;
+  }
+
+  this.reSize = function(offsetWidth,offsetHeight){
+    windowWidth = window.innerWidth;
+    windowHeight = window.innerHeight;
+
+  }
+
+  this.update = function(){
+    for ( let ii = 0; ii < 4; ii ++ ) {
+
+      specilView = views4[ ii ];
+      specilCamera = specilView.camera;
+
+      // view.updateCamera( camera, scene, mouseX, mouseY );
+
+      specilLeft = Math.floor( windowWidth * specilView.left );
+      specilBottom = Math.floor( windowHeight * specilView.bottom );
+      specilWidth = Math.floor( windowWidth * specilView.width );
+      specilHeight = Math.floor( windowHeight * specilView.height );
+
+      renderer.setViewport( specilLeft,specilBottom,specilWidth,specilHeight );
+      renderer.setScissor( specilLeft,specilBottom,specilWidth,specilHeight );
+      renderer.setScissorTest( true );
+
+      specilCamera.aspect = specilWidth / specilHeight;
+      specilCamera.updateProjectionMatrix();
+
+      renderer.render( renderScene, specilCamera );
+
+    }
+  }
+}
diff --git a/src/jlmap3d/jl3dpassflow/passerrender/renderstate/freeviewrender.js b/src/jlmap3d/jl3dpassflow/passerrender/renderstate/freeviewrender.js
new file mode 100644
index 000000000..ffa000243
--- /dev/null
+++ b/src/jlmap3d/jl3dpassflow/passerrender/renderstate/freeviewrender.js
@@ -0,0 +1,51 @@
+export function  FreeViewRender() {
+  let scope = this;
+
+  let renderer = null;
+  let camera = null;
+  let windowWidth = null;
+  let windowHeight = null;
+  let renderScene = null;
+  let specilView,
+      specilCamera,
+      specilLeft,
+      specilBottom,
+      specilWidth,
+      specilHeight;
+
+  this.initRender = function(render,dom,scene,camerass){
+
+    camera = camerass;
+    camera.aspect = windowWidth / windowHeight;
+    camera.updateProjectionMatrix();
+
+    windowWidth = dom.offsetWidth ;
+    windowHeight = dom.offsetHeight;
+    renderScene = scene;
+
+    renderer = render;
+  }
+
+  this.changeRender = function(){
+    camera.aspect = windowWidth / windowHeight;
+    camera.updateProjectionMatrix();
+    renderer.setClearColor(new THREE.Color(0x000000));
+    renderer.setViewport( 0, 0, windowWidth, windowHeight);
+    renderer.setScissor( 0, 0, windowWidth, windowHeight);
+    renderer.setSize(windowWidth, windowHeight);
+    renderer.sortObjects = true;
+  }
+
+  this.reSize = function(offsetWidth,offsetHeight){
+
+    windowWidth = window.innerWidth;
+    windowHeight = window.innerHeight;
+    camera.aspect = windowWidth / windowHeight;
+    camera.updateProjectionMatrix();
+    renderer.setSize(windowWidth, windowHeight);
+  }
+
+  this.update = function(){
+    renderer.render(renderScene, camera);
+  }
+}
diff --git a/src/jlmap3d/jl3dpassflow/passerrender/renderstate/twoviewrender.js b/src/jlmap3d/jl3dpassflow/passerrender/renderstate/twoviewrender.js
new file mode 100644
index 000000000..22ab46a07
--- /dev/null
+++ b/src/jlmap3d/jl3dpassflow/passerrender/renderstate/twoviewrender.js
@@ -0,0 +1,93 @@
+export function  TwoViewRender(render) {
+  let scope = this;
+
+  let renderer = null;
+
+  let windowWidth = null;
+	let windowHeight = null;
+  let renderScene = null;
+  let specilView,
+      specilCamera,
+      specilLeft,
+      specilBottom,
+      specilWidth,
+      specilHeight;
+
+  let views2 = [
+    {
+      left: 0,
+      bottom: 0,
+      width: 0.5,
+      height: 1,
+      background: new THREE.Color( 0.5, 0.5, 0.7 ),
+      eye: [ 3.7, 16, 26 ],
+      up: [3.7, 10 ,16 ],
+      fov: 60
+    },
+    {
+      left: 0.5,
+      bottom: 0,
+      width: 0.5,
+      height: 1,
+      background: new THREE.Color( 0.7, 0.5, 0.5 ),
+      eye: [ -60, 6,11],
+      up: [ -59, 5.9,11 ],
+      fov: 60
+    },
+  ];
+  for ( let ii = 0; ii < views2.length; ++ ii ) {
+
+    let view = views2[ ii ];
+    let camera = new THREE.PerspectiveCamera( view.fov, window.innerWidth / window.innerHeight, 1, 200 );
+    camera.position.fromArray( view.eye );
+    camera.lookAt( view.up[0],view.up[1],view.up[2] );
+    view.camera = camera;
+
+  }
+
+  this.initRender = function(render,dom,scene){
+
+    windowWidth = dom.offsetWidth ;
+    windowHeight = dom.offsetHeight;
+    renderScene = scene;
+
+    renderer = render;
+  }
+
+  this.changeRender = function(){
+    renderer.setClearColor(new THREE.Color(0x000000));
+    renderer.setSize(windowWidth, windowHeight);
+    renderer.sortObjects = true;
+  }
+
+  this.reSize = function(offsetWidth,offsetHeight){
+    windowWidth = window.innerWidth;
+    windowHeight = window.innerHeight;
+
+  }
+
+  this.update = function(){
+    for ( let ii = 0; ii < 2; ii ++ ) {
+
+      specilView = views2[ ii ];
+      specilCamera = specilView.camera;
+
+      // view.updateCamera( camera, scene, mouseX, mouseY );
+
+      specilLeft = Math.floor( windowWidth * specilView.left );
+      specilBottom = Math.floor( windowHeight * specilView.bottom );
+      specilWidth = Math.floor( windowWidth * specilView.width );
+      specilHeight = Math.floor( windowHeight * specilView.height );
+
+      renderer.setViewport( specilLeft,specilBottom,specilWidth,specilHeight );
+      renderer.setScissor( specilLeft,specilBottom,specilWidth,specilHeight );
+      renderer.setScissorTest( true );
+
+      specilCamera.aspect = specilWidth / specilHeight;
+      specilCamera.updateProjectionMatrix();
+
+      renderer.render( renderScene, specilCamera );
+
+    }
+  }
+}
diff --git a/src/jlmap3d/jl3dsimulation/connect/Jlmap3dSubscribe.js b/src/jlmap3d/jl3dsimulation/connect/Jlmap3dSubscribe.js
deleted file mode 100644
index b2e06c3d3..000000000
--- a/src/jlmap3d/jl3dsimulation/connect/Jlmap3dSubscribe.js
+++ /dev/null
@@ -1,744 +0,0 @@
-import StompClient from '@/utils/sock';
-
-// import { getTrainingCbtcDemon, runDiagramStart, runDiagramOver, setTrainingCbtcInitTime } from '@/api/simulation';
-// import { creatSubscribe, clearSubscribe, displayTopic, screenTopic } from '@/utils/stomp';
-import { getBaseUrl } from '@/utils/baseUrl'
-import { getToken } from '@/utils/auth';
-
-// 定于仿真socket接口
-export function Jlmap3dSubscribe(jlmap3d,routegroup,jsonwebwork) {
-
-	const scope = this;
-	this.map = null;
-
-	var trainlisttest = null;
-	var sectionlist = null;
-	var signallist = null;
-	var stationstandlist = null;
-	var sectionlist = null;
-	var materials = null;
-	var actions = null;
-	var rails = null;
-	var links = null;
-
-	var scenes = null;
-
-	var code = null;
-
-	var drivingcode = null;
-	var drivingspeed = null;
-	var drivingaptspeed = null;
-
-	let driverswitch = false;
-
-	let stoptimer = null;
-	let num = 30;
-	let pointstand = null;
-
-	let data = null;
-	// run as plane = 01;
-	// reset = 02;
-
-	var datatype = '00';
-	this.teststomp = new StompClient();
-	this.topic = '/user/queue/simulation/jl3d/'+routegroup;
-	let header = {'X-Token': getToken() };
-		let connectmsg = {
-			type:'init',
-			baseurl:getBaseUrl(),
-			topic:this.topic,
-			token:getToken(),
-		};
-		jsonwebwork.postMessage(connectmsg);
-		jsonwebwork.onmessage = function (event) {
-			// console.log(event.data);
-			// if(event.data.type == 'Simulation_Driver_Change'){
-			// 	drivingcode = event.data.body.code;
-			// 	jlmap3d.updatedrivingcode( event.data.body.code);
-			// }
-			// if(data.type == 'Simulation_TrainSpeed'){
-			// 	trainspeed(data);
-			// }
-			// console.log(event);
-			// if(event.data.type == 'SJL3D_TrainStatus'){
-			// 	trainstatus(event.data);
-			// }
-			// if(event.data.type == 'Simulation_DeviceStatus'){
-			// 	devicestatus(event.data);
-			// }
-			// console.log(data);
-			if(event.data._type == 'Simulation_Driver_Change'){
-				drivingcode = event.data.body.code;
-				jlmap3d.updatedrivingcode( event.data.body.code);
-			}
-			if(event.data._type == 'Train'){
-				trainstatus(event.data);
-			}
-			if (event.data._type== 'Signal' && signallist) {
-				// console.log(event.data);
-				signalupdate(event.data);
-			}
-
-			if (event.data._type== 'StationStand' && actions) {
-				// console.log(event.data);
-				standupdate(event.data);
-			}
-
-			if (event.data._type == 'Switch' && sectionlist) {
-				// console.log(event.data);
-				switchupdate(event.data);
-			}
-			// if(event.data._type = ''){
-			// 	trainstatus(event.data);
-			// }
-			// if(event.data.type == 'Simulation_DeviceStatus'){
-			// 	devicestatus(event.data);
-			// }
-			if(event.data.type == 'Simulation_Reset'){
-				simulationreset(event.data);
-			}
-		};
-
-	// jsonwebwork.onmessage = function (event) {
-	// 	console.log(event.data);
-	// 	if(event.data.type == 'Simulation_Driver_Change'){
-	// 		drivingcode = event.data.body.code;
-	// 		jlmap3d.updatedrivingcode( event.data.body.code);
-	// 	}
-	// 	// if(event.data.type == 'Simulation_TrainSpeed'){
-	// 	// 	trainspeed(event.data);
-	// 	// }
-	// 	if(event.data.type == 'SJL3D_TrainStatus'){
-	// 		trainstatus(event.data);
-	// 	}
-	// 	if(event.data.type == 'Simulation_DeviceStatus'){
-	// 		devicestatus(event.data);
-	// 	}
-	// 	if(event.data.type == 'Simulation_Reset'){
-	// 		simulationreset(event.data);
-	// 	}
-	// };
-
-	this.updatamap = function(newsectionlist,newlinklist,newsignallist,newstationstandlist,newtrainlisttest,newrealsectionlist,newrails, materiallist, nowaction, scene) {
-		// console.log(mapdata);
-
-		trainlisttest = newtrainlisttest;
-		sectionlist = newsectionlist;
-		signallist = newsignallist;
-		stationstandlist = newstationstandlist;
-		materials = materiallist;
-		scenes = scene;
-		actions = nowaction;
-		links = newlinklist;
-		rails = newrails;
-
-	};
-
-	this.socketon = function(topic) {
-		try {
-			// console.log("teststomp");
-			// scope.teststomp.subscribe(topic, callback, header);
-		} catch (error) {
-			console.error('websocket订阅失败');
-		}
-
-	};
-
-	this.socketoff = function(topic) {
-		scope.teststomp.unsubscribe(topic);
-		for (let i=0; i<trainlisttest.group.children.length; i++) {
-			if (trainlisttest.group.children[i].dispose == false) {
-				code = trainlisttest.group.children[i].name;
-				trainlisttest.list[code].rotation.y = 0;
-				trainlisttest.list[code].doorStatus = '01';
-				trainlisttest.list[code].speed = 0;
-				trainlisttest.group.children[i].dispose = true;
-				trainlisttest.group.children[i].position.x = -50000;
-				trainlisttest.group.children[i].position.y = -50000;
-
-				trainlisttest.group.remove(trainlisttest.group.children[i]);
-				i--;
-			}
-		}
-	};
-
-	// 仿真socket接口回调函数
-	function callback(Response) {
-
-	}
-
-	function trainspeed(data){
-		if (trainlisttest) {
-
-			for (let tl = 0; tl<data.body.length; tl++) {
-				code = data.body[tl].id;
-				if(trainlisttest.list[code].speed != data.body[tl].v){
-					trainlisttest.list[code].speed = data.body[tl].v;
-					trainlisttest.list[code].speeds = parseFloat(data.body[tl].v*10/36/18/trainlisttest.list[code].len);
-				}
-			}
-		}
-	}
-
-	function trainstatus(data){
-		// for (let i=data.body.length-1; i>=0; i--) {
-			// console.log(data.body[i]);
-
-				// console.log(data);
-				// 遍历列车对象组
-				if (trainlisttest) {
-					code = data.code;
-					// 剔除不显示的车
-					// 找到对应列车
-
-
-					if ( trainlisttest.list[code]) {
-
-						trainlisttest.list[code].runMode = data.runMode;
-						// 车门开关验证
-						// if(data.directionType == "02"){
-						if (trainlisttest.list[code].doorStatus != data.doorStatus && data.doorStatus == '01') {
-							// console.log("close");
-							trainlisttest.list[code].doorStatus = '01';
-							for (let an=actions[code].top.length-1; an>=0; an--) {
-								actions[code].top[an].reset();
-								actions[code].top[an].time = actions[code].top[an]._clip.duration;
-								actions[code].top[an].timeScale = -1;
-								actions[code].top[an].play();
-							}
-						} else if (trainlisttest.list[code].doorStatus != data.doorStatus && data.doorStatus == '02') {
-							// console.log("open");
-							trainlisttest.list[code].doorStatus = '02';
-							for (let an=actions[code].top.length-1; an>=0; an--) {
-								actions[code].top[an].reset();
-								actions[code].top[an].time = 0;
-								actions[code].top[an].timeScale = 1;
-								actions[code].top[an].play();
-							}
-						}
- 						//   if(trainlisttest.list[code].doorStatus != data.doorStatus && data.doorStatus == "01"){
-						//     //console.log("close");
-						//     trainlisttest.list[code].doorStatus = "01";
-						//     for(let an=actions[code].down.length-1;an>=0;an--){
-						//       actions[code].down[an].reset();
-						//       actions[code].down[an].time = actions[code].top[an]._clip.duration;
-						//       actions[code].down[an].timeScale = -1;
-						//       actions[code].down[an].play();
-						//     }
-						//   }else if(trainlisttest.list[code].doorStatus != data.doorStatus && data.doorStatus == "02"){
-						//     //console.log("open");
-						//     trainlisttest.list[code].doorStatus = "02";
-						//     for(let an=actions[code].down.length-1;an>=0;an--){
-						//       actions[code].down[an].reset();
-						//       actions[code].down[an].time = 0;
-						//       actions[code].down[an].timeScale = 1;
-						//       actions[code].down[an].play();
-						//     }
-						//   }
-						// }
-						// 遍历获取所在轨道
-						if (trainlisttest.list[code].dispose != data.dispose && data.dispose == false) {
-
-							if (rails.linkrail[data.linkCode]) {
-								trainlisttest.group.add(trainlisttest.list[code]);
-								trainlisttest.list[code].position.y = 0;
-								// trainlisttest.list[code].progress = 0;
-								trainlisttest.list[code].dispose = false;
-								trainlisttest.list[code].nowcode = data.linkCode;
-								trainlisttest.list[code].nextcode = null;
-								trainlisttest.list[code].pc = 1;
-
-								if(trainlisttest.list[code].mixerpush == false){
-									for(let mi=0,lenmi=trainlisttest.list[code].mixer.length;mi<lenmi;mi++){
-										jlmap3d.mixers.push(trainlisttest.list[code].mixer[mi]);
-									}
-									trainlisttest.list[code].mixerpush = true;
-									// console.log(trainlisttest.list[code].mixerpush);
-								}
-
-								if (data.directionType == '02') { // 向右
-
-
-									if(data.targetStation){
-										trainlisttest.list[code].stopstation = data.targetStation;
-										// console.log(rails.stops[data.targetStation].direct2.percent);
-										trainlisttest.list[code].pc = data.targetLinkPercent/rails.stops[data.targetStation].direct2.percent;
-										trainlisttest.list[code].targetpercent = rails.stops[data.targetStation].direct2.percent;
-										trainlisttest.list[code].progress = data.linkOffsetPercent/trainlisttest.list[code].pc;
-										trainlisttest.list[code].linkOffsetPercent = data.linkOffsetPercent;
-										trainlisttest.list[code].targetLink = data.targetLink;
-										// console.log(data.targetLinkPercent);
-										// console.log(rails.stops[data.targetStation].direct2.percent);
-										// console.log(trainlisttest.list[code].progress);
-										// console.log("===================");
-										let point = rails.linkrail[data.linkCode].lineleft.getPointAt(trainlisttest.list[code].progress);
-										trainlisttest.list[code].rotation.y = 0;
-										trainlisttest.list[code].position.x = point.x;
-										trainlisttest.list[code].position.y = 0;
-										for (let tl=0; tl<6; tl++) {
-											trainlisttest.list[code].children[tl].position.z = point.z;
-										}
-
-									}else{
-										trainlisttest.list[code].progress = data.linkOffsetPercent/trainlisttest.list[code].pc;
-										trainlisttest.list[code].linkOffsetPercent = data.linkOffsetPercent;
-										let point = rails.linkrail[data.linkCode].lineleft.getPointAt(trainlisttest.list[code].progress);
-										trainlisttest.list[code].rotation.y = 0;
-										trainlisttest.list[code].position.x = point.x;
-										trainlisttest.list[code].position.y = 0;
-										for (let tl=0; tl<6; tl++) {
-											trainlisttest.list[code].children[tl].position.z = point.z;
-										}
-									}
-
-									trainlisttest.list[code].curve = rails.linkrail[data.linkCode].lineleft;
-									trainlisttest.list[code].len = rails.linkrail[data.linkCode].lengthfact;
-									trainlisttest.list[code].status = '02';
-								} else if (data.directionType == '03') { // 向左
-
-									// if(trainlisttest.list[code].rname == "006"){
-									// 	console.log("0000000000000000");
-									// 	console.log(data.linkOffsetPercent);
-									// }
-									if(data.targetStation){
-
-										trainlisttest.list[code].stopstation = data.targetStation;
-										trainlisttest.list[code].pc = data.targetLinkPercent/rails.stops[data.targetStation].direct1.percent;
-										trainlisttest.list[code].targetpercent = rails.stops[data.targetStation].direct1.percent;
-										trainlisttest.list[code].progress = 1-(data.linkOffsetPercent/trainlisttest.list[code].pc);
-										trainlisttest.list[code].linkOffsetPercent = data.linkOffsetPercent;
-										trainlisttest.list[code].targetLink = data.targetLink;
-										// console.log(data.targetLinkPercent);
-										// console.log(rails.stops[data.targetStation].direct1.percent);
-										// console.log(trainlisttest.list[code].progress);
-										// console.log("===================");
-										let point = rails.linkrail[data.linkCode].lineright.getPointAt(trainlisttest.list[code].progress);
-
-										trainlisttest.list[code].rotation.y = Math.PI;
-										trainlisttest.list[code].position.x = point.x;
-										trainlisttest.list[code].position.y = 0;
-										for (let tl=0; tl<6; tl++) {
-											trainlisttest.list[code].children[tl].position.z = -point.z;
-										}
-									}else{
-										trainlisttest.list[code].progress = data.linkOffsetPercent/trainlisttest.list[code].pc;
-										trainlisttest.list[code].linkOffsetPercent = data.linkOffsetPercent;
-										let point = rails.linkrail[data.linkCode].lineleft.getPointAt(trainlisttest.list[code].progress);
-										trainlisttest.list[code].rotation.y = 0;
-										trainlisttest.list[code].position.x = point.x;
-										trainlisttest.list[code].position.y = 0;
-										for (let tl=0; tl<6; tl++) {
-											trainlisttest.list[code].children[tl].position.z = point.z;
-										}
-									}
-
-									trainlisttest.list[code].curve = rails.linkrail[data.linkCode].lineright;
-									trainlisttest.list[code].len = rails.linkrail[data.linkCode].lengthfact;
-									trainlisttest.list[code].status = '03';
-
-									// trainlisttest.list[code].curve = rails.linkrail[data.linkCode].lineright;
-								}
-
-
-								trainlisttest.list[code].len = rails.linkrail[data.linkCode].lengthfact;
-								// trainlisttest.list[code].isStandTrack = sectionlist.sections.datalist[data.sectionCode].isStandTrack;
-
-								// trainlisttest.list[code].len = sectionlist.sections.datalist[data.sectionCode].distance;
-
-								if(trainlisttest.list[code].targetLink == trainlisttest.list[code].nowcode){
-									trainlisttest.list[code].statsstop = 0;
-								}else{
-									trainlisttest.list[code].statsstop = 1;
-								}
-								if(data.speed == 0){
-									trainlisttest.list[code].speeds = data.speed;
-									trainlisttest.list[code].speeds = 0;
-									// trainlisttest.list[code].startmark = 1;
-								}else{
-									trainlisttest.list[code].speeds = data.speed;
-									trainlisttest.list[code].speeds = parseFloat(data.speed*10/36/18/trainlisttest.list[code].len);
-								}
-
-							}
-						} else if (trainlisttest.list[code].dispose != data.dispose && data.dispose == true) {
-							trainlisttest.group.remove(trainlisttest.list[code]);
-							trainlisttest.list[code].progress = null;
-							trainlisttest.list[code].dispose = true;
-							code = trainlisttest.group.children[i].name;
-							trainlisttest.list[code].rotation.y = 0;
-							trainlisttest.list[code].doorStatus = '01';
-							trainlisttest.list[code].speed = 0;
-							trainlisttest.list[code].position.x = -50000;
-							trainlisttest.list[code].position.y = -50000;
-							trainlisttest.list[code].pc = 1;
-
-						} else if (trainlisttest.list[code].dispose == data.dispose && data.dispose == false) {
-
-							// if(data.){
-							//
-							// }
-							if (data.directionType == '02' && trainlisttest.list[code].status != data.directionType) { // 向右
-
-
-								let rotaposx = trainlisttest.list[code].children[5].matrixWorld.elements[12];
-								let rotaposz = trainlisttest.list[code].children[0].matrixWorld.elements[14];
-								trainlisttest.list[code].rotation.y = 0;
-								trainlisttest.list[code].position.x = rotaposx;
-								for (let tl=0; tl<6; tl++) {
-									trainlisttest.list[code].children[tl].position.z = rotaposz;
-								}
-
-								trainlisttest.list[code].progress = (rotaposx-rails.linkrail[data.linkCode].lp.x)/rails.linkrail[data.linkCode].lengthfact;
-								trainlisttest.list[code].status = '02';
-								trainlisttest.list[code].curve = rails.linkrail[data.linkCode].lineleft;
-								trainlisttest.list[code].nextcurve = null;
-
-								trainlisttest.list[code].len = rails.linkrail[data.linkCode].lengthfact;
-
-							} else if (data.directionType == '03'&& trainlisttest.list[code].status != data.directionType) { // 向左
-
-								let rotaposx = trainlisttest.list[code].children[5].matrixWorld.elements[12];
-								let rotaposz = Math.abs(trainlisttest.list[code].children[0].matrixWorld.elements[14]);
-								trainlisttest.list[code].rotation.y = Math.PI;
-								trainlisttest.list[code].position.x = rotaposx;
-								for (let tl=0; tl<6; tl++) {
-									trainlisttest.list[code].children[tl].position.z = -rotaposz;
-								}
-								trainlisttest.list[code].progress = 1-(rotaposx-rails.linkrail[data.linkCode].lp.x)/rails.linkrail[data.linkCode].lengthfact;
-								trainlisttest.list[code].status = '03';
-								trainlisttest.list[code].curve = rails.linkrail[data.linkCode].lineright;
-								trainlisttest.list[code].nextcurve = null;
-
-								trainlisttest.list[code].len = rails.linkrail[data.linkCode].lengthfact;
-
-							}
-
-
-							if(trainlisttest.list[code].nextcode == null ){//&& trainlisttest.list[code].stopstation == data.targetStation
-								// if(data.groupNumber == "016"){
-								// 	console.log(trainlisttest.list[code].nextcode);
-								// 	console.log(trainlisttest.list[code].stopstation);
-								// 	console.log(data.targetStation);
-								// 	console.log(data.body[i]);
-								// 	console.log(trainlisttest.list[code]);
-								// }
-								// if(trainlisttest.list[code].targetLink != trainlisttest.list[code].nowcode){
-									let nextcode;
-									if(data.directionType == '02'){
-
-										trainlisttest.list[code].status = '02';
-											// console.log(rails.linkrail[trainlisttest.list[code].nowcode]);
-
-										if(rails.linkrail[trainlisttest.list[code].nowcode]){
-											nextcode = rails.linkrail[trainlisttest.list[code].nowcode].rconnect;
-										}
-
-										if(nextcode){
-											trainlisttest.list[code].nextcurve = rails.linkrail[nextcode].lineleft;
-											trainlisttest.list[code].nextlen = rails.linkrail[nextcode].lengthfact;
-										}else{
-
-											trainlisttest.list[code].nextlen = 0;
-										}
-									}else if(data.directionType == '03'){
-
-										trainlisttest.list[code].status = '03';
-										if(rails.linkrail[trainlisttest.list[code].nowcode]){
-											nextcode = rails.linkrail[trainlisttest.list[code].nowcode].lconnect;
-										}
-										if(nextcode){
-											trainlisttest.list[code].nextcurve = rails.linkrail[nextcode].lineright;
-											trainlisttest.list[code].nextlen = rails.linkrail[nextcode].lengthfact;
-										}else{
-
-											trainlisttest.list[code].nextlen = 0;
-										}
-									}
-									trainlisttest.list[code].nextcode = nextcode;
-
-								// }
-
-								if(trainlisttest.list[code].curve == null){
-									trainlisttest.list[code].len = trainlisttest.list[code].nextlen;
-	                trainlisttest.list[code].nowcode = trainlisttest.list[code].nextcode;
-	                trainlisttest.list[code].curve = trainlisttest.list[code].nextcurve;
-	                trainlisttest.list[code].nextcurve = null;
-	                trainlisttest.list[code].nextlen = null;
-	                trainlisttest.list[code].nextcode = null;
-								}
-							}
-							if(data.groupNumber == "016"){
-								// console.log(data.targetLink);
-								// console.log(trainlisttest.list[code].nowcode);
-								//
-								// console.log(trainlisttest.list[code].progress);
-								// console.log("==============");
-							}
-							trainlisttest.list[code].targetLink = data.targetLink;
-							if(trainlisttest.list[code].stopstation != data.targetStation){
-
-								if(data.directionType == '02'){
-									if(data.targetStation){
-										trainlisttest.list[code].pc = data.targetLinkPercent/rails.stops[data.targetStation].direct2.percent;
-										trainlisttest.list[code].targetpercent = rails.stops[data.targetStation].direct2.percent;
-										// trainlisttest.list[code].linkOffsetPercent = data.linkOffsetPercent;
-										// trainlisttest.list[code].targetLink = data.targetLink;
-									}
-
-
-									trainlisttest.list[code].status = '02';
-								}else if(data.directionType == '03'){
-									if(data.targetStation){
-										trainlisttest.list[code].pc = data.targetLinkPercent/rails.stops[data.targetStation].direct1.percent;
-										trainlisttest.list[code].targetpercent = rails.stops[data.targetStation].direct1.percent;
-										// trainlisttest.list[code].linkOffsetPercent = data.linkOffsetPercent;
-										// trainlisttest.list[code].targetLink = data.targetLink;
-									}
-
-									trainlisttest.list[code].status = '03';
-
-								}
-								trainlisttest.list[code].stopstation = data.targetStation;
-
-							}
-
-
-						}
-					}
-
-					if(trainlisttest.list[code].targetLink == trainlisttest.list[code].nowcode){
-						trainlisttest.list[code].statsstop = 0;
-					}else{
-						trainlisttest.list[code].statsstop = 1;
-					}
-					// console.log(data.body[i]);
-
-					if(trainlisttest.list[code].speed != data.speed){
-						trainlisttest.list[code].speed = data.speed;
-						trainlisttest.list[code].speeds = parseFloat(data.speed*10/36/18/trainlisttest.list[code].len);
-					}
-				}
-		// }
-	}
-	function standupdate(data) {
-		code = data.code;
-		if ( actions[code]) {
-			if (data.screenDoorOpenStatus == '02' && actions[code].status == '01') {
-				actions[code].status = '00';
-			}
-			if (data.screenDoorOpenStatus == '02' && actions[code].status == '00') {
-				actions[code].status = '02';
-				actions[code].action.reset();
-				actions[code].action.time = 0;
-				actions[code].action.timeScale = 1;
-				actions[code].action.play();
-			}
-
-			if (data.screenDoorOpenStatus == '01' && actions[code].status == '02') {
-				actions[code].status = '00';
-			}
-			if (data.screenDoorOpenStatus == '01' && actions[code].status == '00') {
-				actions[code].status = '01';
-				actions[code].action.reset();
-				actions[code].action.time = actions[code].action._clip.duration;
-				actions[code].action.timeScale = -1;
-				actions[code].action.play();
-			}
-		}
-
-	}
-	function devicestatus(data){
-		for (let i= 0,leni = data.body.length; i<leni; i++) {
-			// 0xFFFFFF
-			// 0xCD0000  红
-			// 0xEEEE00  黄
-			// 0x32CD32  绿
-
-			if (data._type == 'Signal' && signallist) {
-				if (signallist) {
-					// console.log(data.body[i]);
-					signalupdate(data.body[i]);
-				}
-			}
-
-			if (data._type == 'StationStand' && actions) {
-				if (actions) {
-					standupdate(data.body[i]);
-				}
-			}
-
-			if (data._type == 'Switch' && sectionlist) {
-				if (sectionlist) {
-					switchupdate(data.body[i]);
-				}
-			}
-
-		}
-	}
-	function signalupdate(data) {
-		code = data.code;
-		// console.log(data);
-		if (data.lightType == '01') {
-			if (signallist.list[code].mesh.code) {
-				signallist.list[code].mesh.status = data.status;
-
-				// 55
-				// 33
-				// 77
-				// 关闭
-				if (data.status == '01') {
-					signallist.list[code].mesh.getObjectByName("red").material.map = materials[0];
-					signallist.list[code].mesh.getObjectByName("red").material.map.needsUpdate = true;
-					signallist.list[code].mesh.getObjectByName("yellow").material.map = materials[3];
-					signallist.list[code].mesh.getObjectByName("yellow").material.map.needsUpdate = true;
-					signallist.list[code].mesh.getObjectByName("green").material.map = materials[3];
-					signallist.list[code].mesh.getObjectByName("green").material.map.needsUpdate = true;
-
-				}
-				// 开放
-				if (data.status == '02') {
-					signallist.list[code].mesh.getObjectByName("red").material.map = materials[3];
-					signallist.list[code].mesh.getObjectByName("red").material.map.needsUpdate = true;
-					signallist.list[code].mesh.getObjectByName("yellow").material.map = materials[3];
-					signallist.list[code].mesh.getObjectByName("yellow").material.map.needsUpdate = true;
-					signallist.list[code].mesh.getObjectByName("green").material.map = materials[2];
-					signallist.list[code].mesh.getObjectByName("green").material.map.needsUpdate = true;
-				}
-
-				if (data.status == '03') {
-					signallist.list[code].mesh.getObjectByName("red").material.map = materials[3];
-					signallist.list[code].mesh.getObjectByName("red").material.map.needsUpdate = true;
-					signallist.list[code].mesh.getObjectByName("yellow").material.map = materials[1];
-					signallist.list[code].mesh.getObjectByName("yellow").material.map.needsUpdate = true;
-					signallist.list[code].mesh.getObjectByName("green").material.map = materials[3];
-					signallist.list[code].mesh.getObjectByName("green").material.map.needsUpdate = true;
-				}
-
-				// 引导
-				if (data.status == '03') {
-					signallist.list[code].mesh.getObjectByName("red").material.map = materials[0];
-					signallist.list[code].mesh.getObjectByName("red").material.map.needsUpdate = true;
-					signallist.list[code].mesh.getObjectByName("yellow").material.map = materials[1];
-					signallist.list[code].mesh.getObjectByName("yellow").material.map.needsUpdate = true;
-					signallist.list[code].mesh.getObjectByName("green").material.map = materials[3];
-					signallist.list[code].mesh.getObjectByName("green").material.map.needsUpdate = true;
-
-				}
-				// 封锁
-				if (data.status == '04') {
-					signallist.list[code].mesh.getObjectByName("red").material.map = materials[3];
-					signallist.list[code].mesh.getObjectByName("red").material.map.needsUpdate = true;
-					signallist.list[code].mesh.getObjectByName("yellow").material.map = materials[3];
-					signallist.list[code].mesh.getObjectByName("yellow").material.map.needsUpdate = true;
-					signallist.list[code].mesh.getObjectByName("green").material.map = materials[3];
-					signallist.list[code].mesh.getObjectByName("green").material.map.needsUpdate = true;
-
-				}
-				// 故障
-				if (data.status == '05') {
-					signallist.list[code].mesh.getObjectByName("red").material.map = materials[3];
-					signallist.list[code].mesh.getObjectByName("red").material.map.needsUpdate = true;
-					signallist.list[code].mesh.getObjectByName("yellow").material.map = materials[3];
-					signallist.list[code].mesh.getObjectByName("yellow").material.map.needsUpdate = true;
-					signallist.list[code].mesh.getObjectByName("green").material.map = materials[3];
-					signallist.list[code].mesh.getObjectByName("green").material.map.needsUpdate = true;
-
-				}
-				if (data.status == '06') {
-					signallist.list[code].mesh.getObjectByName("red").material.map = materials[3];
-					signallist.list[code].mesh.getObjectByName("red").material.map.needsUpdate = true;
-					signallist.list[code].mesh.getObjectByName("yellow").material.map = materials[3];
-					signallist.list[code].mesh.getObjectByName("yellow").material.map.needsUpdate = true;
-					signallist.list[code].mesh.getObjectByName("green").material.map = materials[3];
-					signallist.list[code].mesh.getObjectByName("green").material.map.needsUpdate = true;
-
-				}
-
-			}
-
-		} else if (data.lightType == '01') {
-			if (signallist.list[code].mesh.code) {
-				signallist.list[code].mesh.getObjectByName("red").material.map = materials[3];
-				signallist.list[code].mesh.getObjectByName("red").material.map.needsUpdate = true;
-				signallist.list[code].mesh.getObjectByName("yellow").material.map = materials[3];
-				signallist.list[code].mesh.getObjectByName("yellow").material.map.needsUpdate = true;
-				signallist.list[code].mesh.getObjectByName("green").material.map = materials[3];
-				signallist.list[code].mesh.getObjectByName("green").material.map.needsUpdate = true;
-
-			}
-
-		}
-
-	}
-
-	function switchupdate(data) {
-		code = data.code;
-		for (let j=sectionlist.switchs.modellist.length-1; j>=0; j--) {
-			if (rails.switchrail[code]) {
-				if (rails.switchrail[code].locateType != data.locateType) {
-					if (data.locateType == '02') {
-						if (actions[sectionlist.switchs.modellist[j].code]) {
-							sectionlist.switchs.modellist[j].locateType = data.locateType;
-							actions[sectionlist.switchs.modellist[j].code].reset();
-							actions[sectionlist.switchs.modellist[j].code].time = 0;
-							actions[sectionlist.switchs.modellist[j].code].timeScale = 1;
-							actions[sectionlist.switchs.modellist[j].code].play();
-						}
-
-						rails.switchrail[code].locateType = "02";
-
-						let testswitch = rails.switchrail[code];
-						// console.log(testswitch);
-						// console.log(rails.linkrail[testswitch.alink]);
-						// console.log(rails.linkrail[testswitch.clink]);
-						if(rails.switchrail[code].directtype == "1"){
-							rails.linkrail[testswitch.alink].lconnect = testswitch.clink;
-				      rails.linkrail[testswitch.clink].rconnect = testswitch.alink;
-						}else if(rails.switchrail[code].directtype == "2"){
-							rails.linkrail[testswitch.alink].rconnect = testswitch.clink;
-				      rails.linkrail[testswitch.clink].lconnect = testswitch.alink;
-						}
-
-					} else if (data.locateType == '01') {
-						if (actions[sectionlist.switchs.modellist[j].code]) {
-							sectionlist.switchs.modellist[j].locateType = data.locateType;
-							actions[sectionlist.switchs.modellist[j].code].reset();
-							actions[sectionlist.switchs.modellist[j].code].time = actions[sectionlist.switchs.modellist[j].code]._clip.duration;
-							actions[sectionlist.switchs.modellist[j].code].timeScale = -1;
-							actions[sectionlist.switchs.modellist[j].code].play();
-						}
-
-						rails.switchrail[code].locateType = "01";
-						let testswitch = rails.switchrail[code];
-						// console.log(testswitch);
-						// console.log(rails.linkrail[testswitch.alink]);
-						// console.log(rails.linkrail[testswitch.clink]);
-						if(rails.switchrail[code].directtype == "1"){
-							rails.linkrail[testswitch.alink].lconnect = testswitch.blink;
-				      rails.linkrail[testswitch.blink].rconnect = testswitch.alink;
-						}else if(rails.switchrail[code].directtype == "2"){
-							rails.linkrail[testswitch.alink].rconnect = testswitch.blink;
-				      rails.linkrail[testswitch.blink].lconnect = testswitch.alink;
-						}
-
-					}
-				}
-				j = 0;
-			}
-		}
-	}
-	function simulationreset(data){
-		for(let i=0;i<trainlisttest.group.children.length;i++){
-			trainlisttest.group.children[i].dispose = true;
-			trainlisttest.group.children[i].stopstation = null;
-			trainlisttest.group.children[i].pc = null;
-			trainlisttest.group.children[i].targetpercent = null;
-			trainlisttest.group.children[i].progress = null;
-			trainlisttest.group.children[i].linkOffsetPercent = null;
-			trainlisttest.group.children[i].targetLink = null;
-			trainlisttest.group.remove(trainlisttest.group.children[i]);
-			i--;
-		}
-
-	}
-}
diff --git a/src/jlmap3d/jl3dsimulation/connect/Jlmap3dSubscribeNew.js b/src/jlmap3d/jl3dsimulation/connect/Jlmap3dSubscribeNew.js
index ed06590b2..a6af57bc2 100644
--- a/src/jlmap3d/jl3dsimulation/connect/Jlmap3dSubscribeNew.js
+++ b/src/jlmap3d/jl3dsimulation/connect/Jlmap3dSubscribeNew.js
@@ -530,68 +530,71 @@ export function Jlmap3dSubscribeNew(jlmap3d,routegroup,jsonwebwork) {
 			}else if(data[i].deviceType == "PSD"){
 				initstand(data[i]);
 			}else{
-				console.log(data[i]);
+
 			}
 		}
 	}
 
 	function DeviceDestroy(data){
-		for(let i=0,leni=data.body.deviceList.length;i<leni;i++){
+		if(data.body.deviceList.length){
+			for(let i=0,leni=data.body.deviceList.length;i<leni;i++){
 
-			if(data.body.deviceList[i].type == "TRAIN"){
-				code =data.body.deviceList[i].code;
-				if (trainlisttest.list[code].dispose != data.body.deviceList[i].dispose && data.body.deviceList[i].dispose == "0") {
+				if(data.body.deviceList[i].type == "TRAIN"){
+					code =data.body.deviceList[i].code;
+					if (trainlisttest.list[code].dispose != data.body.deviceList[i].dispose && data.body.deviceList[i].dispose == "0") {
 
-					if (rails.sectionrail[data.body.deviceList[i].section]) {
+						if (rails.sectionrail[data.body.deviceList[i].section]) {
 
-						trainlisttest.group.add(trainlisttest.list[code]);
-						trainlisttest.list[code].position.y = 0;
-						// trainlisttest.list[code].progress = 0;
-						trainlisttest.list[code].dispose = "0";
-						trainlisttest.list[code].nowcode = data.body.deviceList[i].section;
-						trainlisttest.list[code].nextcode = null;
+							trainlisttest.group.add(trainlisttest.list[code]);
+							trainlisttest.list[code].position.y = 0;
+							// trainlisttest.list[code].progress = 0;
+							trainlisttest.list[code].dispose = "0";
+							trainlisttest.list[code].nowcode = data.body.deviceList[i].section;
+							trainlisttest.list[code].nextcode = null;
+							trainlisttest.list[code].curve = null;
+							trainlisttest.list[code].nextcurve = null;
+							trainlisttest.list[code].pc = 1;
+
+							if(trainlisttest.list[code].mixerpush == false){
+
+								for(let mi=0,lenmi=trainlisttest.list[code].mixer.length;mi<lenmi;mi++){
+									jlmap3d.mixers.push(trainlisttest.list[code].mixer[mi]);
+								}
+								trainlisttest.list[code].mixerpush = true;
+							}
+						}
+					} else if (trainlisttest.list[code].dispose != data.body.deviceList[i].dispose && data.body.deviceList[i].dispose == "1") {
+						trainlisttest.list[code].status = 1;
+						trainlisttest.group.remove(trainlisttest.list[code]);
+						trainlisttest.list[code].progress = null;
+						trainlisttest.list[code].dispose = "1";
+						code = trainlisttest.group.children[i].name;
+						trainlisttest.list[code].rotation.y = 0;
+						trainlisttest.list[code].open = '1';
 						trainlisttest.list[code].curve = null;
 						trainlisttest.list[code].nextcurve = null;
+						trainlisttest.list[code].speed = 0;
+						trainlisttest.list[code].position.x = -50000;
+						trainlisttest.list[code].position.y = -50000;
 						trainlisttest.list[code].pc = 1;
 
-						if(trainlisttest.list[code].mixerpush == false){
-
-							for(let mi=0,lenmi=trainlisttest.list[code].mixer.length;mi<lenmi;mi++){
-								jlmap3d.mixers.push(trainlisttest.list[code].mixer[mi]);
-							}
-							trainlisttest.list[code].mixerpush = true;
-						}
 					}
-				} else if (trainlisttest.list[code].dispose != data.body.deviceList[i].dispose && data.body.deviceList[i].dispose == "1") {
-					trainlisttest.list[code].status = 1;
-					trainlisttest.group.remove(trainlisttest.list[code]);
-					trainlisttest.list[code].progress = null;
-					trainlisttest.list[code].dispose = "1";
-					code = trainlisttest.group.children[i].name;
-					trainlisttest.list[code].rotation.y = 0;
-					trainlisttest.list[code].open = '1';
-					trainlisttest.list[code].curve = null;
-					trainlisttest.list[code].nextcurve = null;
-					trainlisttest.list[code].speed = 0;
-					trainlisttest.list[code].position.x = -50000;
-					trainlisttest.list[code].position.y = -50000;
-					trainlisttest.list[code].pc = 1;
-
+				}
+				if(data.body.deviceList[i].type == "SIGNAL"){
+					signalupdate(data.body.deviceList[i]);
+				}
+				if(data.body.deviceList[i].type == "SWITCH"){
+					switchupdate(data.body.deviceList[i]);
+				}
+				if(data.body.deviceList[i].type == "PSD"){
+					standupdate(data.body.deviceList[i]);
+				}
+				if(data.body.deviceList[i].type == "TRAIN_DOOR"){
+					traindoorupdate(data.body.deviceList[i]);
 				}
 			}
-			if(data.body.deviceList[i].type == "SIGNAL"){
-				signalupdate(data.body.deviceList[i]);
-			}
-			if(data.body.deviceList[i].type == "SWITCH"){
-				switchupdate(data.body.deviceList[i]);
-			}
-			if(data.body.deviceList[i].type == "PSD"){
-				standupdate(data.body.deviceList[i]);
-			}
-			if(data.body.deviceList[i].type == "TRAIN_DOOR"){
-				traindoorupdate(data.body.deviceList[i]);
-			}
 		}
+
 	}
 
 	function traindoorupdate(data){
diff --git a/src/jlmap3d/jl3dsimulation/connect/TrainingConnect.js b/src/jlmap3d/jl3dsimulation/connect/TrainingConnect.js
deleted file mode 100644
index d7013f4ff..000000000
--- a/src/jlmap3d/jl3dsimulation/connect/TrainingConnect.js
+++ /dev/null
@@ -1,744 +0,0 @@
-import StompClient from '@/utils/sock';
-
-// import { getTrainingCbtcDemon, runDiagramStart, runDiagramOver, setTrainingCbtcInitTime } from '@/api/simulation';
-// import { creatSubscribe, clearSubscribe, displayTopic, screenTopic } from '@/utils/stomp';
-import { getBaseUrl } from '@/utils/baseUrl'
-import { getToken } from '@/utils/auth';
-
-// 定于仿真socket接口
-export function Jlmap3dSubscribe(jlmap3d,routegroup,jsonwebwork) {
-
-	const scope = this;
-	this.map = null;
-
-	var trainlisttest = null;
-	var sectionlist = null;
-	var signallist = null;
-	var stationstandlist = null;
-	var sectionlist = null;
-	var materials = null;
-	var actions = null;
-	var rails = null;
-	var links = null;
-
-	var scenes = null;
-
-	var code = null;
-
-	var drivingcode = null;
-	var drivingspeed = null;
-	var drivingaptspeed = null;
-
-	let driverswitch = false;
-
-	let stoptimer = null;
-	let num = 30;
-	let pointstand = null;
-
-	let data = null;
-	// run as plane = 01;
-	// reset = 02;
-
-	var datatype = '00';
-	this.teststomp = new StompClient();
-	this.topic = '/user/queue/simulation/jl3d/'+routegroup;
-	let header = {'X-Token': getToken() };
-		let connectmsg = {
-			type:'init',
-			baseurl:getBaseUrl(),
-			topic:this.topic,
-			token:getToken(),
-		};
-		jsonwebwork.postMessage(connectmsg);
-		jsonwebwork.onmessage = function (event) {
-
-			// if(event.data.type == 'Simulation_Driver_Change'){
-			// 	drivingcode = event.data.body.code;
-			// 	jlmap3d.updatedrivingcode( event.data.body.code);
-			// }
-			// if(data.type == 'Simulation_TrainSpeed'){
-			// 	trainspeed(data);
-			// }
-			// console.log(event);
-			// if(event.data.type == 'SJL3D_TrainStatus'){
-			// 	trainstatus(event.data);
-			// }
-			// if(event.data.type == 'Simulation_DeviceStatus'){
-			// 	devicestatus(event.data);
-			// }
-			if(event.data._type == 'Simulation_Driver_Change'){
-				drivingcode = event.data.body.code;
-				jlmap3d.updatedrivingcode( event.data.body.code);
-			}
-			if(event.data._type == 'Train'){
-				// console.log(event.data);
-				trainstatus(event.data);
-			}
-			if (event.data._type== 'Signal' && signallist) {
-				// console.log(event.data);
-				signalupdate(event.data);
-			}
-
-			if (event.data._type== 'StationStand' && actions) {
-				// console.log(event.data);
-				standupdate(event.data);
-			}
-
-			if (event.data._type == 'Switch' && sectionlist) {
-				// console.log(event.data);
-				switchupdate(event.data);
-			}
-			// if(event.data._type = ''){
-			// 	trainstatus(event.data);
-			// }
-			// if(event.data.type == 'Simulation_DeviceStatus'){
-			// 	devicestatus(event.data);
-			// }
-			if(event.data.type == 'Simulation_Reset'){
-				simulationreset(event.data);
-			}
-		};
-
-	// jsonwebwork.onmessage = function (event) {
-	// 	console.log(event.data);
-	// 	if(event.data.type == 'Simulation_Driver_Change'){
-	// 		drivingcode = event.data.body.code;
-	// 		jlmap3d.updatedrivingcode( event.data.body.code);
-	// 	}
-	// 	// if(event.data.type == 'Simulation_TrainSpeed'){
-	// 	// 	trainspeed(event.data);
-	// 	// }
-	// 	if(event.data.type == 'SJL3D_TrainStatus'){
-	// 		trainstatus(event.data);
-	// 	}
-	// 	if(event.data.type == 'Simulation_DeviceStatus'){
-	// 		devicestatus(event.data);
-	// 	}
-	// 	if(event.data.type == 'Simulation_Reset'){
-	// 		simulationreset(event.data);
-	// 	}
-	// };
-
-	this.updatamap = function(newsectionlist,newlinklist,newsignallist,newstationstandlist,newtrainlisttest,newrealsectionlist,newrails, materiallist, nowaction, scene) {
-		// console.log(mapdata);
-
-		trainlisttest = newtrainlisttest;
-		sectionlist = newsectionlist;
-		signallist = newsignallist;
-		stationstandlist = newstationstandlist;
-		materials = materiallist;
-		scenes = scene;
-		actions = nowaction;
-		links = newlinklist;
-		rails = newrails;
-
-	};
-
-	this.socketon = function(topic) {
-		try {
-			// console.log("teststomp");
-			// scope.teststomp.subscribe(topic, callback, header);
-		} catch (error) {
-			console.error('websocket订阅失败');
-		}
-
-	};
-
-	this.socketoff = function(topic) {
-		scope.teststomp.unsubscribe(topic);
-		for (let i=0; i<trainlisttest.group.children.length; i++) {
-			if (trainlisttest.group.children[i].dispose == false) {
-				code = trainlisttest.group.children[i].name;
-				trainlisttest.list[code].rotation.y = 0;
-				trainlisttest.list[code].doorStatus = '01';
-				trainlisttest.list[code].speed = 0;
-				trainlisttest.group.children[i].dispose = true;
-				trainlisttest.group.children[i].position.x = -50000;
-				trainlisttest.group.children[i].position.y = -50000;
-
-				trainlisttest.group.remove(trainlisttest.group.children[i]);
-				i--;
-			}
-		}
-	};
-
-	// 仿真socket接口回调函数
-	function callback(Response) {
-
-	}
-
-	function trainspeed(data){
-		if (trainlisttest) {
-
-			for (let tl = 0; tl<data.body.length; tl++) {
-				code = data.body[tl].id;
-				if(trainlisttest.list[code].speed != data.body[tl].v){
-					trainlisttest.list[code].speed = data.body[tl].v;
-					trainlisttest.list[code].speeds = parseFloat(data.body[tl].v*10/36/18/trainlisttest.list[code].len);
-				}
-			}
-		}
-	}
-
-	function trainstatus(data){
-		// for (let i=data.body.length-1; i>=0; i--) {
-			// console.log(data.body[i]);
-
-				// console.log(data);
-				// 遍历列车对象组
-				if (trainlisttest) {
-					code = data.code;
-					// 剔除不显示的车
-					// 找到对应列车
-
-
-					if ( trainlisttest.list[code]) {
-
-						trainlisttest.list[code].runMode = data.runMode;
-						// 车门开关验证
-						// if(data.directionType == "02"){
-						if (trainlisttest.list[code].doorStatus != data.doorStatus && data.doorStatus == '01') {
-							// console.log("close");
-							trainlisttest.list[code].doorStatus = '01';
-							for (let an=actions[code].top.length-1; an>=0; an--) {
-								actions[code].top[an].reset();
-								actions[code].top[an].time = actions[code].top[an]._clip.duration;
-								actions[code].top[an].timeScale = -1;
-								actions[code].top[an].play();
-							}
-						} else if (trainlisttest.list[code].doorStatus != data.doorStatus && data.doorStatus == '02') {
-							// console.log("open");
-							trainlisttest.list[code].doorStatus = '02';
-							for (let an=actions[code].top.length-1; an>=0; an--) {
-								actions[code].top[an].reset();
-								actions[code].top[an].time = 0;
-								actions[code].top[an].timeScale = 1;
-								actions[code].top[an].play();
-							}
-						}
- 						//   if(trainlisttest.list[code].doorStatus != data.doorStatus && data.doorStatus == "01"){
-						//     //console.log("close");
-						//     trainlisttest.list[code].doorStatus = "01";
-						//     for(let an=actions[code].down.length-1;an>=0;an--){
-						//       actions[code].down[an].reset();
-						//       actions[code].down[an].time = actions[code].top[an]._clip.duration;
-						//       actions[code].down[an].timeScale = -1;
-						//       actions[code].down[an].play();
-						//     }
-						//   }else if(trainlisttest.list[code].doorStatus != data.doorStatus && data.doorStatus == "02"){
-						//     //console.log("open");
-						//     trainlisttest.list[code].doorStatus = "02";
-						//     for(let an=actions[code].down.length-1;an>=0;an--){
-						//       actions[code].down[an].reset();
-						//       actions[code].down[an].time = 0;
-						//       actions[code].down[an].timeScale = 1;
-						//       actions[code].down[an].play();
-						//     }
-						//   }
-						// }
-						// 遍历获取所在轨道
-						if (trainlisttest.list[code].dispose != data.dispose && data.dispose == false) {
-
-							if (rails.linkrail[data.linkCode]) {
-								trainlisttest.group.add(trainlisttest.list[code]);
-								trainlisttest.list[code].position.y = 0;
-								// trainlisttest.list[code].progress = 0;
-								trainlisttest.list[code].dispose = false;
-								trainlisttest.list[code].nowcode = data.linkCode;
-								trainlisttest.list[code].nextcode = null;
-								trainlisttest.list[code].pc = 1;
-
-								if(trainlisttest.list[code].mixerpush == false){
-									for(let mi=0,lenmi=trainlisttest.list[code].mixer.length;mi<lenmi;mi++){
-										jlmap3d.mixers.push(trainlisttest.list[code].mixer[mi]);
-									}
-									trainlisttest.list[code].mixerpush = true;
-									// console.log(trainlisttest.list[code].mixerpush);
-								}
-
-								if (data.directionType == '02') { // 向右
-
-
-									if(data.targetStation){
-										trainlisttest.list[code].stopstation = data.targetStation;
-										// console.log(rails.stops[data.targetStation].direct2.percent);
-										trainlisttest.list[code].pc = data.targetLinkPercent/rails.stops[data.targetStation].direct2.percent;
-										trainlisttest.list[code].targetpercent = rails.stops[data.targetStation].direct2.percent;
-										trainlisttest.list[code].progress = data.linkOffsetPercent/trainlisttest.list[code].pc;
-										trainlisttest.list[code].linkOffsetPercent = data.linkOffsetPercent;
-										trainlisttest.list[code].targetLink = data.targetLink;
-										// console.log(data.targetLinkPercent);
-										// console.log(rails.stops[data.targetStation].direct2.percent);
-										// console.log(trainlisttest.list[code].progress);
-										// console.log("===================");
-										let point = rails.linkrail[data.linkCode].lineleft.getPointAt(trainlisttest.list[code].progress);
-										trainlisttest.list[code].rotation.y = 0;
-										trainlisttest.list[code].position.x = point.x;
-										trainlisttest.list[code].position.y = 0;
-										for (let tl=0; tl<6; tl++) {
-											trainlisttest.list[code].children[tl].position.z = point.z;
-										}
-
-									}else{
-										trainlisttest.list[code].progress = data.linkOffsetPercent/trainlisttest.list[code].pc;
-										trainlisttest.list[code].linkOffsetPercent = data.linkOffsetPercent;
-										let point = rails.linkrail[data.linkCode].lineleft.getPointAt(trainlisttest.list[code].progress);
-										trainlisttest.list[code].rotation.y = 0;
-										trainlisttest.list[code].position.x = point.x;
-										trainlisttest.list[code].position.y = 0;
-										for (let tl=0; tl<6; tl++) {
-											trainlisttest.list[code].children[tl].position.z = point.z;
-										}
-									}
-
-									trainlisttest.list[code].curve = rails.linkrail[data.linkCode].lineleft;
-									trainlisttest.list[code].len = rails.linkrail[data.linkCode].lengthfact;
-									trainlisttest.list[code].status = '02';
-								} else if (data.directionType == '03') { // 向左
-
-									// if(trainlisttest.list[code].rname == "006"){
-									// 	console.log("0000000000000000");
-									// 	console.log(data.linkOffsetPercent);
-									// }
-									if(data.targetStation){
-
-										trainlisttest.list[code].stopstation = data.targetStation;
-										trainlisttest.list[code].pc = data.targetLinkPercent/rails.stops[data.targetStation].direct1.percent;
-										trainlisttest.list[code].targetpercent = rails.stops[data.targetStation].direct1.percent;
-										trainlisttest.list[code].progress = 1-(data.linkOffsetPercent/trainlisttest.list[code].pc);
-										trainlisttest.list[code].linkOffsetPercent = data.linkOffsetPercent;
-										trainlisttest.list[code].targetLink = data.targetLink;
-										// console.log(data.targetLinkPercent);
-										// console.log(rails.stops[data.targetStation].direct1.percent);
-										// console.log(trainlisttest.list[code].progress);
-										// console.log("===================");
-										let point = rails.linkrail[data.linkCode].lineright.getPointAt(trainlisttest.list[code].progress);
-
-										trainlisttest.list[code].rotation.y = Math.PI;
-										trainlisttest.list[code].position.x = point.x;
-										trainlisttest.list[code].position.y = 0;
-										for (let tl=0; tl<6; tl++) {
-											trainlisttest.list[code].children[tl].position.z = -point.z;
-										}
-									}else{
-										trainlisttest.list[code].progress = data.linkOffsetPercent/trainlisttest.list[code].pc;
-										trainlisttest.list[code].linkOffsetPercent = data.linkOffsetPercent;
-										let point = rails.linkrail[data.linkCode].lineleft.getPointAt(trainlisttest.list[code].progress);
-										trainlisttest.list[code].rotation.y = 0;
-										trainlisttest.list[code].position.x = point.x;
-										trainlisttest.list[code].position.y = 0;
-										for (let tl=0; tl<6; tl++) {
-											trainlisttest.list[code].children[tl].position.z = point.z;
-										}
-									}
-
-									trainlisttest.list[code].curve = rails.linkrail[data.linkCode].lineright;
-									trainlisttest.list[code].len = rails.linkrail[data.linkCode].lengthfact;
-									trainlisttest.list[code].status = '03';
-
-									// trainlisttest.list[code].curve = rails.linkrail[data.linkCode].lineright;
-								}
-
-
-								trainlisttest.list[code].len = rails.linkrail[data.linkCode].lengthfact;
-								// trainlisttest.list[code].isStandTrack = sectionlist.sections.datalist[data.sectionCode].isStandTrack;
-
-								// trainlisttest.list[code].len = sectionlist.sections.datalist[data.sectionCode].distance;
-
-								if(trainlisttest.list[code].targetLink == trainlisttest.list[code].nowcode){
-									trainlisttest.list[code].statsstop = 0;
-								}else{
-									trainlisttest.list[code].statsstop = 1;
-								}
-								if(data.speed == 0){
-									trainlisttest.list[code].speeds = data.speed;
-									trainlisttest.list[code].speeds = 0;
-									// trainlisttest.list[code].startmark = 1;
-								}else{
-									trainlisttest.list[code].speeds = data.speed;
-									trainlisttest.list[code].speeds = parseFloat(data.speed*10/36/18/trainlisttest.list[code].len);
-								}
-
-							}
-						} else if (trainlisttest.list[code].dispose != data.dispose && data.dispose == true) {
-							trainlisttest.group.remove(trainlisttest.list[code]);
-							trainlisttest.list[code].progress = null;
-							trainlisttest.list[code].dispose = true;
-							code = trainlisttest.group.children[i].name;
-							trainlisttest.list[code].rotation.y = 0;
-							trainlisttest.list[code].doorStatus = '01';
-							trainlisttest.list[code].speed = 0;
-							trainlisttest.list[code].position.x = -50000;
-							trainlisttest.list[code].position.y = -50000;
-							trainlisttest.list[code].pc = 1;
-
-						} else if (trainlisttest.list[code].dispose == data.dispose && data.dispose == false) {
-
-							// if(data.){
-							//
-							// }
-							if (data.directionType == '02' && trainlisttest.list[code].status != data.directionType) { // 向右
-
-
-								let rotaposx = trainlisttest.list[code].children[5].matrixWorld.elements[12];
-								let rotaposz = trainlisttest.list[code].children[0].matrixWorld.elements[14];
-								trainlisttest.list[code].rotation.y = 0;
-								trainlisttest.list[code].position.x = rotaposx;
-								for (let tl=0; tl<6; tl++) {
-									trainlisttest.list[code].children[tl].position.z = rotaposz;
-								}
-
-								trainlisttest.list[code].progress = (rotaposx-rails.linkrail[data.linkCode].lp.x)/rails.linkrail[data.linkCode].lengthfact;
-								trainlisttest.list[code].status = '02';
-								trainlisttest.list[code].curve = rails.linkrail[data.linkCode].lineleft;
-								trainlisttest.list[code].nextcurve = null;
-
-								trainlisttest.list[code].len = rails.linkrail[data.linkCode].lengthfact;
-
-							} else if (data.directionType == '03'&& trainlisttest.list[code].status != data.directionType) { // 向左
-
-								let rotaposx = trainlisttest.list[code].children[5].matrixWorld.elements[12];
-								let rotaposz = Math.abs(trainlisttest.list[code].children[0].matrixWorld.elements[14]);
-								trainlisttest.list[code].rotation.y = Math.PI;
-								trainlisttest.list[code].position.x = rotaposx;
-								for (let tl=0; tl<6; tl++) {
-									trainlisttest.list[code].children[tl].position.z = -rotaposz;
-								}
-								trainlisttest.list[code].progress = 1-(rotaposx-rails.linkrail[data.linkCode].lp.x)/rails.linkrail[data.linkCode].lengthfact;
-								trainlisttest.list[code].status = '03';
-								trainlisttest.list[code].curve = rails.linkrail[data.linkCode].lineright;
-								trainlisttest.list[code].nextcurve = null;
-
-								trainlisttest.list[code].len = rails.linkrail[data.linkCode].lengthfact;
-
-							}
-
-
-							if(trainlisttest.list[code].nextcode == null ){//&& trainlisttest.list[code].stopstation == data.targetStation
-								// if(data.groupNumber == "016"){
-								// 	console.log(trainlisttest.list[code].nextcode);
-								// 	console.log(trainlisttest.list[code].stopstation);
-								// 	console.log(data.targetStation);
-								// 	console.log(data.body[i]);
-								// 	console.log(trainlisttest.list[code]);
-								// }
-								// if(trainlisttest.list[code].targetLink != trainlisttest.list[code].nowcode){
-									let nextcode;
-									if(data.directionType == '02'){
-
-										trainlisttest.list[code].status = '02';
-											// console.log(rails.linkrail[trainlisttest.list[code].nowcode]);
-
-										if(rails.linkrail[trainlisttest.list[code].nowcode]){
-											nextcode = rails.linkrail[trainlisttest.list[code].nowcode].rconnect;
-										}
-
-										if(nextcode){
-											trainlisttest.list[code].nextcurve = rails.linkrail[nextcode].lineleft;
-											trainlisttest.list[code].nextlen = rails.linkrail[nextcode].lengthfact;
-										}else{
-
-											trainlisttest.list[code].nextlen = 0;
-										}
-									}else if(data.directionType == '03'){
-
-										trainlisttest.list[code].status = '03';
-										if(rails.linkrail[trainlisttest.list[code].nowcode]){
-											nextcode = rails.linkrail[trainlisttest.list[code].nowcode].lconnect;
-										}
-										if(nextcode){
-											trainlisttest.list[code].nextcurve = rails.linkrail[nextcode].lineright;
-											trainlisttest.list[code].nextlen = rails.linkrail[nextcode].lengthfact;
-										}else{
-
-											trainlisttest.list[code].nextlen = 0;
-										}
-									}
-									trainlisttest.list[code].nextcode = nextcode;
-
-								// }
-
-								if(trainlisttest.list[code].curve == null){
-									trainlisttest.list[code].len = trainlisttest.list[code].nextlen;
-	                trainlisttest.list[code].nowcode = trainlisttest.list[code].nextcode;
-	                trainlisttest.list[code].curve = trainlisttest.list[code].nextcurve;
-	                trainlisttest.list[code].nextcurve = null;
-	                trainlisttest.list[code].nextlen = null;
-	                trainlisttest.list[code].nextcode = null;
-								}
-							}
-							if(data.groupNumber == "016"){
-								// console.log(data.targetLink);
-								// console.log(trainlisttest.list[code].nowcode);
-								//
-								// console.log(trainlisttest.list[code].progress);
-								// console.log("==============");
-							}
-							trainlisttest.list[code].targetLink = data.targetLink;
-							if(trainlisttest.list[code].stopstation != data.targetStation){
-
-								if(data.directionType == '02'){
-									if(data.targetStation){
-										trainlisttest.list[code].pc = data.targetLinkPercent/rails.stops[data.targetStation].direct2.percent;
-										trainlisttest.list[code].targetpercent = rails.stops[data.targetStation].direct2.percent;
-										// trainlisttest.list[code].linkOffsetPercent = data.linkOffsetPercent;
-										// trainlisttest.list[code].targetLink = data.targetLink;
-									}
-
-
-									trainlisttest.list[code].status = '02';
-								}else if(data.directionType == '03'){
-									if(data.targetStation){
-										trainlisttest.list[code].pc = data.targetLinkPercent/rails.stops[data.targetStation].direct1.percent;
-										trainlisttest.list[code].targetpercent = rails.stops[data.targetStation].direct1.percent;
-										// trainlisttest.list[code].linkOffsetPercent = data.linkOffsetPercent;
-										// trainlisttest.list[code].targetLink = data.targetLink;
-									}
-
-									trainlisttest.list[code].status = '03';
-
-								}
-								trainlisttest.list[code].stopstation = data.targetStation;
-
-							}
-
-
-						}
-					}
-
-					if(trainlisttest.list[code].targetLink == trainlisttest.list[code].nowcode){
-						trainlisttest.list[code].statsstop = 0;
-					}else{
-						trainlisttest.list[code].statsstop = 1;
-					}
-					// console.log(data.body[i]);
-
-					if(trainlisttest.list[code].speed != data.speed){
-						trainlisttest.list[code].speed = data.speed;
-						trainlisttest.list[code].speeds = parseFloat(data.speed*10/36/18/trainlisttest.list[code].len);
-					}
-				}
-		// }
-	}
-	function standupdate(data) {
-		code = data.code;
-		if ( actions[code]) {
-			if (data.screenDoorOpenStatus == '02' && actions[code].status == '01') {
-				actions[code].status = '00';
-			}
-			if (data.screenDoorOpenStatus == '02' && actions[code].status == '00') {
-				actions[code].status = '02';
-				actions[code].action.reset();
-				actions[code].action.time = 0;
-				actions[code].action.timeScale = 1;
-				actions[code].action.play();
-			}
-
-			if (data.screenDoorOpenStatus == '01' && actions[code].status == '02') {
-				actions[code].status = '00';
-			}
-			if (data.screenDoorOpenStatus == '01' && actions[code].status == '00') {
-				actions[code].status = '01';
-				actions[code].action.reset();
-				actions[code].action.time = actions[code].action._clip.duration;
-				actions[code].action.timeScale = -1;
-				actions[code].action.play();
-			}
-		}
-
-	}
-	function devicestatus(data){
-		for (let i= 0,leni = data.body.length; i<leni; i++) {
-			// 0xFFFFFF
-			// 0xCD0000  红
-			// 0xEEEE00  黄
-			// 0x32CD32  绿
-
-			if (data._type == 'Signal' && signallist) {
-				if (signallist) {
-					// console.log(data.body[i]);
-					signalupdate(data.body[i]);
-				}
-			}
-
-			if (data._type == 'StationStand' && actions) {
-				if (actions) {
-					standupdate(data.body[i]);
-				}
-			}
-
-			if (data._type == 'Switch' && sectionlist) {
-				if (sectionlist) {
-					switchupdate(data.body[i]);
-				}
-			}
-
-		}
-	}
-	function signalupdate(data) {
-		code = data.code;
-		// console.log(data);
-		if (data.lightType == '01') {
-			if (signallist.list[code].mesh.code) {
-				signallist.list[code].mesh.status = data.status;
-
-				// 55
-				// 33
-				// 77
-				// 关闭
-				if (data.status == '01') {
-					signallist.list[code].mesh.getObjectByName("red").material.map = materials[0];
-					signallist.list[code].mesh.getObjectByName("red").material.map.needsUpdate = true;
-					signallist.list[code].mesh.getObjectByName("yellow").material.map = materials[3];
-					signallist.list[code].mesh.getObjectByName("yellow").material.map.needsUpdate = true;
-					signallist.list[code].mesh.getObjectByName("green").material.map = materials[3];
-					signallist.list[code].mesh.getObjectByName("green").material.map.needsUpdate = true;
-
-				}
-				// 开放
-				if (data.status == '02') {
-					signallist.list[code].mesh.getObjectByName("red").material.map = materials[3];
-					signallist.list[code].mesh.getObjectByName("red").material.map.needsUpdate = true;
-					signallist.list[code].mesh.getObjectByName("yellow").material.map = materials[3];
-					signallist.list[code].mesh.getObjectByName("yellow").material.map.needsUpdate = true;
-					signallist.list[code].mesh.getObjectByName("green").material.map = materials[2];
-					signallist.list[code].mesh.getObjectByName("green").material.map.needsUpdate = true;
-				}
-
-				if (data.status == '03') {
-					signallist.list[code].mesh.getObjectByName("red").material.map = materials[3];
-					signallist.list[code].mesh.getObjectByName("red").material.map.needsUpdate = true;
-					signallist.list[code].mesh.getObjectByName("yellow").material.map = materials[1];
-					signallist.list[code].mesh.getObjectByName("yellow").material.map.needsUpdate = true;
-					signallist.list[code].mesh.getObjectByName("green").material.map = materials[3];
-					signallist.list[code].mesh.getObjectByName("green").material.map.needsUpdate = true;
-				}
-
-				// 引导
-				if (data.status == '03') {
-					signallist.list[code].mesh.getObjectByName("red").material.map = materials[0];
-					signallist.list[code].mesh.getObjectByName("red").material.map.needsUpdate = true;
-					signallist.list[code].mesh.getObjectByName("yellow").material.map = materials[1];
-					signallist.list[code].mesh.getObjectByName("yellow").material.map.needsUpdate = true;
-					signallist.list[code].mesh.getObjectByName("green").material.map = materials[3];
-					signallist.list[code].mesh.getObjectByName("green").material.map.needsUpdate = true;
-
-				}
-				// 封锁
-				if (data.status == '04') {
-					signallist.list[code].mesh.getObjectByName("red").material.map = materials[3];
-					signallist.list[code].mesh.getObjectByName("red").material.map.needsUpdate = true;
-					signallist.list[code].mesh.getObjectByName("yellow").material.map = materials[3];
-					signallist.list[code].mesh.getObjectByName("yellow").material.map.needsUpdate = true;
-					signallist.list[code].mesh.getObjectByName("green").material.map = materials[3];
-					signallist.list[code].mesh.getObjectByName("green").material.map.needsUpdate = true;
-
-				}
-				// 故障
-				if (data.status == '05') {
-					signallist.list[code].mesh.getObjectByName("red").material.map = materials[3];
-					signallist.list[code].mesh.getObjectByName("red").material.map.needsUpdate = true;
-					signallist.list[code].mesh.getObjectByName("yellow").material.map = materials[3];
-					signallist.list[code].mesh.getObjectByName("yellow").material.map.needsUpdate = true;
-					signallist.list[code].mesh.getObjectByName("green").material.map = materials[3];
-					signallist.list[code].mesh.getObjectByName("green").material.map.needsUpdate = true;
-
-				}
-				if (data.status == '06') {
-					signallist.list[code].mesh.getObjectByName("red").material.map = materials[3];
-					signallist.list[code].mesh.getObjectByName("red").material.map.needsUpdate = true;
-					signallist.list[code].mesh.getObjectByName("yellow").material.map = materials[3];
-					signallist.list[code].mesh.getObjectByName("yellow").material.map.needsUpdate = true;
-					signallist.list[code].mesh.getObjectByName("green").material.map = materials[3];
-					signallist.list[code].mesh.getObjectByName("green").material.map.needsUpdate = true;
-
-				}
-
-			}
-
-		} else if (data.lightType == '01') {
-			if (signallist.list[code].mesh.code) {
-				signallist.list[code].mesh.getObjectByName("red").material.map = materials[3];
-				signallist.list[code].mesh.getObjectByName("red").material.map.needsUpdate = true;
-				signallist.list[code].mesh.getObjectByName("yellow").material.map = materials[3];
-				signallist.list[code].mesh.getObjectByName("yellow").material.map.needsUpdate = true;
-				signallist.list[code].mesh.getObjectByName("green").material.map = materials[3];
-				signallist.list[code].mesh.getObjectByName("green").material.map.needsUpdate = true;
-
-			}
-
-		}
-
-	}
-
-	function switchupdate(data) {
-		code = data.code;
-		for (let j=sectionlist.switchs.modellist.length-1; j>=0; j--) {
-			if (rails.switchrail[code]) {
-				if (rails.switchrail[code].locateType != data.locateType) {
-					if (data.locateType == '02') {
-						if (actions[sectionlist.switchs.modellist[j].code]) {
-							sectionlist.switchs.modellist[j].locateType = data.locateType;
-							actions[sectionlist.switchs.modellist[j].code].reset();
-							actions[sectionlist.switchs.modellist[j].code].time = 0;
-							actions[sectionlist.switchs.modellist[j].code].timeScale = 1;
-							actions[sectionlist.switchs.modellist[j].code].play();
-						}
-
-						rails.switchrail[code].locateType = "02";
-
-						let testswitch = rails.switchrail[code];
-						// console.log(testswitch);
-						// console.log(rails.linkrail[testswitch.alink]);
-						// console.log(rails.linkrail[testswitch.clink]);
-						if(rails.switchrail[code].directtype == "1"){
-							rails.linkrail[testswitch.alink].lconnect = testswitch.clink;
-				      rails.linkrail[testswitch.clink].rconnect = testswitch.alink;
-						}else if(rails.switchrail[code].directtype == "2"){
-							rails.linkrail[testswitch.alink].rconnect = testswitch.clink;
-				      rails.linkrail[testswitch.clink].lconnect = testswitch.alink;
-						}
-
-					} else if (data.locateType == '01') {
-						if (actions[sectionlist.switchs.modellist[j].code]) {
-							sectionlist.switchs.modellist[j].locateType = data.locateType;
-							actions[sectionlist.switchs.modellist[j].code].reset();
-							actions[sectionlist.switchs.modellist[j].code].time = actions[sectionlist.switchs.modellist[j].code]._clip.duration;
-							actions[sectionlist.switchs.modellist[j].code].timeScale = -1;
-							actions[sectionlist.switchs.modellist[j].code].play();
-						}
-
-						rails.switchrail[code].locateType = "01";
-						let testswitch = rails.switchrail[code];
-						// console.log(testswitch);
-						// console.log(rails.linkrail[testswitch.alink]);
-						// console.log(rails.linkrail[testswitch.clink]);
-						if(rails.switchrail[code].directtype == "1"){
-							rails.linkrail[testswitch.alink].lconnect = testswitch.blink;
-				      rails.linkrail[testswitch.blink].rconnect = testswitch.alink;
-						}else if(rails.switchrail[code].directtype == "2"){
-							rails.linkrail[testswitch.alink].rconnect = testswitch.blink;
-				      rails.linkrail[testswitch.blink].lconnect = testswitch.alink;
-						}
-
-					}
-				}
-				j = 0;
-			}
-		}
-	}
-	function simulationreset(data){
-		for(let i=0;i<trainlisttest.group.children.length;i++){
-			trainlisttest.group.children[i].dispose = true;
-			trainlisttest.group.children[i].stopstation = null;
-			trainlisttest.group.children[i].pc = null;
-			trainlisttest.group.children[i].targetpercent = null;
-			trainlisttest.group.children[i].progress = null;
-			trainlisttest.group.children[i].linkOffsetPercent = null;
-			trainlisttest.group.children[i].targetLink = null;
-			trainlisttest.group.remove(trainlisttest.group.children[i]);
-			i--;
-		}
-
-	}
-}
diff --git a/src/jlmap3d/jl3dsimulation/connect/TrainingConnectTest.js b/src/jlmap3d/jl3dsimulation/connect/TrainingConnectTest.js
deleted file mode 100644
index 616ac18be..000000000
--- a/src/jlmap3d/jl3dsimulation/connect/TrainingConnectTest.js
+++ /dev/null
@@ -1,445 +0,0 @@
-import StompClient from '@/utils/sock';
-import { displayTopic } from '@/utils/stomp';
-import { getToken } from '@/utils/auth';
-import router from '@/router/index_APP_TARGET';
-
-// 定于仿真socket接口
-export function Jlmap3dSubscribe(worker,routegroup) {
-
-	const scope = this;
-	this.map = null;
-
-	const webworker = worker;
-	var trainlisttest = null;
-	var sectionlist = null;
-	var signallist = null;
-	var stationstandlist = null;
-	var sectionlist = null;
-	var materials = null;
-	var actions = null;
-	var scenes = null;
-
-	var code = null;
-
-	this.teststomp = new StompClient();
-	this.topic = displayTopic;
-	const header = { group: router.currentRoute.query.group, 'X-Token': getToken() };
-	console.log( router.currentRoute.query.group);
-	this.updatamap = function (mapdata, materiallist, nowaction, scene) {
-		// console.log(mapdata);
-		scope.map = mapdata;
-		trainlisttest = this.map.trainlisttest;
-		sectionlist = this.map.sectionlist;
-		signallist = this.map.signallist;
-		stationstandlist = this.map.stationstandlist;
-		sectionlist = this.map.sectionlist;
-		materials = materiallist;
-		scenes = scene;
-		actions = nowaction;
-	};
-
-	this.socketon = function (topic) {
-		try {
-			// console.log("teststomp");
-			scope.teststomp.subscribe(topic, callback, header);
-		} catch (error) {
-			console.error('websocket订阅失败');
-		}
-
-	};
-
-	this.socketoff = function (topic) {
-		scope.teststomp.unsubscribe(topic);
-	};
-
-	// 仿真socket接口回调函数
-	function callback(Response) {
-		// 对象化数据
-		const data = JSON.parse(Response.body);
-		// 遍历后台数据
-
-		// 判断消息类型
-		// if(data.type == "Simulation_TrainPosition"){
-		//
-		//
-		// }
-		if (data.type == 'Simulation_DeviceStatus') {
-
-			if (data.body.length < 200) {
-
-				for (let i = data.body.length - 1; i >= 0; i--) {
-
-					if (data.body[i]._type == 'Train') {
-
-						// console.log(data.body[i]);
-						// 遍历列车对象组
-						// console.log(data.body[i]);
-						if (trainlisttest) {
-							code = data.body[i].code;
-							// 剔除不显示的车
-							// 找到对应列车
-
-							if (trainlisttest.list[code]) {
-								// 车门开关验证
-								// if(data.body[i].directionType == "02"){
-								if (trainlisttest.list[code].doorStatus != data.body[i].doorStatus && data.body[i].doorStatus == '01') {
-									// console.log("close");
-									trainlisttest.list[code].doorStatus = '01';
-									for (let an = actions[code].top.length - 1; an >= 0; an--) {
-										actions[code].top[an].reset();
-										actions[code].top[an].time = actions[code].top[an]._clip.duration;
-										actions[code].top[an].timeScale = -1;
-										actions[code].top[an].play();
-									}
-								} else if (trainlisttest.list[code].doorStatus != data.body[i].doorStatus && data.body[i].doorStatus == '02') {
-									// console.log("open");
-									trainlisttest.list[code].doorStatus = '02';
-									for (let an = actions[code].top.length - 1; an >= 0; an--) {
-										actions[code].top[an].reset();
-										actions[code].top[an].time = 0;
-										actions[code].top[an].timeScale = 1;
-										actions[code].top[an].play();
-									}
-								}
-								// }else{
-								//   if(trainlisttest.list[code].doorStatus != data.body[i].doorStatus && data.body[i].doorStatus == "01"){
-								//     //console.log("close");
-								//     trainlisttest.list[code].doorStatus = "01";
-								//     for(let an=actions[code].down.length-1;an>=0;an--){
-								//       actions[code].down[an].reset();
-								//       actions[code].down[an].time = actions[code].top[an]._clip.duration;
-								//       actions[code].down[an].timeScale = -1;
-								//       actions[code].down[an].play();
-								//     }
-								//   }else if(trainlisttest.list[code].doorStatus != data.body[i].doorStatus && data.body[i].doorStatus == "02"){
-								//     //console.log("open");
-								//     trainlisttest.list[code].doorStatus = "02";
-								//     for(let an=actions[code].down.length-1;an>=0;an--){
-								//       actions[code].down[an].reset();
-								//       actions[code].down[an].time = 0;
-								//       actions[code].down[an].timeScale = 1;
-								//       actions[code].down[an].play();
-								//     }
-								//   }
-								// }
-								// 遍历获取所在轨道
-								if (trainlisttest.list[code].dispose != data.body[i].dispose && data.body[i].dispose == false) {
-									trainlisttest.group.add(trainlisttest.list[code]);
-
-									if (sectionlist.sections.datalist[data.body[i].sectionCode].code) {
-
-										trainlisttest.list[code].position.y = 0;
-										trainlisttest.list[code].progress = 0;
-										trainlisttest.list[code].oldoffset = data.body[i].sectionOffsetPercent;
-										trainlisttest.list[code].dispose = false;
-
-										if (data.body[i].directionType == '02') {
-											trainlisttest.list[code].status = '02';
-											trainlisttest.list[code].rotation.y = 0;
-										} else if (data.body[i].directionType == '03') {
-											trainlisttest.list[code].status = '03';
-											trainlisttest.list[code].rotation.y = Math.PI;
-										}
-
-									}
-
-								} else if (trainlisttest.list[code].dispose != data.body[i].dispose && data.body[i].dispose == true) {
-									trainlisttest.group.remove(trainlisttest.list[code]);
-									trainlisttest.list[code].progress = null;
-									trainlisttest.list[code].dispose = true;
-
-								} else if (trainlisttest.list[code].dispose == data.body[i].dispose && data.body[i].dispose == false) {
-
-									if (sectionlist.sections.datalist[data.body[i].sectionCode].code) {
-										if (trainlisttest.list[code].nowcode != data.body[i].sectionCode || trainlisttest.list[code].nextcode != data.body[i].nextSectionCode) {
-											trainlisttest.list[code].nowcode = data.body[i].sectionCode;
-											trainlisttest.list[code].nextcode = data.body[i].nextSectionCode;
-											const vexlist = [];
-											const endrotation = null;
-											if (data.body[i].directionType == '02') { // 向右
-												if (trainlisttest.list[code].status != data.body[i].directionType) {
-													console.log(trainlisttest.list[code].position);
-													console.log(trainlisttest.list[code].children[5].matrixWorld);
-													trainlisttest.list[code].position.x = trainlisttest.list[code].children[5].matrixWorld.elements[12];
-													trainlisttest.list[code].children[0].position.z = trainlisttest.list[code].children[0].matrixWorld.elements[14];
-													trainlisttest.list[code].children[1].position.z = trainlisttest.list[code].children[1].matrixWorld.elements[14];
-													trainlisttest.list[code].children[2].position.z = trainlisttest.list[code].children[2].matrixWorld.elements[14];
-													trainlisttest.list[code].children[3].position.z = trainlisttest.list[code].children[3].matrixWorld.elements[14];
-													trainlisttest.list[code].children[4].position.z = trainlisttest.list[code].children[4].matrixWorld.elements[14];
-													trainlisttest.list[code].children[5].position.z = trainlisttest.list[code].children[5].matrixWorld.elements[14];
-
-													if (sectionlist.sections.datalist[data.body[i].sectionCode].rail[0].x > sectionlist.sections.datalist[data.body[i].sectionCode].rail[1].x) {
-														vexlist.push(new THREE.Vector3(trainlisttest.list[code].position.x, 0, trainlisttest.list[code].children[0].matrixWorld.elements[14]));
-														for (let m = sectionlist.sections.datalist[data.body[i].sectionCode].rail.length - 1; m >= 0; m--) {
-															if (sectionlist.sections.datalist[data.body[i].sectionCode].rail[m].x > trainlisttest.list[code].position.x) {
-																vexlist.push(sectionlist.sections.datalist[data.body[i].sectionCode].rail[m]);
-															}
-
-														}
-													} else {
-														vexlist.push(new THREE.Vector3(trainlisttest.list[code].position.x, 0, trainlisttest.list[code].children[0].matrixWorld.elements[14]));
-														for (let m = 0; m < sectionlist.sections.datalist[data.body[i].sectionCode].rail.length; m++) {
-															if (sectionlist.sections.datalist[data.body[i].sectionCode].rail[m].x > trainlisttest.list[code].position.x) {
-																vexlist.push(sectionlist.sections.datalist[data.body[i].sectionCode].rail[m]);
-															}
-														}
-													}
-												} else {
-													if (sectionlist.sections.datalist[data.body[i].sectionCode].rail[0].x > sectionlist.sections.datalist[data.body[i].sectionCode].rail[1].x) {
-														for (let m = sectionlist.sections.datalist[data.body[i].sectionCode].rail.length - 1; m >= 0; m--) {
-															vexlist.push(sectionlist.sections.datalist[data.body[i].sectionCode].rail[m]);
-														}
-													} else {
-														for (let m = 0; m < sectionlist.sections.datalist[data.body[i].sectionCode].rail.length; m++) {
-															vexlist.push(sectionlist.sections.datalist[data.body[i].sectionCode].rail[m]);
-														}
-													}
-												}
-												trainlisttest.list[code].status = '02';
-												trainlisttest.list[code].rotation.y = 0;
-
-											} else if (data.body[i].directionType == '03') { // 向左
-
-												if (trainlisttest.list[code].status != data.body[i].directionType) {
-													trainlisttest.list[code].position.x = trainlisttest.list[code].children[5].matrixWorld.elements[12];
-													trainlisttest.list[code].children[0].position.z = trainlisttest.list[code].children[0].matrixWorld.elements[14];
-													trainlisttest.list[code].children[1].position.z = trainlisttest.list[code].children[1].matrixWorld.elements[14];
-													trainlisttest.list[code].children[2].position.z = trainlisttest.list[code].children[2].matrixWorld.elements[14];
-													trainlisttest.list[code].children[3].position.z = trainlisttest.list[code].children[3].matrixWorld.elements[14];
-													trainlisttest.list[code].children[4].position.z = trainlisttest.list[code].children[4].matrixWorld.elements[14];
-													trainlisttest.list[code].children[5].position.z = trainlisttest.list[code].children[5].matrixWorld.elements[14];
-													//
-													if (sectionlist.sections.datalist[data.body[i].sectionCode].rail[0].x < sectionlist.sections.datalist[data.body[i].sectionCode].rail[1].x) {
-														vexlist.push(new THREE.Vector3(trainlisttest.list[code].position.x, 0, trainlisttest.list[code].children[0].matrixWorld.elements[14]));
-														for (let m = sectionlist.sections.datalist[data.body[i].sectionCode].rail.length - 1; m >= 0; m--) {
-															if (sectionlist.sections.datalist[data.body[i].sectionCode].rail[m].x < trainlisttest.list[code].position.x) {
-																vexlist.push(sectionlist.sections.datalist[data.body[i].sectionCode].rail[m]);
-															}
-														}
-													} else {
-														vexlist.push(new THREE.Vector3(trainlisttest.list[code].position.x, 0, trainlisttest.list[code].children[0].matrixWorld.elements[14]));
-														for (let m = 0; m < sectionlist.sections.datalist[data.body[i].sectionCode].rail.length; m++) {
-															if (sectionlist.sections.datalist[data.body[i].sectionCode].rail[m].x < trainlisttest.list[code].position.x) {
-																vexlist.push(sectionlist.sections.datalist[data.body[i].sectionCode].rail[m]);
-															}
-														}
-													}
-												} else {
-													//
-													if (sectionlist.sections.datalist[data.body[i].sectionCode].rail[0].x < sectionlist.sections.datalist[data.body[i].sectionCode].rail[1].x) {
-														for (let m = sectionlist.sections.datalist[data.body[i].sectionCode].rail.length - 1; m >= 0; m--) {
-															vexlist.push(sectionlist.sections.datalist[data.body[i].sectionCode].rail[m]);
-														}
-
-													} else {
-														for (let m = 0; m < sectionlist.sections.datalist[data.body[i].sectionCode].rail.length; m++) {
-															vexlist.push(sectionlist.sections.datalist[data.body[i].sectionCode].rail[m]);
-														}
-													}
-												}
-												trainlisttest.list[code].status = '03';
-												trainlisttest.list[code].rotation.y = Math.PI;
-
-											}
-
-											trainlisttest.list[code].curve = new THREE.CatmullRomCurve3(vexlist);
-											// console.log(trainlisttest.list[code].curve.points);
-											// console.log(data.body[i].speed)
-											// console.log(sectionlist.sections.datalist[data.body[i].sectionCode].distance);
-											trainlisttest.list[code].speeds = data.body[i].speed * 10 / 36 / 11 / sectionlist.sections.datalist[data.body[i].sectionCode].distance;
-
-											trainlisttest.list[code].progress = 0;
-										}
-										// console.log("speed");
-										// console.log(data.body[i].speed);
-										// console.log(trainlisttest.list[code].speed);
-										if (data.body[i].speed != trainlisttest.list[code].speed) {
-											trainlisttest.list[code].speed = data.body[i].speed;
-											trainlisttest.list[code].speeds = data.body[i].speed * 10 / 36 / 11 / sectionlist.sections.datalist[data.body[i].sectionCode].distance;
-											// if(trainlisttest.list[code].speeds > 0.1){
-											//   console.log(data.body[i]);
-											//   console.log(data.body[i].speed)
-											//   console.log(sectionlist.sections.datalist[data.body[i].sectionCode].distance);
-											//   console.log(trainlisttest.list[code].speeds);
-											// }
-										}
-
-									}
-
-								}
-
-							}
-
-						}
-					}
-
-					// 0xFFFFFF
-					// 0xCD0000  红
-					// 0xEEEE00  黄
-					// 0x32CD32  绿
-					if (data.body[i]._type == 'Signal') {
-
-						if (signallist) {
-							code = data.body[i].code;
-							if (data.body[i].lightType == '01') {
-								if (signallist.list[code].mesh.code) {
-									signallist.list[code].mesh.status = data.body[i].status;
-
-									// 55
-									// 33
-									// 77
-									// 关闭
-									if (data.body[i].status == '01') {
-										signallist.list[code].mesh.children[0].material.map = materials[3];
-										signallist.list[code].mesh.children[0].material.map.needsUpdate = true;
-										signallist.list[code].mesh.children[1].material.map = materials[0];
-										signallist.list[code].mesh.children[1].material.map.needsUpdate = true;
-										signallist.list[code].mesh.children[2].material.map = materials[3];
-										signallist.list[code].mesh.children[2].material.map.needsUpdate = true;
-
-									}
-									// 开放
-									if (data.body[i].status == '02') {
-
-										if (data.body[i].switchLocateType == '01') {
-											signallist.list[code].mesh.children[0].material.map = materials[2];
-											signallist.list[code].mesh.children[0].material.map.needsUpdate = true;
-											signallist.list[code].mesh.children[1].material.map = materials[3];
-											signallist.list[code].mesh.children[1].material.map.needsUpdate = true;
-											signallist.list[code].mesh.children[2].material.map = materials[3];
-											signallist.list[code].mesh.children[2].material.map.needsUpdate = true;
-
-										}
-
-										if (data.body[i].switchLocateType == '02') {
-											signallist.list[code].mesh.children[0].material.map = materials[3];
-											signallist.list[code].mesh.children[0].material.map.needsUpdate = true;
-											signallist.list[code].mesh.children[1].material.map = materials[3];
-											signallist.list[code].mesh.children[1].material.map.needsUpdate = true;
-											signallist.list[code].mesh.children[2].material.map = materials[1];
-											signallist.list[code].mesh.children[2].material.map.needsUpdate = true;
-
-										}
-
-									}
-									// 引导
-									if (data.body[i].status == '03') {
-										signallist.list[code].mesh.children[0].material.map = materials[3];
-										signallist.list[code].mesh.children[0].material.map.needsUpdate = true;
-										signallist.list[code].mesh.children[1].material.map = materials[0];
-										signallist.list[code].mesh.children[1].material.map.needsUpdate = true;
-										signallist.list[code].mesh.children[2].material.map = materials[1];
-										signallist.list[code].mesh.children[2].material.map.needsUpdate = true;
-
-									}
-									// 封锁
-									if (data.body[i].status == '04') {
-										signallist.list[code].mesh.children[0].material.map = materials[3];
-										signallist.list[code].mesh.children[0].material.map.needsUpdate = true;
-										signallist.list[code].mesh.children[1].material.map = materials[3];
-										signallist.list[code].mesh.children[1].material.map.needsUpdate = true;
-										signallist.list[code].mesh.children[2].material.map = materials[3];
-										signallist.list[code].mesh.children[2].material.map.needsUpdate = true;
-
-									}
-									// 故障
-									if (data.body[i].status == '05') {
-										signallist.list[code].mesh.children[0].material.map = materials[3];
-										signallist.list[code].mesh.children[0].material.map.needsUpdate = true;
-										signallist.list[code].mesh.children[1].material.map = materials[3];
-										signallist.list[code].mesh.children[1].material.map.needsUpdate = true;
-										signallist.list[code].mesh.children[2].material.map = materials[3];
-										signallist.list[code].mesh.children[2].material.map.needsUpdate = true;
-
-									}
-
-								}
-
-							} else if (data.body[i].lightType == '01') {
-								if (signallist.list[code].mesh.code) {
-									signallist.list[code].mesh.children[0].material.map = materials[3];
-									signallist.list[code].mesh.children[0].material.map.needsUpdate = true;
-									signallist.list[code].mesh.children[1].material.map = materials[3];
-									signallist.list[code].mesh.children[1].material.map.needsUpdate = true;
-									signallist.list[code].mesh.children[2].material.map = materials[3];
-									signallist.list[code].mesh.children[2].material.map.needsUpdate = true;
-
-								}
-
-							}
-
-						}
-
-					}
-
-					if (data.body[i]._type == 'StationStand') {
-						if (actions) {
-							code = data.body[i].code;
-							if (data.body[i].screenDoorOpenStatus == '02' && actions[code].status == '01') {
-								actions[code].status = '00';
-							}
-							if (data.body[i].screenDoorOpenStatus == '02' && actions[code].status == '00') {
-								actions[code].status = '02';
-								actions[code].action.reset();
-								actions[code].action.time = 0;
-								actions[code].action.timeScale = 1;
-								actions[code].action.play();
-							}
-
-							if (data.body[i].screenDoorOpenStatus == '01' && actions[code].status == '02') {
-								actions[code].status = '00';
-							}
-							if (data.body[i].screenDoorOpenStatus == '01' && actions[code].status == '00') {
-								actions[code].status = '01';
-								actions[code].action.reset();
-								actions[code].action.time = actions[code].action._clip.duration;
-								actions[code].action.timeScale = -1;
-								actions[code].action.play();
-							}
-
-						}
-
-					}
-
-					if (data.body[i]._type == 'Switch') {
-
-						if (sectionlist) {
-							code = data.body[i].code;
-							for (let j = sectionlist.switchs.modellist.length - 1; j >= 0; j--) {
-								if (sectionlist.switchs.modellist[j].code == code) {
-									if (sectionlist.switchs.modellist[j].locateType != data.body[i].locateType) {
-										if (data.body[i].locateType == '02') {
-											sectionlist.switchs.modellist[j].locateType = data.body[i].locateType;
-											actions[sectionlist.switchs.modellist[j].code].reset();
-											actions[sectionlist.switchs.modellist[j].code].time = 0;
-											actions[sectionlist.switchs.modellist[j].code].timeScale = 1;
-											actions[sectionlist.switchs.modellist[j].code].play();
-
-										} else if (data.body[i].locateType == '01') {
-											sectionlist.switchs.modellist[j].locateType = data.body[i].locateType;
-											actions[sectionlist.switchs.modellist[j].code].reset();
-											actions[sectionlist.switchs.modellist[j].code].time = actions[sectionlist.switchs.modellist[j].code]._clip.duration;
-											actions[sectionlist.switchs.modellist[j].code].timeScale = -1;
-											actions[sectionlist.switchs.modellist[j].code].play();
-
-										}
-									}
-
-									// console.log(sectionlist.group[j].name);
-									j = 0;
-								}
-							}
-						}
-
-					}
-				}
-
-			} else if (data.body.length > 200) {
-
-			}
-
-		}
-
-	}
-
-}
diff --git a/src/jlmap3d/jl3dsimulation/connect/UpdateTrainNew.js b/src/jlmap3d/jl3dsimulation/connect/UpdateTrainNew.js
deleted file mode 100644
index e0e9d5921..000000000
--- a/src/jlmap3d/jl3dsimulation/connect/UpdateTrainNew.js
+++ /dev/null
@@ -1,174 +0,0 @@
-
-export function UpdateTrainNew(camera,traindata){
-  if(traindata != undefined ){
-    for(let j=traindata.group.children.length-1;j>=0;j--){
-      //判断是否有移动事件
-
-          let trainmodel = traindata.group.children[j];
-
-          if(trainmodel.speeds > 0 && trainmodel.speeds){
-            let speed = null;
-            if(traindata.group.children[j].progress >=0&&traindata.group.children[j].progress<=1){
-
-              let movecurve = trainmodel.curve;
-              if(trainmodel.status == "1"){
-
-                let point = movecurve.getPointAt(trainmodel.progress);
-                let worldpositionz = trainmodel.children[0].position.z;
-
-
-                trainmodel.position.x = point.x;
-                trainmodel.position.y = 0;
-                let offset = Math.abs( point.z -parseFloat(worldpositionz));
-                if(Math.abs( point.z -trainmodel.children[0].matrixWorld.elements[14]) >0.02){
-                  trainmodel.children[0].up = new THREE.Vector3(1,0,0);
-                  let tangent = movecurve.getTangentAt(traindata.group.children[j].progress).normalize();
-                  trainmodel.children[0].axis.crossVectors(trainmodel.children[0].up, tangent).normalize();
-                  let radians = Math.acos(trainmodel.children[0].up.dot(tangent));
-                  trainmodel.children[0].quaternion.setFromAxisAngle(trainmodel.children[0].axis, radians);
-                  trainmodel.children[0].rotation.x = -Math.PI/2;
-                  trainmodel.children[0].rotation.z = trainmodel.children[0].rotation.y;
-                  trainmodel.children[0].rotation.y = 0;
-                  let rotas = {
-                    posr:point,
-                    rota:trainmodel.children[0].rotation.z
-                  }
-                  trainmodel.children[1].rotalist.push(rotas);
-                  let offsetz = parseFloat(point.z) - parseFloat(trainmodel.children[0].matrixWorld.elements[14]);
-                  trainmodel.children[0].position.z += offsetz;
-                }
-
-                if(trainmodel.children[1].rotalist.length > 0 || trainmodel.children[2].rotalist.length > 0 || trainmodel.children[3].rotalist.length > 0 || trainmodel.children[4].rotalist.length > 0|| trainmodel.children[5].rotalist.length > 0){
-
-                  for(let rs = 1;rs<6;rs++){
-                      if(trainmodel.children[rs].rotalist[0]){
-
-                        let offsetz = parseFloat(trainmodel.children[rs].rotalist[0].posr.z) - parseFloat(trainmodel.children[rs].matrixWorld.elements[14]);
-                        trainmodel.children[rs].position.z += offsetz;
-
-                        for(let xh=0;xh<trainmodel.children[rs].rotalist.length;xh++){
-                          if((trainmodel.children[rs].matrixWorld.elements[12]+8)>=trainmodel.children[rs].rotalist[0].posr.x){
-
-                            if(rs != 5){
-                              let asd = trainmodel.children[rs].rotalist[0];
-                              trainmodel.children[rs+1].rotalist.push(asd);
-
-                            }
-                            trainmodel.children[rs].rotation.z = trainmodel.children[rs].rotalist[0].rota;
-                            trainmodel.children[rs].rotalist.splice(0,1)
-                            xh--;
-                          }else{
-                            xh = trainmodel.children[rs].rotalist.length;
-                          }
-                        }
-                      }
-                  }
-                }
-                trainmodel.progress += trainmodel.speeds;
-                // if(trainmodel.statsstop == 0){
-                //   if((1-trainmodel.progress) > 0.95){
-                //
-                //     trainmodel.progress += trainmodel.speeds;
-                //   }
-                //
-                // }else{
-                //   trainmodel.progress += trainmodel.speeds;
-                // }
-
-              }
-
-              if(trainmodel.status == "0"){
-                  let point = movecurve.getPointAt(trainmodel.progress);
-                  let worldpositionz = trainmodel.children[0].position.z;
-
-                  trainmodel.position.x = point.x;
-                  trainmodel.position.y = 0;
-
-                  if(Math.abs( point.z -trainmodel.children[0].matrixWorld.elements[14]) >0.02){
-                    trainmodel.children[0].up = new THREE.Vector3(-1,0,0);
-                    let tangent = movecurve.getTangentAt(traindata.group.children[j].progress).normalize();
-                    trainmodel.children[0].axis.crossVectors(trainmodel.children[0].up, tangent).normalize();
-                    let radians = Math.acos(trainmodel.children[0].up.dot(tangent));
-
-                    trainmodel.children[0].quaternion.setFromAxisAngle(trainmodel.children[0].axis, radians);
-                    trainmodel.children[0].rotation.x = -Math.PI/2;
-                    trainmodel.children[0].rotation.z = trainmodel.children[0].rotation.y;
-                    trainmodel.children[0].rotation.y = 0;
-
-                    let rotas = {
-                      posr:point,
-                      rota:trainmodel.children[0].rotation.z
-                    }
-                    trainmodel.children[1].rotalist.push(rotas);
-
-                    let offsetz = parseFloat(trainmodel.children[0].matrixWorld.elements[14]) - parseFloat(point.z);
-                    trainmodel.children[0].position.z += offsetz;
-
-                  }
-
-                  if(trainmodel.children[1].rotalist.length > 0 || trainmodel.children[2].rotalist.length > 0 || trainmodel.children[3].rotalist.length > 0 || trainmodel.children[4].rotalist.length > 0|| trainmodel.children[5].rotalist.length > 0){
-                    for(let rs = 1;rs<6;rs++){
-                      if(trainmodel.children[rs].rotalist[0]){
-                        let offsetz = parseFloat(trainmodel.children[rs].matrixWorld.elements[14]) - parseFloat(trainmodel.children[rs].rotalist[0].posr.z);
-
-                        trainmodel.children[rs].position.z += offsetz;
-
-                        for(let xh=0;xh<trainmodel.children[rs].rotalist.length;xh++){
-                          if((trainmodel.children[rs].matrixWorld.elements[12]-8)<=trainmodel.children[rs].rotalist[0].posr.x){
-
-                            if(rs != 5){
-                              let asd = trainmodel.children[rs].rotalist[0];
-                              trainmodel.children[rs+1].rotalist.push(asd);
-
-                            }
-
-                            trainmodel.children[rs].rotation.z = trainmodel.children[rs].rotalist[0].rota;
-                            trainmodel.children[rs].rotalist.splice(0,1)
-                            xh--;
-                          }else{
-                            xh = trainmodel.children[rs].rotalist.length;
-                          }
-                        }
-                      }
-                    }
-                  }
-                  trainmodel.progress += trainmodel.speeds;
-                  // if(trainmodel.statsstop == 0){
-                  //   if(trainmodel.progress < 0.95){
-                  //     trainmodel.progress += trainmodel.speeds;
-                  //   }
-                  // }else{
-                  //   trainmodel.progress += trainmodel.speeds;
-                  // }
-                }
-
-
-            }else{
-              if(trainmodel.nextcurve){
-                trainmodel.progress = 0;
-                trainmodel.len = trainmodel.nextlen;
-                if(trainmodel.nextcode){
-                  trainmodel.nowcode = trainmodel.nextcode;
-                  trainmodel.isstandsection = trainmodel.nextissection;
-                  if(trainmodel.isstandsection){
-                    trainmodel.statsstop = 0;
-                  }else{
-                    trainmodel.statsstop = 1;
-                  }
-                }
-
-                trainmodel.speeds = parseFloat(trainmodel.speed*10/36/25/trainmodel.len);
-                trainmodel.curve = trainmodel.nextcurve;
-                trainmodel.nextcurve = null;
-                trainmodel.nextlen = null;
-                trainmodel.nextcode = null;
-              }
-
-            }
-
-          }
-    }
-
-  }
-
-}
diff --git a/src/jlmap3d/jl3dsimulation/connect/UpdateTrainTest.js b/src/jlmap3d/jl3dsimulation/connect/UpdateTrainTest.js
index f2511b69d..59cc9920d 100644
--- a/src/jlmap3d/jl3dsimulation/connect/UpdateTrainTest.js
+++ b/src/jlmap3d/jl3dsimulation/connect/UpdateTrainTest.js
@@ -1,4 +1,4 @@
-
+//行车逻辑
 export function UpdateTrain(camera,traindata){
   if(traindata != undefined ){
     for(let j=traindata.group.children.length-1;j>=0;j--){
diff --git a/src/jlmap3d/jl3dsimulation/jlmap3d.js b/src/jlmap3d/jl3dsimulation/jlmap3d.js
index 9a3f38fae..596e6f7d4 100644
--- a/src/jlmap3d/jl3dsimulation/jlmap3d.js
+++ b/src/jlmap3d/jl3dsimulation/jlmap3d.js
@@ -6,7 +6,7 @@ import { AssetLoader } from '@/jlmap3d/main/loaders/AssetLoader';
 import { FBXLoader } from '@/jlmap3d/main/loaders/FBXLoader';
 import { JL3D_LOCAL_STATIC } from '@/api/jlmap3d/assets3d.js';
 //data
-import { Jl3ddata } from '@/jlmap3d/main/model/jl3ddata';
+import { Jl3ddata } from '@/jlmap3d/main/newmodel/jl3ddata';
 
 //setconfig
 import { SetCamera } from '@/jlmap3d/config/SetCamera';
@@ -19,11 +19,9 @@ import { OrbitControls } from '@/jlmap3d/main/control/OrbitControls';
 // import { DragControls } from '@/jlmap3d/main/control/DragControls';
 
 //加载器
-import { SimulationLoad } from '@/jlmap3d/main/loaders/SimulationLoad';
 import { SimulationLoadNew } from '@/jlmap3d/main/loaders/SimulationLoadNew';
 
 //connect
-import {Jlmap3dSubscribe } from '@/jlmap3d/jl3dsimulation/connect/Jlmap3dSubscribe';
 import {Jlmap3dSubscribeNew } from '@/jlmap3d/jl3dsimulation/connect/Jlmap3dSubscribeNew';
 
 import { getPublishMapVersion, getPublishMapDetail,getPublish3dMapDetail} from '@/api/jlmap3d/load3ddata';
@@ -31,7 +29,6 @@ import { getPublishMapVersion, getPublishMapDetail,getPublish3dMapDetail} from '
 //utils
 // import { UpdateTrain } from '@/jlmap3d/main/utils/UpdateTrain';
 import { UpdateTrain } from '@/jlmap3d/jl3dsimulation/connect/UpdateTrainTest';
-import { UpdateTrainNew } from '@/jlmap3d/jl3dsimulation/connect/UpdateTrainNew';
 // import { ReStart } from '@/jlmap3d/main/utils/ReStart';
 
 import {Stats} from '@/jlmap3d/main/lib/stats.min.js';
@@ -40,7 +37,6 @@ var clock = new THREE.Clock();
 
 export function JLmap3d(dom, data,skinCode,storemod,routegroup,project) {
 
-
   let scope = this;
 
   this.dom = dom;
@@ -49,8 +45,10 @@ export function JLmap3d(dom, data,skinCode,storemod,routegroup,project) {
   renderer.domElement.style.position = "absolute";
   renderer.domElement.style.top = "0";
   document.getElementById('testjlmap3d').appendChild(renderer.domElement);
+
   //定义相机
   let camera = SetCamera(dom);
+
   //定义场景(渲染容器)
   let scene = SetScene(project);
   let scenesimulation = new THREE.Group();
@@ -82,6 +80,7 @@ export function JLmap3d(dom, data,skinCode,storemod,routegroup,project) {
   //模型操作命令组
   this.actions = {};
 
+  //设备数据
   let sectionlist = null;
   let linklist = null;
   let signallist = null;
@@ -90,82 +89,31 @@ export function JLmap3d(dom, data,skinCode,storemod,routegroup,project) {
   let realsectionlist = null;
   let rails = null;
 
+  //轨道相机
   let camerarail = {
     curve:null,
     progress:0,
     moveswitch:false
   };
+
   //地图模型数据
   let mapdata = new Jl3ddata();
-  //订阅仿真socket
-  // console.log(routegroup);
-  // this.Subscribe = new Jlmap3dSubscribe(scope,routegroup,scope.jsonwebwork);
-  //连接到通信
-  //console.log(this.Subscribe.config);
 
+  //订阅仿真socket
   this.webwork = new Worker(JL3D_LOCAL_STATIC+"/workertest/trainworker.js");
   //初始化加载数据和模型getPublishMapDetail
   getPublishMapDetail(skinCode).then(data => {
     let mapnetdata = data.data;
     getPublish3dMapDetail(skinCode).then(netdata => {
       let assetsdata = JSON.parse(netdata.data.sections);
-      if(assetsdata.link){
-        scope.datatype = "old";
-        scope.jsonwebwork = new Worker(JL3D_LOCAL_STATIC+"/workertest/jsonworker.js");
-        scope.Subscribe = new Jlmap3dSubscribe(scope,routegroup,scope.jsonwebwork);
-        scope.Subscribe.socketon(scope.Subscribe.topic);
-        SimulationLoad(mapnetdata,scope,netdata.data,mapdata,camera,controls,scenesimulation,storemod);
-
-      }else{
-        scope.datatype = "new";
-        scope.jsonwebworknew = new Worker(JL3D_LOCAL_STATIC+"/workertest/jsonworkernew.js");
-        scope.Subscribe = new Jlmap3dSubscribeNew(scope,routegroup,scope.jsonwebworknew);
-        scope.Subscribe.socketon(scope.Subscribe.topic);
-        SimulationLoadNew(mapnetdata,scope,netdata.data,mapdata,camera,controls,scenesimulation,storemod);
-      }
-
+      scope.datatype = "new";
+      scope.jsonwebworknew = new Worker(JL3D_LOCAL_STATIC+"/workertest/jsonworkernew.js");
+      scope.Subscribe = new Jlmap3dSubscribeNew(scope,routegroup,scope.jsonwebworknew);
+      scope.Subscribe.socketon(scope.Subscribe.topic);
+      SimulationLoadNew(mapnetdata,scope,netdata.data,mapdata,camera,controls,scenesimulation,storemod);
     });
   });
-  //
-  // let stats = new Stats();
-  // dom.appendChild( stats.dom );
 
-  // var timer = setInterval(function() {
-	// 	if(trainlisttest){
-	// 		if(trainlisttest.group){
-	// 			if(trainlisttest.group.children[0]){
-	// 				for(let k in rails.switchrail){
-	// 					const ddd = storemod.getters['map/getDeviceByCode'](k);
-	// 					let switchdata = rails.switchrail[k];
-	// 					rails.switchrail[k].locateType = ddd.locateType;
-  //
-	// 					if(ddd.locateType == "01"){
-	// 						//1--向左  2--向右
-	// 						//__\__    __/__
-	// 						if(rails.switchrail[k].directtype == "1"){
-	// 							rails.linkrail[switchdata.alink].lconnect = switchdata.blink;
-	// 							rails.linkrail[switchdata.blink].rconnect = switchdata.alink;
-	// 						}else if(rails.switchrail[k].directtype == "2"){
-	// 							rails.linkrail[switchdata.alink].rconnect = switchdata.blink;
-	// 							rails.linkrail[switchdata.blink].lconnect = switchdata.alink;
-	// 						}
-  //
-	// 					}else if(ddd.locateType == "02"){
-	// 						if(rails.switchrail[k].directtype == "1"){
-	// 							rails.linkrail[switchdata.alink].lconnect = switchdata.clink;
-	// 							rails.linkrail[switchdata.clink].rconnect = switchdata.alink;
-	// 						}else if(rails.switchrail[k].directtype == "2"){
-	// 							rails.linkrail[switchdata.alink].rconnect = switchdata.clink;
-	// 							rails.linkrail[switchdata.clink].lconnect = switchdata.alink;
-	// 						}
-	// 					}
-	// 				}
-	// 				clearInterval(timer);
-	// 			}
-	// 		}
-	// 	}
-  //
-	// }, 2000);
   //开启渲染
   animate();
   startWorker(scope.webwork);
@@ -174,18 +122,13 @@ export function JLmap3d(dom, data,skinCode,storemod,routegroup,project) {
   //循环渲染函数
   function animate() {
     //循环渲染
-    //requestAnimationFrame(animate);
-    //renderer.setAnimationLoop(animate);
     requestAnimationFrame(animate);
-    //判断渲染是否开启
-      //根据相机渲染场景
+    //根据相机渲染场景
     renderer.render(scene,camera);
-      //检测动画构造器播放动画
-
-    // }
     // stats.update();
   }
 
+  //利用webworker当做定时器驱动设备动画，更新列车状态，车站漫游动画
   function startWorker(webwork){
     if(typeof(Worker)!=="undefined"){
 
@@ -193,11 +136,19 @@ export function JLmap3d(dom, data,skinCode,storemod,routegroup,project) {
         //更新列车位置
         if(scope.datatype == "new"){
 
-          // UpdateTrainNew(camera,trainlisttest);
         }else{
           UpdateTrain(camera,trainlisttest);
         }
 
+        delta = clock.getDelta();
+        for(let i=scope.mixers.length-1;i>=0;i--){
+          if(scope.mixers[i]._actions[0].isRunning()){
+            // console.log(scope.mixers[i]._actions[0].isRunning());
+            scope.mixers[i].update( delta );
+          }
+        }
+
+        //开启车站漫游
         if(camerarail.moveswitch == true){
           // console.log(camerarail.progress);
           if(camerarail.progress>=0.99){
@@ -218,18 +169,12 @@ export function JLmap3d(dom, data,skinCode,storemod,routegroup,project) {
 
         }
 
-        delta = clock.getDelta();
-        for(let i=scope.mixers.length-1;i>=0;i--){
-          if(scope.mixers[i]._actions[0].isRunning()){
-            // console.log(scope.mixers[i]._actions[0].isRunning());
-            scope.mixers[i].update( delta );
-          }
-        }
       };
     }
 
   }
 
+  //释放场景缓存关闭渲染循环
   this.dispose = function(){
     renderer.setAnimationLoop(null);
     renderer.dispose();
@@ -259,6 +204,7 @@ export function JLmap3d(dom, data,skinCode,storemod,routegroup,project) {
     }
   };
 
+  //切换显示车站信息
   this.showstationmsg = function(showtype){
     if(showtype == "show"){
       for(let st=0;st<stationstandlist.group.children.length;st++){
@@ -271,6 +217,7 @@ export function JLmap3d(dom, data,skinCode,storemod,routegroup,project) {
     }
   };
 
+  //切换显示列车信息
   this.showtrainmsg = function(showtype){
     console.log(trainlisttest);
     if(showtype == "show"){
@@ -284,24 +231,23 @@ export function JLmap3d(dom, data,skinCode,storemod,routegroup,project) {
     }
   };
 
-  // this.restart = function(){
-  //   ReStart(mapdata);
-  // };
-
+  //开启轨道镜头交互
   this.animateon = function(){
     controls.enabled = true;
   };
-
+  //关闭轨道镜头交互
   this.animateoff = function(){
     controls.enabled = false;
   };
 
+  //更新加载后数据
   this.loaderdata = function(loadsectionlist,loadlinklist,loadsignallist,loadstationstandlist,loadtrainlisttest,loadrealsectionlist,loadrails){
 
     sectionlist = loadsectionlist;
     linklist = loadlinklist;
     signallist = loadsignallist;
     stationstandlist = loadstationstandlist;
+    
     trainlisttest = loadtrainlisttest;
     realsectionlist = loadrealsectionlist;
     rails = loadrails;
@@ -324,8 +270,8 @@ export function JLmap3d(dom, data,skinCode,storemod,routegroup,project) {
     window.removeEventListener( 'resize', onWindowResize, false );
   };
 
+  //根据菜单选项切换相机位置
   this.updatecamera = function(mesh,type){
-    //console.log(mesh);
     if(type == "station"){
       camera.position.x = mesh.position.x;
       camera.position.y = mesh.position.y+800;
@@ -347,8 +293,8 @@ export function JLmap3d(dom, data,skinCode,storemod,routegroup,project) {
     controls.update();
   }
 
+  //窗口自适应
   function onWindowResize() {
-    //窗口自适应
     camera.aspect = window.innerWidth / window.innerHeight;
     camera.updateProjectionMatrix();
     renderer.setSize( window.innerWidth, window.innerHeight );
@@ -357,7 +303,6 @@ export function JLmap3d(dom, data,skinCode,storemod,routegroup,project) {
   //三维交互点击事件函数
   function onselect(event) {
     if(event.button == "0"){
-
       //定义光线
       let raycaster = new THREE.Raycaster();
       //定义平面鼠标点击坐标
diff --git a/src/jlmap3d/main/loaders/DriverLoad.js b/src/jlmap3d/main/loaders/DriverLoad.js
deleted file mode 100644
index e14212b39..000000000
--- a/src/jlmap3d/main/loaders/DriverLoad.js
+++ /dev/null
@@ -1,187 +0,0 @@
-//componnent
-import {SectionList} from '@/jlmap3d/main/model/SectionList.js';
-import {SignalList} from '@/jlmap3d/main/model/SignalList.js';
-import {StationStandList} from '@/jlmap3d/main/model/StationStandList.js';
-import {TrainList} from '@/jlmap3d/main/model/TrainList.js';
-import {RealSectionList} from '@/jlmap3d/main/model/RealSectionList.js';
-import {LinkList} from '@/jlmap3d/main/model/LinkList.js';
-import {RailList} from '@/jlmap3d/main/model/RailList.js';
-
-import {Materialload} from '@/jlmap3d/main/loaders/Materialload.js';
-
-import {SectionListN} from '@/jlmap3d/main/newmodel/SectionListN';
-import {SignalListN} from '@/jlmap3d/main/newmodel/SignalListN';
-import {StationStandListN} from '@/jlmap3d/main/newmodel/StationStandListN';
-import {SwitchListN} from '@/jlmap3d/main/newmodel/SwitchListN';
-import {RailListN} from '@/jlmap3d/main/newmodel/RailListN.js';
-
-import { Loading } from 'element-ui';
-// import {SwitchModel} from '@/jlmap3d/model/SwitchModel.js';
-
-export function DriverLoad(data,scope,netdata,sectionlist,linklist,signallist,stationstandlist,trainlisttest,realsectionlist,rails,camera,controls,scene,mixerss,storemod){
-  //console.log(mapdata);
-  Materialload(scope);
-  //console.log(data);
-  //console.log(scope);
-  let sceneload = scene;
-  let backdata = scope;
-  let assetloader = scope.assetloader;
-  let animateswitch = scope.animateswitch;
-
-  let mixers = mixerss;
-  let actions = scope.actions;
-
-  let loadingInstance = Loading.service({ fullscreen: true });
-
-  let switchlist;
-
-  let isSection = false;
-  let isNewdata = false;
-  if(netdata.assets){
-    let assetsdata = JSON.parse(netdata.sections);
-      // console.log(assetsdata.link);
-    if(assetsdata.link){
-      isSection = true;
-    }else{
-      isNewdata = true;
-    }
-  }
-  // console.log(isNewdata);
-    // console.log(netdata);
-  if(isSection == true){
-    init3d(data,netdata);
-  }else{
-    loadingInstance.close();
-    alert("没有三维数据");
-  }
-  function init3d(data,netdata){
-      let mapdata = data.data;
-      // console.log(data);
-      //初始化轨道和道岔   暂时
-      lengthfact(data.data);
-
-      linklist = new LinkList();
-      sectionlist = new SectionList();
-      signallist = new SignalList();
-      //初始化站台
-      stationstandlist = new StationStandList();
-      //初始化测试列车
-      trainlisttest = new TrainList();
-      realsectionlist = new RealSectionList();
-
-      rails = new RailList();
-
-      let loaderdata = JSON.parse(netdata.sections);
-      let switchdata = JSON.parse(netdata.switchs);
-      let signaldata = JSON.parse(netdata.signals);
-      let standsdata = JSON.parse(netdata.stands);
-
-      assetloader.setmodellist(netdata.assets);
-
-        assetloader.assetpromise(sceneload)
-        .then(function(data){
-          return   linklist.loadpromise(loaderdata.link,sceneload,assetloader);
-        })
-        .then(function(data){
-          //console.log(data);
-          return  stationstandlist.initpromise(mapdata.stationList,mapdata.stationStandList,sceneload,assetloader,netdata.stands,mixers,actions,"0");
-        })
-        .then(function(data){
-          //console.log(data);
-          //console.log(assetloader);
-          return  trainlisttest.initpromise(mapdata.trainList,sceneload,assetloader,mixers,actions,"0");
-        })
-        .then(function(data){
-          //console.log(data);
-          return   sectionlist.loadpromise(linklist,assetloader,loaderdata.section,switchdata,sceneload);
-        })
-        // .then(function(data){
-        //   //console.log(data);
-        //   return  jlmap3ddata.realsectionlist.initpromise(jlmap3ddata,sceneload,assetloader,mixers,actions);
-        // })
-        .then(function(data){
-          //console.log(data);
-          return   signallist.initpromise(mapdata.signalList,sceneload,assetloader,netdata.signals);
-        })
-        .then(function(data){
-          return new Promise(function(resolve, reject){
-            let stopoffset = 64;
-            rails.init(loaderdata.link,mapdata.linkList,mapdata.sectionList,switchdata,
-              stationstandlist.list,sceneload,storemod,stopoffset);
-            resolve("loadrail");
-
-          });
-        })
-
-        .then(function(data){
-          for(let mn=0;mn<scope.assetloader.modellist.length;mn++){
-            if(scope.assetloader.modellist[mn].name && scope.assetloader.modellist[mn].name == "suidao"){
-              // scope.assetloader.modellist[mn].mesh.rotation.x = Math.PI/2;
-              // scope.assetloader.modellist[mn].mesh.position.y -=0.1;
-              // console.log(scope.assetloader.modellist[mn].mesh);
-              scene.add(scope.assetloader.modellist[mn].mesh);
-            }
-          }
-
-
-          scope.animateswitch = true;
-
-          // mapdata = jlmap3ddata;
-          backdata.loaderdata(sectionlist,linklist,signallist,stationstandlist,trainlisttest,realsectionlist,rails);
-          scope.Subscribe.updatamap(sectionlist,linklist,signallist,stationstandlist,trainlisttest,realsectionlist,rails,scope.materiallist,scope.actions,scope.sceneload);
-          scope.webwork.postMessage("on");
-          loadingInstance.close();
-        });
-
-  }
-
-  function onProgress( xhr ) {
-
-    if ( xhr.lengthComputable ) {
-
-    let percentComplete = xhr.loaded / xhr.total * 100;
-    //console.log( 'model ' + Math.round( percentComplete, 2 ) + '% downloaded' );
-
-    }
-
-  }
-
-  function onError() {}
-
-
-}
-
-function lengthfact(data){
-  let linklist = [];
-  for(let i=0;i<data.linkList.length;i++){
-
-    let dx = Math.abs(data.linkList[i].lp.x - data.linkList[i].rp.x);
-    let dy = Math.abs(data.linkList[i].lp.y - data.linkList[i].rp.y);
-    let distance = Math.sqrt(Math.pow(dx,2)+Math.pow(dy,2));
-
-    let link = {
-      code:data.linkList[i].code,
-      lengthfact:data.linkList[i].lengthFact,
-      distance:distance
-    };
-    linklist.push(link);
-  }
-
-  let sectionlist = [];
-  for(let i=0;i<data.sectionList.length;i++){
-    for(let j=0;j<linklist.length;j++){
-      if(linklist[j].code == data.sectionList[i].linkCode){
-        let sectionoffset = data.sectionList[i].offsetRight - data.sectionList[i].offsetLeft;
-        let sectionlengthfact = sectionoffset/linklist[j].distance*linklist[j].lengthfact
-        let section = {
-          code:data.sectionList[i].code,
-          lengthfact:sectionoffset
-        };
-        sectionlist.push(section);
-        j = linklist.length;
-      }
-    }
-  }
-
-    //console.log(sectionlist);
-}
diff --git a/src/jlmap3d/main/loaders/DriverLoadNew.js b/src/jlmap3d/main/loaders/DriverLoadNew.js
index f3f664de8..8d2a52dcd 100644
--- a/src/jlmap3d/main/loaders/DriverLoadNew.js
+++ b/src/jlmap3d/main/loaders/DriverLoadNew.js
@@ -52,7 +52,6 @@ export function DriverLoadNew(data,scope,netdata,mapdata,sectionlist,signallist,
     Materialload(scope,JSON.parse(netdata.assets).stationTextureList[0]);
     let mapdata = data;
     //初始化轨道和道岔
-    // linklist = new LinkList();
     sectionlist = new SectionListN();
     signallist = new SignalListN();
     switchlist = new SwitchListN();
@@ -154,37 +153,3 @@ export function DriverLoadNew(data,scope,netdata,mapdata,sectionlist,signallist,
 
 
 }
-//旧link相关停操作待删除
-function lengthfact(data){
-  let linklist = [];
-  for(let i=0;i<data.linkList.length;i++){
-
-    let dx = Math.abs(data.linkList[i].lp.x - data.linkList[i].rp.x);
-    let dy = Math.abs(data.linkList[i].lp.y - data.linkList[i].rp.y);
-    let distance = Math.sqrt(Math.pow(dx,2)+Math.pow(dy,2));
-
-    let link = {
-      code:data.linkList[i].code,
-      lengthfact:data.linkList[i].lengthFact,
-      distance:distance
-    };
-    linklist.push(link);
-  }
-
-  let sectionlist = [];
-  for(let i=0;i<data.sectionList.length;i++){
-    for(let j=0;j<linklist.length;j++){
-      if(linklist[j].code == data.sectionList[i].linkCode){
-        let sectionoffset = data.sectionList[i].offsetRight - data.sectionList[i].offsetLeft;
-        let sectionlengthfact = sectionoffset/linklist[j].distance*linklist[j].lengthfact
-        let section = {
-          code:data.sectionList[i].code,
-          lengthfact:sectionoffset
-        };
-        sectionlist.push(section);
-        j = linklist.length;
-      }
-    }
-  }
-
-}
diff --git a/src/jlmap3d/main/loaders/Materialload.js b/src/jlmap3d/main/loaders/Materialload.js
index 801bc799c..51611d165 100644
--- a/src/jlmap3d/main/loaders/Materialload.js
+++ b/src/jlmap3d/main/loaders/Materialload.js
@@ -17,107 +17,7 @@ export function Materialload(jlmap3dedit,standTextureData){
       setstationtexture(jlmap3dedit.stationtexture,standTextureData.urls[i].name,BASE_ASSET_API + standTextureData.urls[i].url);
     }
   }
-   //
-   // if(assettype){
-   //   if(assettype.stationtexture == "xian3"){
-   //     if(jlmap3dedit.stationtexture){
-   //       setstationtexture(jlmap3dedit.stationtexture,"stationlist",JL3D_LOCAL_STATIC+'/texture/xian3/xian3list.jpg');
-   //       setstationtexture(jlmap3dedit.stationtexture,"pingbimen",JL3D_LOCAL_STATIC+'/texture/xian3/pingbimen.png');
-   //       setstationtexture(jlmap3dedit.stationtexture,"Station18000",JL3D_LOCAL_STATIC+'/texture/xian3/Station18000.jpg');
-   //       setstationtexture(jlmap3dedit.stationtexture,"Station61238",JL3D_LOCAL_STATIC+'/texture/xian3/Station61238.jpg');
-   //       setstationtexture(jlmap3dedit.stationtexture,"Station41790",JL3D_LOCAL_STATIC+'/texture/xian3/Station41790.jpg');
-   //       setstationtexture(jlmap3dedit.stationtexture,"Station67945",JL3D_LOCAL_STATIC+'/texture/xian3/Station67945.jpg');
-   //       setstationtexture(jlmap3dedit.stationtexture,"Station85598",JL3D_LOCAL_STATIC+'/texture/xian3/Station85598.jpg');
-   //       setstationtexture(jlmap3dedit.stationtexture,"Station4324",JL3D_LOCAL_STATIC+'/texture/xian3/Station4324.jpg');
-   //       setstationtexture(jlmap3dedit.stationtexture,"Station55755",JL3D_LOCAL_STATIC+'/texture/xian3/Station55755.jpg');
-   //       setstationtexture(jlmap3dedit.stationtexture,"Station53597",JL3D_LOCAL_STATIC+'/texture/xian3/Station53597.jpg');
-   //       setstationtexture(jlmap3dedit.stationtexture,"Station68029",JL3D_LOCAL_STATIC+'/texture/xian3/Station68029.jpg');
-   //       setstationtexture(jlmap3dedit.stationtexture,"Station17596",JL3D_LOCAL_STATIC+'/texture/xian3/Station17596.jpg');
-   //       setstationtexture(jlmap3dedit.stationtexture,"Station66742",JL3D_LOCAL_STATIC+'/texture/xian3/Station66742.jpg');
-   //       setstationtexture(jlmap3dedit.stationtexture,"Station90701",JL3D_LOCAL_STATIC+'/texture/xian3/Station90701.jpg');
-   //       setstationtexture(jlmap3dedit.stationtexture,"Station90652",JL3D_LOCAL_STATIC+'/texture/xian3/Station90652.jpg');
-   //       setstationtexture(jlmap3dedit.stationtexture,"Station54200",JL3D_LOCAL_STATIC+'/texture/xian3/Station54200.jpg');
-   //       setstationtexture(jlmap3dedit.stationtexture,"Station19253",JL3D_LOCAL_STATIC+'/texture/xian3/Station19253.jpg');
-   //       setstationtexture(jlmap3dedit.stationtexture,"Station37821",JL3D_LOCAL_STATIC+'/texture/xian3/Station37821.jpg');
-   //       setstationtexture(jlmap3dedit.stationtexture,"Station47557",JL3D_LOCAL_STATIC+'/texture/xian3/Station47557.jpg');
-   //       setstationtexture(jlmap3dedit.stationtexture,"Station78551",JL3D_LOCAL_STATIC+'/texture/xian3/Station78551.jpg');
-   //       setstationtexture(jlmap3dedit.stationtexture,"Station64474",JL3D_LOCAL_STATIC+'/texture/xian3/Station64474.jpg');
-   //       setstationtexture(jlmap3dedit.stationtexture,"Station21203",JL3D_LOCAL_STATIC+'/texture/xian3/Station21203.jpg');
-   //       setstationtexture(jlmap3dedit.stationtexture,"Station34499",JL3D_LOCAL_STATIC+'/texture/xian3/Station34499.jpg');
-   //       setstationtexture(jlmap3dedit.stationtexture,"Station571",JL3D_LOCAL_STATIC+'/texture/xian3/Station571.jpg');
-   //       setstationtexture(jlmap3dedit.stationtexture,"Station99903",JL3D_LOCAL_STATIC+'/texture/xian3/Station99903.jpg');
-   //       setstationtexture(jlmap3dedit.stationtexture,"Station43447",JL3D_LOCAL_STATIC+'/texture/xian3/Station43447.jpg');
-   //       setstationtexture(jlmap3dedit.stationtexture,"Station67917",JL3D_LOCAL_STATIC+'/texture/xian3/Station67917.jpg');
-   //       setstationtexture(jlmap3dedit.stationtexture,"Station60649",JL3D_LOCAL_STATIC+'/texture/xian3/Station60649.jpg');
-   //     }
-   //   }
-   //   if(assettype.stationtexture == "haerbin1"){
-   //     if(jlmap3dedit.stationtexture){
-   //       setstationtexture(jlmap3dedit.stationtexture,"stationlist",JL3D_LOCAL_STATIC+'/texture/heb/haerbinlist.jpg');
-   //       setstationtexture(jlmap3dedit.stationtexture,"pingbimen",JL3D_LOCAL_STATIC+'/texture/heb/pingbimen.png');
-   //       setstationtexture(jlmap3dedit.stationtexture,"Station5361",JL3D_LOCAL_STATIC+'/texture/heb/Station5361.jpg');
-   //       setstationtexture(jlmap3dedit.stationtexture,"Station11094",JL3D_LOCAL_STATIC+'/texture/heb/Station11094.jpg');
-   //       setstationtexture(jlmap3dedit.stationtexture,"Station11136",JL3D_LOCAL_STATIC+'/texture/heb/Station11136.jpg');
-   //       setstationtexture(jlmap3dedit.stationtexture,"Station17293",JL3D_LOCAL_STATIC+'/texture/heb/Station17293.jpg');
-   //       setstationtexture(jlmap3dedit.stationtexture,"Station18398",JL3D_LOCAL_STATIC+'/texture/heb/Station18398.jpg');
-   //       setstationtexture(jlmap3dedit.stationtexture,"Station22163",JL3D_LOCAL_STATIC+'/texture/heb/Station22163.jpg');
-   //       setstationtexture(jlmap3dedit.stationtexture,"Station25464",JL3D_LOCAL_STATIC+'/texture/heb/Station25464.jpg');
-   //       setstationtexture(jlmap3dedit.stationtexture,"Station28090",JL3D_LOCAL_STATIC+'/texture/heb/Station28090.jpg');
-   //       setstationtexture(jlmap3dedit.stationtexture,"Station41999",JL3D_LOCAL_STATIC+'/texture/heb/Station41999.jpg');
-   //       setstationtexture(jlmap3dedit.stationtexture,"Station44338",JL3D_LOCAL_STATIC+'/texture/heb/Station44338.jpg');
-   //       setstationtexture(jlmap3dedit.stationtexture,"Station46464",JL3D_LOCAL_STATIC+'/texture/heb/Station46464.jpg');
-   //       setstationtexture(jlmap3dedit.stationtexture,"Station50565",JL3D_LOCAL_STATIC+'/texture/heb/Station50565.jpg');
-   //       setstationtexture(jlmap3dedit.stationtexture,"Station60068",JL3D_LOCAL_STATIC+'/texture/heb/Station60068.jpg');
-   //       setstationtexture(jlmap3dedit.stationtexture,"Station62429",JL3D_LOCAL_STATIC+'/texture/heb/Station62429.jpg');
-   //       setstationtexture(jlmap3dedit.stationtexture,"Station64444",JL3D_LOCAL_STATIC+'/texture/heb/Station64444.jpg');
-   //       setstationtexture(jlmap3dedit.stationtexture,"Station71700",JL3D_LOCAL_STATIC+'/texture/heb/Station71700.jpg');
-   //       setstationtexture(jlmap3dedit.stationtexture,"Station72132",JL3D_LOCAL_STATIC+'/texture/heb/Station72132.jpg');
-   //       setstationtexture(jlmap3dedit.stationtexture,"Station78164",JL3D_LOCAL_STATIC+'/texture/heb/Station78164.jpg');
-   //       setstationtexture(jlmap3dedit.stationtexture,"Station79537",JL3D_LOCAL_STATIC+'/texture/heb/Station79537.jpg');
-   //       setstationtexture(jlmap3dedit.stationtexture,"Station82618",JL3D_LOCAL_STATIC+'/texture/heb/Station82618.jpg');
-   //       setstationtexture(jlmap3dedit.stationtexture,"Station85520",JL3D_LOCAL_STATIC+'/texture/heb/Station85520.jpg');
-   //       setstationtexture(jlmap3dedit.stationtexture,"Station89483",JL3D_LOCAL_STATIC+'/texture/heb/Station89483.jpg');
-   //       setstationtexture(jlmap3dedit.stationtexture,"Station96090",JL3D_LOCAL_STATIC+'/texture/heb/Station96090.jpg');
-   //     }
-   //   }
-   //   if(assettype.stationtexture == "nb1"){
-   //     if(jlmap3dedit.stationtexture){
-   //       setstationtexture(jlmap3dedit.stationtexture,"stationlist",JL3D_LOCAL_STATIC+'/texture/nb1/nb1list.jpg');
-   //       setstationtexture(jlmap3dedit.stationtexture,"pingbimen",JL3D_LOCAL_STATIC+'/texture/nb1/pingbimen.png');
-   //       setstationtexture(jlmap3dedit.stationtexture,"Station1533",JL3D_LOCAL_STATIC+'/texture/nb1/Station1533.jpg');
-   //       setstationtexture(jlmap3dedit.stationtexture,"Station11231",JL3D_LOCAL_STATIC+'/texture/nb1/Station11231.jpg');
-   //       setstationtexture(jlmap3dedit.stationtexture,"Station12421",JL3D_LOCAL_STATIC+'/texture/nb1/Station12421.jpg');
-   //       setstationtexture(jlmap3dedit.stationtexture,"Station16356",JL3D_LOCAL_STATIC+'/texture/nb1/Station16356.jpg');
-   //       setstationtexture(jlmap3dedit.stationtexture,"Station18678",JL3D_LOCAL_STATIC+'/texture/nb1/Station18678.jpg');
-   //       setstationtexture(jlmap3dedit.stationtexture,"Station19817",JL3D_LOCAL_STATIC+'/texture/nb1/Station19817.jpg');
-   //       setstationtexture(jlmap3dedit.stationtexture,"Station23567",JL3D_LOCAL_STATIC+'/texture/nb1/Station23567.jpg');
-   //       setstationtexture(jlmap3dedit.stationtexture,"Station24903",JL3D_LOCAL_STATIC+'/texture/nb1/Station24903.jpg');
-   //       setstationtexture(jlmap3dedit.stationtexture,"Station26416",JL3D_LOCAL_STATIC+'/texture/nb1/Station26416.jpg');
-   //       setstationtexture(jlmap3dedit.stationtexture,"Station27207",JL3D_LOCAL_STATIC+'/texture/nb1/Station27207.jpg');
-   //       setstationtexture(jlmap3dedit.stationtexture,"Station28032",JL3D_LOCAL_STATIC+'/texture/nb1/Station28032.jpg');
-   //       setstationtexture(jlmap3dedit.stationtexture,"Station28958",JL3D_LOCAL_STATIC+'/texture/nb1/Station28958.jpg');
-   //       setstationtexture(jlmap3dedit.stationtexture,"Station30520",JL3D_LOCAL_STATIC+'/texture/nb1/Station30520.jpg');
-   //       setstationtexture(jlmap3dedit.stationtexture,"Station32955",JL3D_LOCAL_STATIC+'/texture/nb1/Station32955.jpg');
-   //       setstationtexture(jlmap3dedit.stationtexture,"Station38286",JL3D_LOCAL_STATIC+'/texture/nb1/Station38286.jpg');
-   //       setstationtexture(jlmap3dedit.stationtexture,"Station38674",JL3D_LOCAL_STATIC+'/texture/nb1/Station38674.jpg');
-   //       setstationtexture(jlmap3dedit.stationtexture,"Station44173",JL3D_LOCAL_STATIC+'/texture/nb1/Station44173.jpg');
-   //       setstationtexture(jlmap3dedit.stationtexture,"Station63100",JL3D_LOCAL_STATIC+'/texture/nb1/Station63100.jpg');
-   //       setstationtexture(jlmap3dedit.stationtexture,"Station69378",JL3D_LOCAL_STATIC+'/texture/nb1/Station69378.jpg');
-   //       setstationtexture(jlmap3dedit.stationtexture,"Station72310",JL3D_LOCAL_STATIC+'/texture/nb1/Station72310.jpg');
-   //       setstationtexture(jlmap3dedit.stationtexture,"Station72764",JL3D_LOCAL_STATIC+'/texture/nb1/Station72764.jpg');
-   //       setstationtexture(jlmap3dedit.stationtexture,"Station75414",JL3D_LOCAL_STATIC+'/texture/nb1/Station75414.jpg');
-   //       setstationtexture(jlmap3dedit.stationtexture,"Station75494",JL3D_LOCAL_STATIC+'/texture/nb1/Station75494.jpg');
-   //       setstationtexture(jlmap3dedit.stationtexture,"Station75703",JL3D_LOCAL_STATIC+'/texture/nb1/Station75703.jpg');
-   //       setstationtexture(jlmap3dedit.stationtexture,"Station78392",JL3D_LOCAL_STATIC+'/texture/nb1/Station78392.jpg');
-   //       setstationtexture(jlmap3dedit.stationtexture,"Station81700",JL3D_LOCAL_STATIC+'/texture/nb1/Station81700.jpg');
-   //       setstationtexture(jlmap3dedit.stationtexture,"Station84098",JL3D_LOCAL_STATIC+'/texture/nb1/Station84098.jpg');
-   //       setstationtexture(jlmap3dedit.stationtexture,"Station86112",JL3D_LOCAL_STATIC+'/texture/nb1/Station86112.jpg');
-   //       setstationtexture(jlmap3dedit.stationtexture,"Station99584",JL3D_LOCAL_STATIC+'/texture/nb1/Station99584.jpg');
-   //   }
-   //   }
-   // }
-
-   //console.log(jlmap3dedit.materiallist);
+   
 }
 
 function settexture(materiallist,name,textureurl){
diff --git a/src/jlmap3d/main/loaders/SimulationLoad.js b/src/jlmap3d/main/loaders/SimulationLoad.js
deleted file mode 100644
index a25f2ce42..000000000
--- a/src/jlmap3d/main/loaders/SimulationLoad.js
+++ /dev/null
@@ -1,211 +0,0 @@
-//componnent
-import {SectionList} from '@/jlmap3d/main/model/SectionList.js';
-import {SignalList} from '@/jlmap3d/main/model/SignalList.js';
-import {StationStandList} from '@/jlmap3d/main/model/StationStandList.js';
-import {TrainList} from '@/jlmap3d/main/model/TrainList.js';
-import {RealSectionList} from '@/jlmap3d/main/model/RealSectionList.js';
-import {LinkList} from '@/jlmap3d/main/model/LinkList.js';
-import {RailList} from '@/jlmap3d/main/model/RailList.js';
-
-import {SectionListN} from '@/jlmap3d/main/newmodel/SectionListN';
-import {SignalListN} from '@/jlmap3d/main/newmodel/SignalListN';
-import {StationStandListN} from '@/jlmap3d/main/newmodel/StationStandListN';
-import {SwitchListN} from '@/jlmap3d/main/newmodel/SwitchListN';
-import {RailListN} from '@/jlmap3d/main/newmodel/RailListN.js';
-
-
-import {Materialload} from '@/jlmap3d/main/loaders/Materialload.js';
-
-import { Loading } from 'element-ui';
-// import {SwitchModel} from '@/jlmap3d/model/SwitchModel.js';
-
-export function SimulationLoad(data,scope,netdata,mapdata,camera,controls,scene,storemod){
-  //console.log(mapdata);
-  Materialload(scope);
-  //console.log(data);
-  //console.log(scope);
-  let sceneload = scene;
-  let backdata = scope;
-  let jlmap3ddata = mapdata;
-  let assetloader = scope.assetloader;
-  let animateswitch = scope.animateswitch;
-
-  let mixers = scope.mixers;
-  let actions = scope.actions;
-
-  let linklist,sectionlist,signallist,stationstandlist,trainlisttest,switchlist,realsectionlist,rails;
-
-  let loadingInstance = Loading.service({ fullscreen: true });
-
-  let isSection = false;
-  let isNewdata = false;
-  if(netdata.assets){
-    init3d(data,netdata);
-  }else{
-    loadingInstance.close();
-    alert("没有三维数据");
-  }
-
-  function init3d(data,netdata){
-      let mapdata = data;
-      // console.log(data);
-      //初始化轨道和道岔   暂时
-      lengthfact(data);
-      linklist = new LinkList();
-      sectionlist = new SectionList();
-      //初始化信号机
-      signallist = new SignalList();
-      //初始化站台
-      stationstandlist = new StationStandList();
-      //初始化测试列车
-      trainlisttest = new TrainList();
-
-      realsectionlist = new RealSectionList();
-      rails = new RailList();
-      let loaderdata = JSON.parse(netdata.sections);
-      let switchdata = JSON.parse(netdata.switchs);
-      let signaldata = JSON.parse(netdata.signals);
-      let standsdata = JSON.parse(netdata.stands);
-    
-      // console.log(netdata.assets);
-      assetloader.setmodellist(netdata.assets,1);
-
-        assetloader.assetpromise(sceneload)
-        .then(function(data){
-          //console.log(data);
-          return   linklist.loadpromise(loaderdata.link,scene,assetloader);
-        })
-        .then(function(data){
-          //console.log(data);
-          return  stationstandlist.initpromise(mapdata.stationList,mapdata.stationStandList,sceneload,assetloader,netdata.stands,mixers,actions,"02");
-        })
-        .then(function(data){
-          //console.log(data);
-          //console.log(assetloader);
-          return  trainlisttest.initpromise(mapdata.trainList,sceneload,assetloader,mixers,actions,"02");
-        })
-        .then(function(data){
-          //console.log(data);
-          return   sectionlist.loadpromise(linklist,assetloader,loaderdata.section,switchdata,sceneload);
-        })
-        // // .then(function(data){
-        // //   //console.log(data);
-        // //   return  realsectionlist.initpromise(jlmap3ddata,sceneload,assetloader,mixers,actions);
-        // // })
-        .then(function(data){
-          //console.log(data);
-          return   signallist.initpromise(mapdata.signalList,sceneload,assetloader,netdata.signals);
-        })
-        .then(function(data){
-          return new Promise(function(resolve, reject){
-            let stopoffset = 61.92;
-            rails.init(loaderdata.link,mapdata.linkList,mapdata.sectionList,switchdata, stationstandlist.list,sceneload,storemod,stopoffset);
-            resolve("loadrail");
-
-          });
-        })
-        .then(function(data){
-          return new Promise(function(resolve, reject){
-            let mergegeometry
-            let mergeindex = 0;
-            let materialarr = [];
-
-            for(let mn=0;mn<scope.assetloader.modellist.length;mn++){
-
-              if(scope.assetloader.modellist[mn].name && scope.assetloader.modellist[mn].name == "suidao"){
-                // scope.assetloader.modellist[mn].mesh.rotation.x = Math.PI/2;
-                // console.log(scope.assetloader.modellist[mn].mesh.position);
-                scope.assetloader.modellist[mn].mesh.name = "suidao";
-                // console.log(scope.assetloader.modellist[mn].mesh);
-                scene.add(scope.assetloader.modellist[mn].mesh);
-              }
-              if(scope.assetloader.modellist[mn].name && scope.assetloader.modellist[mn].name == "background"){
-                // scope.assetloader.modellist[mn].mesh.rotation.x = Math.PI/2;
-                // console.log(scope.assetloader.modellist[mn].mesh.position);
-                scope.assetloader.modellist[mn].mesh.name = "background";
-                // console.log(scope.assetloader.modellist[mn].mesh);
-                scene.add(scope.assetloader.modellist[mn].mesh);
-
-              }
-            }
-
-
-            let mergemesh = new THREE.Mesh( mergegeometry, materialarr );
-            scene.add(mergemesh);
-            resolve("mergemodel");
-          });
-        })
-        .then(function(data){
-
-
-          // scope.animateswitch = true;
-
-          //console.log(scope);
-
-          //更新相机方向
-
-          backdata.loaderdata(sectionlist,linklist,signallist,stationstandlist,trainlisttest,realsectionlist,rails);
-          scope.updatecamera(stationstandlist.group.children[0],"station");
-          //
-          scope.Subscribe.updatamap(sectionlist,linklist,signallist,stationstandlist,trainlisttest,realsectionlist,rails,scope.materiallist,scope.actions,scope.sceneload);
-          //
-          updatemenulist(stationstandlist.list,trainlisttest.list);
-          scope.webwork.postMessage("on");
-          scope.jsonwebwork.postMessage("connect");
-          // console.log(sceneload);
-          loadingInstance.close();
-        });
-
-  }
-
-  function onProgress( xhr ) {
-
-    if ( xhr.lengthComputable ) {
-
-    let percentComplete = xhr.loaded / xhr.total * 100;
-    //console.log( 'model ' + Math.round( percentComplete, 2 ) + '% downloaded' );
-
-    }
-
-  }
-
-  function onError() {}
-
-
-}
-
-function lengthfact(data){
-  let linklist = [];
-  //console.log(data);
-  for(let i=0;i<data.linkList.length;i++){
-
-    let dx = Math.abs(data.linkList[i].lp.x - data.linkList[i].rp.x);
-    let dy = Math.abs(data.linkList[i].lp.y - data.linkList[i].rp.y);
-    let distance = Math.sqrt(Math.pow(dx,2)+Math.pow(dy,2));
-
-    let link = {
-      code:data.linkList[i].code,
-      lengthfact:data.linkList[i].lengthFact,
-      distance:distance
-    };
-    linklist.push(link);
-  }
-
-  let sectionlist = [];
-  for(let i=0;i<data.sectionList.length;i++){
-    for(let j=0;j<linklist.length;j++){
-      if(linklist[j].code == data.sectionList[i].linkCode){
-        let sectionoffset = data.sectionList[i].offsetRight - data.sectionList[i].offsetLeft;
-        let sectionlengthfact = sectionoffset/linklist[j].distance*linklist[j].lengthfact
-        let section = {
-          code:data.sectionList[i].code,
-          lengthfact:sectionoffset
-        };
-        sectionlist.push(section);
-        j = linklist.length;
-      }
-    }
-  }
-
-    //console.log(sectionlist);
-}
diff --git a/src/jlmap3d/main/loaders/SimulationLoadNew.js b/src/jlmap3d/main/loaders/SimulationLoadNew.js
index bc236ea50..b5e17d2e4 100644
--- a/src/jlmap3d/main/loaders/SimulationLoadNew.js
+++ b/src/jlmap3d/main/loaders/SimulationLoadNew.js
@@ -1,11 +1,4 @@
 //componnent
-import {SectionList} from '@/jlmap3d/main/model/SectionList.js';
-import {SignalList} from '@/jlmap3d/main/model/SignalList.js';
-import {StationStandList} from '@/jlmap3d/main/model/StationStandList.js';
-import {TrainList} from '@/jlmap3d/main/model/TrainList.js';
-import {RealSectionList} from '@/jlmap3d/main/model/RealSectionList.js';
-import {LinkList} from '@/jlmap3d/main/model/LinkList.js';
-import {RailList} from '@/jlmap3d/main/model/RailList.js';
 
 import {TrainListN} from '@/jlmap3d/main/newmodel/TrainListN.js';
 import {SectionListN} from '@/jlmap3d/main/newmodel/SectionListN';
@@ -55,7 +48,6 @@ export function SimulationLoadNew(data,scope,netdata,mapdata,camera,controls,sce
     //初始化轨道和道岔
     // lengthfact(data);
 
-    // linklist = new LinkList();
     sectionlist = new SectionListN();
     signallist = new SignalListN();
     switchlist = new SwitchListN();
@@ -63,7 +55,6 @@ export function SimulationLoadNew(data,scope,netdata,mapdata,camera,controls,sce
     stationstandlist = new StationStandListN();
     //初始化测试列车
     trainlisttest = new TrainListN();
-    // realsectionlist = new RealSectionList();
 
     rails = new RailListN();
 
@@ -177,7 +168,7 @@ export function SimulationLoadNew(data,scope,netdata,mapdata,camera,controls,sce
       scope.jsonwebworknew.postMessage("connect");
       updatemenulist(stationstandlist.list,trainlisttest.list);
       // loadingInstance.close();
-		store.dispatch('app/animationsClose');
+	    store.dispatch('app/animationsClose');
     });
 
   }
diff --git a/src/jlmap3d/main/model/LinkList.js b/src/jlmap3d/main/model/LinkList.js
deleted file mode 100644
index b56d98be8..000000000
--- a/src/jlmap3d/main/model/LinkList.js
+++ /dev/null
@@ -1,327 +0,0 @@
-
-export function LinkList(data){
-
-  let scope = this;
-
-  this.type = "linklist";
-
-  this.linkdata = [];
-
-  this.linksgroup = new THREE.Group();
-  this.linksgroup.name = "link";
-
-  this.initpromise = function(linkdata,scene,assetloader){
-    // console.log("init");
-    return new Promise(function(resolve, reject){
-      linkhelp(linkdata,scene);
-
-      scene.add(scope.linksgroup);
-      linktest(linkdata,scene,assetloader);
-      resolve("loadedrealsection");
-    });
-  };
-
-  this.loadpromise = function(linkdata,scene,assetloader){
-    // console.log(linkdata);
-    console.log("load");
-    return new Promise(function(resolve, reject){
-      scene.add(scope.linksgroup);
-      loadlink(linkdata,scene,assetloader);
-      resolve("loadedrealsection");
-    });
-  };
-
-function linkhelp(data,scene){
-  let groups = new THREE.Group();
-  for(let i=0;i<data.length;i++){
-    let lineGeometry = new THREE.Geometry();//生成几何体
-
-    lineGeometry.vertices.push(new THREE.Vector3(data[i].lp.x, 1, data[i].lp.y));//线段的两个顶点
-    lineGeometry.vertices.push(new THREE.Vector3(data[i].rp.x, 1, data[i].rp.y));
-
-    let line = new THREE.Line(lineGeometry, new THREE.LineDashedMaterial({
-        color: 0xffffff,//线段的颜色
-        dashSize: 1,//短划线的大小
-        gapSize: 3//短划线之间的距离
-    }));
-    line.name = data[i].code;
-    line.lengthFact = data[i].lengthFact;
-    line.lp = data[i].lp;
-    line.rp = data[i].rp;
-    line.distancex = data[i].rp.x-data[i].lp.x;
-    line.distancey = data[i].rp.y-data[i].lp.y;
-    line.computeLineDistances();//不可或缺的，若无，则线段不能显示为虚线
-    groups.add(line);
-
-  }
-  groups.position.z = 2000;
-  scene.add(groups);
-}
-
-
-let mergegeometry = new THREE.Geometry();
-
-  function loadlink(data,scene,assetloader){
-    let autorail;
-    for(let i=0;i<assetloader.modellist.length;i++){
-      if(assetloader.modellist[i].deviceType == "autorail"){
-        autorail = assetloader.modellist[i].mesh.children[0];
-      }
-    }
-    let count = autorail.geometry.attributes.position.count;
-    let rightlist = [];
-    let leftlist = [];
-		for(let i=0;i<count;i++){
-			if(autorail.geometry.attributes.position.array[i*3] >0.49){
-				rightlist.push(i);
-			}
-			if(autorail.geometry.attributes.position.array[i*3] <-0.49){
-				leftlist.push(i);
-			}
-		}
-
-
-
-    for(let i=0;i<data.length;i++){
-      // console.log("link");
-      // console.log(data[i]);
-      let testmesh2 = autorail.clone(true);
-      testmesh2.code = data[i].code;
-      testmesh2.name = data[i].name;
-      testmesh2.rightlist = rightlist;
-  		testmesh2.leftlist = leftlist;
-      testmesh2.rp = data[i].rp;
-      testmesh2.lp = data[i].lp;
-      testmesh2.lengthfact = data[i].lengthfact;
-
-      for(let i=0;i<testmesh2.rightlist.length;i++){
-          testmesh2.geometry.attributes.position.array[testmesh2.rightlist[i]*3] = testmesh2.lengthfact-25;
-          testmesh2.geometry.attributes.uv.array[testmesh2.rightlist[i]*2] = testmesh2.geometry.attributes.position.array[0]-testmesh2.geometry.attributes.position.array[3];
-      }
-      let newrail = new THREE.BufferGeometry();
-      newrail.copy(testmesh2.geometry);
-      testmesh2.geometry = newrail;
-      testmesh2.geometry.attributes.position.needsUpdate = true;
-      testmesh2.geometry.attributes.uv.needsUpdate = true;
-      testmesh2.geometry.computeBoundingSphere();
-      testmesh2.geometry.center();
-
-      testmesh2.position.x = data[i].position.x;
-      testmesh2.position.y = data[i].position.y;
-      testmesh2.position.z = data[i].position.z;
-      // testmesh2.rotation.x = data[i].rotation._x;
-      // testmesh2.rotation.y = data[i].rotation._y;
-      testmesh2.rotation.z = data[i].rotation._z;
-      testmesh2.updateMatrix();
-      mergegeometry.merge(new THREE.Geometry().fromBufferGeometry(testmesh2.geometry),testmesh2.matrix);
-      // console.log(testmesh2);
-      testmesh2.geometry.dispose();
-      for(let j in testmesh2.material){
-        testmesh2.material[j].map.dispose();
-        testmesh2.material[j].dispose();
-      }
-
-      // scope.linkdata.push(testmesh2);
-      // scope.linksgroup.add(testmesh2);
-    }
-    let mergemesh = new THREE.Mesh( mergegeometry, autorail.material );
-    scope.linksgroup.add( mergemesh );
-  }
-
-
-
-  // return linklist;
-
-  function linktest(data,scene,assetloader){
-    let autorail = null;
-    let autosuidao = null;
-    for(let i=0;i<assetloader.modellist.length;i++){
-      if(assetloader.modellist[i].deviceType == "autorail"){
-        autorail = assetloader.modellist[i].mesh.children[0];
-      }
-    }
-
-    let rightlist = [];
-		let leftlist = [];
-		let count = autorail.geometry.attributes.position.count;
-		for(let i=0;i<count;i++){
-			if(autorail.geometry.attributes.position.array[i*3] >0.49){
-				rightlist.push(i);
-			}
-			if(autorail.geometry.attributes.position.array[i*3] <-0.49){
-				leftlist.push(i);
-			}
-		}
-
-		autorail.rightlist = rightlist;
-		autorail.leftlist = leftlist;
-
-
-    let reallinks = [];
-    let testlink;
-    testlink = data;
-    if(data){
-      let index,startdata;
-      for(let n=0;n<data.length;n++){
-        if(data[n].leftFdCode == undefined && data[n].leftSdCode == undefined && data[n].rightFdCode ){
-          if(startdata){
-            if(data[n].lp.x<startdata.lp.x){
-              startdata = data[n];
-              index = n;
-            }
-          }else{
-            startdata = data[n];
-            index = n;
-          }
-        }
-      }
-      buildmodel(startdata);
-      reallinks.push(startdata);
-      data.splice(index,1);
-      for(let i=0;i<reallinks.length;i++){
-        for(let j=0;j<data.length;j++){
-          if(reallinks[i].leftFdCode && j>=0){
-            if(reallinks[i].leftFdCode == data[j].code){
-              buildmodel(data[j],reallinks[i],j,"left");
-              reallinks.push(data[j]);
-              data.splice(j,1);
-              j--;
-            }
-          }
-          if(reallinks[i].leftSdCode && j>=0){
-
-            if(reallinks[i].leftSdCode == data[j].code){
-              buildmodel(data[j],reallinks[i],j,"left");
-              reallinks.push(data[j]);
-              data.splice(j,1);
-              j--;
-            }
-          }
-
-          if(reallinks[i].rightFdCode && j>=0){
-            if(reallinks[i].rightFdCode == data[j].code){
-
-              buildmodel(data[j],reallinks[i],j,"right");
-              reallinks.push(data[j]);
-              data.splice(j,1);
-              j--;
-            }
-          }
-
-          if(reallinks[i].rightSdCode && j>=0){
-            if(reallinks[i].rightSdCode == data[j].code){
-              buildmodel(data[j],reallinks[i],j,"right");
-              reallinks.push(data[j]);
-              data.splice(j,1);
-              j--;
-            }
-          }
-
-        }
-      }
-
-      function buildmodel(data,mdata,sx,direct){
-        let len = data.lengthFact;
-
-        let testmesh2 = autorail.clone(true);
-        for(let i=0;i<autorail.rightlist.length;i++){
-						testmesh2.geometry.attributes.position.array[autorail.rightlist[i]*3] = len-25;
-						testmesh2.geometry.attributes.uv.array[autorail.rightlist[i]*2] = testmesh2.geometry.attributes.position.array[0]-testmesh2.geometry.attributes.position.array[3];
-				}
-        let newrail = new THREE.BufferGeometry();
-        newrail.copy(testmesh2.geometry);
-        testmesh2.geometry = newrail;
-        testmesh2.geometry.attributes.position.needsUpdate = true;
-				testmesh2.geometry.attributes.uv.needsUpdate = true;
-				testmesh2.geometry.computeBoundingSphere();
-        testmesh2.geometry.center();
-        // data.lp.y *= 10;
-        // data.rp.y *= 10;
-
-        if(mdata){
-
-          if(direct == "left"){
-            let dx = Math.abs(data.lp.x - data.rp.x);
-            let dy = Math.abs(data.lp.y - data.rp.y);
-            let distance = Math.sqrt(Math.pow(dx,2)+Math.pow(dy,2));
-
-            data.lp.x = (data.lp.x-data.rp.x)*data.lengthFact/distance+mdata.lp.x;
-            data.lp.y = (data.lp.y-data.rp.y)*data.lengthFact/distance+mdata.lp.y;
-
-            data.rp.x = mdata.lp.x;
-            data.rp.y = mdata.lp.y;
-
-
-            let axix = new THREE.Vector3(1,0,0);
-            let axixnow = new THREE.Vector3(data.rp.x-data.lp.x,0,data.rp.y-data.lp.y);
-            let rotenum = axixnow.angleTo(axix);
-            //不同坐标系方向值不同
-            if(data.lp.y>data.rp.y){
-              testmesh2.rotation.z = 0.218;
-              data.lp.x = data.rp.x - (data.lengthFact)*Math.cos(testmesh2.rotation.z);
-              data.lp.y = data.rp.y + (data.lengthFact)*Math.sin(testmesh2.rotation.z);
-            }else if(data.lp.y<data.rp.y){
-              testmesh2.rotation.z = -0.218;
-              data.lp.x = data.rp.x - (data.lengthFact)*Math.cos(testmesh2.rotation.z);
-              data.lp.y = data.rp.y + (data.lengthFact)*Math.sin(testmesh2.rotation.z);
-            }else{
-              testmesh2.rotation.z = rotenum;
-            }
-            testmesh2.position.x = (data.rp.x + data.lp.x)/2;
-            testmesh2.position.z = (data.rp.y + data.lp.y)/2;
-
-          }
-
-          if(direct == "right"){
-
-            let dx = Math.abs(data.lp.x - data.rp.x);
-            let dy = Math.abs(data.lp.y - data.rp.y);
-            let distance = Math.sqrt(Math.pow(dx,2)+Math.pow(dy,2));
-
-
-            data.rp.x = (data.rp.x-data.lp.x)*data.lengthFact/distance+mdata.rp.x;
-            data.rp.y = (data.rp.y-data.lp.y)*data.lengthFact/distance+mdata.rp.y;
-
-            data.lp.x = mdata.rp.x;
-            data.lp.y = mdata.rp.y;
-            let axix = new THREE.Vector3(1,0,0);
-            let axixnow = new THREE.Vector3(data.rp.x-data.lp.x,0,data.rp.y-data.lp.y);
-            let rotenum = axixnow.angleTo(axix);
-            //不同坐标系方向值不同
-            if(data.lp.y>data.rp.y){
-              testmesh2.rotation.z = 0.218;
-              data.rp.x = data.lp.x+(data.lengthFact)*Math.cos(testmesh2.rotation.z);
-              data.rp.y = data.lp.y-(data.lengthFact)*Math.sin(testmesh2.rotation.z);
-            }else if(data.lp.y<data.rp.y){
-              testmesh2.rotation.z = -0.218;
-              data.rp.x = data.lp.x+(data.lengthFact)*Math.cos(testmesh2.rotation.z);
-              data.rp.y = data.lp.y-(data.lengthFact)*Math.sin(testmesh2.rotation.z);
-            }
-
-            testmesh2.position.x = (data.lp.x + data.rp.x)/2;
-            testmesh2.position.z = (data.lp.y + data.rp.y)/2;
-
-
-          }
-        }else{
-          data.lp.x = data.lp.x;
-          data.rp.x = data.lp.x + data.lengthFact;
-          testmesh2.position.x = (data.lp.x + data.rp.x)/2;
-          testmesh2.position.z = (data.lp.y + data.rp.y)/2;
-        }
-        // testmesh2.position.y = 10;
-        testmesh2.code = data.code;
-        testmesh2.name = data.name;
-        testmesh2.meshtype = "link";
-        testmesh2.lp = data.lp;
-        testmesh2.rp = data.rp;
-        testmesh2.rightlist = autorail.rightlist;
-        testmesh2.leftlist = autorail.leftlist;
-        testmesh2.lengthfact = data.lengthFact;
-
-				scope.linksgroup.add( testmesh2 );
-        scope.linkdata.push(testmesh2);
-      }
-    }
-  }
-}
diff --git a/src/jlmap3d/main/model/RailList.js b/src/jlmap3d/main/model/RailList.js
deleted file mode 100644
index d2b35c383..000000000
--- a/src/jlmap3d/main/model/RailList.js
+++ /dev/null
@@ -1,331 +0,0 @@
-export function RailList(){
-  let scope = this;
-
-  this.linkrail = [];
-
-  this.switchrail = [];
-
-  this.stops = [];
-
-  this.setrail = function(){
-
-  };
-  this.init = function(linkdata,linklist,sectiondata,switchdata,standsdata,scene,storemod,stopoffset){
-    for(let i=0;i<linkdata.length;i++){
-      scope.linkrail[linkdata[i].code] = {
-        lp:linkdata[i].rail[0],
-        rp:linkdata[i].rail[1],
-        lconnect:null,
-        rconnect:null,
-        lengthfact:linkdata[i].lengthfact,
-        lineleft:null,
-        lineright:null,
-        points:[],
-        type:null
-      };
-    }
-
-    for(let i=0;i<switchdata.length;i++){
-      scope.switchrail[switchdata[i].code] = {
-        alink:switchdata[i].alink,
-        blink:switchdata[i].blink,
-        clink:switchdata[i].clink,
-        position:switchdata[i].position,
-        directtype:null,
-        locateType:0
-      };
-
-      if(scope.linkrail[switchdata[i].blink].lp.x < switchdata[i].position.x){
-        scope.linkrail[switchdata[i].alink].lswitch = switchdata[i].code;
-        scope.linkrail[switchdata[i].blink].rswitch = switchdata[i].code;
-
-      }else{
-        scope.linkrail[switchdata[i].alink].rswitch = switchdata[i].code;
-        scope.linkrail[switchdata[i].blink].lswitch = switchdata[i].code;
-      }
-      //
-      if(scope.linkrail[switchdata[i].clink].lp.x < switchdata[i].position.x){
-        scope.linkrail[switchdata[i].alink].lswitch = switchdata[i].code;
-        scope.linkrail[switchdata[i].clink].rswitch = switchdata[i].code;
-      }else{
-        scope.linkrail[switchdata[i].alink].rswitch = switchdata[i].code;
-        scope.linkrail[switchdata[i].clink].lswitch = switchdata[i].code;
-      }
-    }
-
-    for(let i=0;i<linkdata.length;i++){
-      if(linkdata[i].rotation._z == 0){
-        scope.linkrail[linkdata[i].code].type = 0;
-        if(scope.linkrail[linkdata[i].code].lswitch){
-          let switchpoint = scope.switchrail[scope.linkrail[linkdata[i].code].lswitch].position;
-          scope.linkrail[linkdata[i].code].points.push(new THREE.Vector3(switchpoint.x,0,switchpoint.z));
-        }
-
-        scope.linkrail[linkdata[i].code].points.push(new THREE.Vector3(scope.linkrail[linkdata[i].code].lp.x,0,scope.linkrail[linkdata[i].code].lp.z));
-        scope.linkrail[linkdata[i].code].points.push(new THREE.Vector3(scope.linkrail[linkdata[i].code].rp.x,0,scope.linkrail[linkdata[i].code].rp.z));
-
-        if(scope.linkrail[linkdata[i].code].rswitch){
-          let switchpoint = scope.switchrail[scope.linkrail[linkdata[i].code].rswitch].position;
-          scope.linkrail[linkdata[i].code].points.push(new THREE.Vector3(switchpoint.x,0,switchpoint.z));
-        }
-
-      }else{
-
-        if(linkdata[i].rotation._z>0){
-          let testline = new THREE.CatmullRomCurve3([
-              new THREE.Vector3(scope.linkrail[linkdata[i].code].lp.x,0,scope.linkrail[linkdata[i].code].lp.z),
-              new THREE.Vector3(scope.linkrail[linkdata[i].code].rp.x,0,scope.linkrail[linkdata[i].code].rp.z)
-          ]);
-
-          scope.linkrail[linkdata[i].code].type = 1;
-          if(scope.linkrail[linkdata[i].code].lswitch){
-            let switchpoint = scope.switchrail[scope.linkrail[linkdata[i].code].lswitch].position;
-            scope.linkrail[linkdata[i].code].points.push(new THREE.Vector3(switchpoint.x,0,switchpoint.z));
-            scope.linkrail[linkdata[i].code].points.push(new THREE.Vector3(switchpoint.x+1.5,0,switchpoint.z));
-            scope.linkrail[linkdata[i].code].points.push(new THREE.Vector3(switchpoint.x+2,0,switchpoint.z));
-            scope.linkrail[linkdata[i].code].points.push(new THREE.Vector3(switchpoint.x+4.5,0,switchpoint.z-0.05));
-          }
-
-          scope.linkrail[linkdata[i].code].points.push(testline.getPointAt(0.12));
-          scope.linkrail[linkdata[i].code].points.push(testline.getPointAt(0.22));
-          scope.linkrail[linkdata[i].code].points.push(testline.getPointAt(0.82));
-          scope.linkrail[linkdata[i].code].points.push(testline.getPointAt(0.92));
-
-          if(scope.linkrail[linkdata[i].code].rswitch){
-            let switchpoint = scope.switchrail[scope.linkrail[linkdata[i].code].rswitch].position;
-            scope.linkrail[linkdata[i].code].points.push(new THREE.Vector3(switchpoint.x-4.5,0,switchpoint.z+0.05));
-            scope.linkrail[linkdata[i].code].points.push(new THREE.Vector3(switchpoint.x-2,0,switchpoint.z));
-            scope.linkrail[linkdata[i].code].points.push(new THREE.Vector3(switchpoint.x-1.5,0,switchpoint.z));
-            scope.linkrail[linkdata[i].code].points.push(new THREE.Vector3(switchpoint.x,0,switchpoint.z));
-          }
-
-        }else{
-          let testline = new THREE.CatmullRomCurve3([
-              new THREE.Vector3(scope.linkrail[linkdata[i].code].lp.x,0,scope.linkrail[linkdata[i].code].lp.z),
-              new THREE.Vector3(scope.linkrail[linkdata[i].code].rp.x,0,scope.linkrail[linkdata[i].code].rp.z)
-          ]);
-          scope.linkrail[linkdata[i].code].type = 2;
-          if(scope.linkrail[linkdata[i].code].lswitch){
-            let switchpoint = scope.switchrail[scope.linkrail[linkdata[i].code].lswitch].position;
-            scope.linkrail[linkdata[i].code].points.push(new THREE.Vector3(switchpoint.x,0,switchpoint.z));
-            scope.linkrail[linkdata[i].code].points.push(new THREE.Vector3(switchpoint.x+1.5,0,switchpoint.z));
-            scope.linkrail[linkdata[i].code].points.push(new THREE.Vector3(switchpoint.x+2,0,switchpoint.z));
-            scope.linkrail[linkdata[i].code].points.push(new THREE.Vector3(switchpoint.x+4.5,0,switchpoint.z+0.05));
-          }
-
-          scope.linkrail[linkdata[i].code].points.push(testline.getPointAt(0.12));
-          scope.linkrail[linkdata[i].code].points.push(testline.getPointAt(0.22));
-          scope.linkrail[linkdata[i].code].points.push(testline.getPointAt(0.82));
-          scope.linkrail[linkdata[i].code].points.push(testline.getPointAt(0.92));
-
-          if(scope.linkrail[linkdata[i].code].rswitch){
-            let switchpoint = scope.switchrail[scope.linkrail[linkdata[i].code].rswitch].position;
-            scope.linkrail[linkdata[i].code].points.push(new THREE.Vector3(switchpoint.x-4.5,0,switchpoint.z-0.05));
-            scope.linkrail[linkdata[i].code].points.push(new THREE.Vector3(switchpoint.x-2,0,switchpoint.z));
-            scope.linkrail[linkdata[i].code].points.push(new THREE.Vector3(switchpoint.x-1.5,0,switchpoint.z));
-            scope.linkrail[linkdata[i].code].points.push(new THREE.Vector3(switchpoint.x,0,switchpoint.z));
-          }
-        }
-      }
-
-    }
-
-    for(let i=0;i<switchdata.length;i++){
-
-      // const ddd = storemod.getters['map/getDeviceByCode'](switchdata[i].code);
-      // scope.switchrail[switchdata[i].code].locateType = ddd.locateType;
-      // if(ddd.locateType == "01"){
-      //   //1--向左  2--向右
-      //   //__\__    __/__
-      //   if(scope.switchrail[switchdata[i].code].directtype == "1"){
-      //     scope.linkrail[switchdata[i].alink].lconnect = switchdata[i].blink;
-      //     scope.linkrail[switchdata[i].blink].rconnect = switchdata[i].alink;
-      //   }else if(scope.switchrail[switchdata[i].code].directtype == "2"){
-      //     scope.linkrail[switchdata[i].alink].rconnect = switchdata[i].blink;
-      //     scope.linkrail[switchdata[i].blink].lconnect = switchdata[i].alink;
-      //   }
-      // }else if(ddd.locateType == "02"){
-      //   if(switchdata[i].directtype == "1"){
-      //     scope.linkrail[switchdata[i].alink].lconnect = switchdata[i].clink;
-      //     scope.linkrail[switchdata[i].clink].rconnect = switchdata[i].alink;
-      //   }else if(switchdata[i].directtype == "2"){
-      //     scope.linkrail[switchdata[i].alink].rconnect = switchdata[i].clink;
-      //     scope.linkrail[switchdata[i].clink].lconnect = switchdata[i].alink;
-      //   }
-      // }
-
-      if(scope.linkrail[switchdata[i].blink].lp.x < switchdata[i].position.x){
-
-        scope.switchrail[switchdata[i].code].directtype = "1";
-      }else{
-
-        scope.switchrail[switchdata[i].code].directtype = "2";
-      }
-
-      if(scope.linkrail[switchdata[i].clink].lp.x < switchdata[i].position.x){
-
-        scope.switchrail[switchdata[i].code].directtype = "1";
-      }else{
-
-        scope.switchrail[switchdata[i].code].directtype = "2";
-      }
-    }
-    for(let i=0;i<linkdata.length;i++){
-      scope.linkrail[linkdata[i].code].lineleft = new THREE.CatmullRomCurve3(scope.linkrail[linkdata[i].code].points);
-      scope.linkrail[linkdata[i].code].lineleft.curveType = "centripetal";
-      // scope.linkrail[linkdata[i].code].lineleft.tension = 0.2;
-      let rightpoints = [];
-      scope.linkrail[linkdata[i].code].points.forEach(item=>{
-          rightpoints.push(item);
-        }
-      );
-      rightpoints.reverse();
-      scope.linkrail[linkdata[i].code].lineright = new THREE.CatmullRomCurve3(rightpoints);
-      scope.linkrail[linkdata[i].code].lineright.curveType = "centripetal";
-      //
-      // for(let n=0,nm=scope.linkrail[linkdata[i].code].lineleft.points.length;n<nm;n++){
-      //   var geometry = new THREE.CircleGeometry( 0.05, 16 );
-      //   var material = new THREE.MeshBasicMaterial( { color: 0xffff00 } );
-      //   var circle = new THREE.Mesh( geometry, material );
-      //   console.log(n);
-      //   console.log(scope.linkrail[linkdata[i].code].lineleft.points[n]);
-      //   circle.position.x = scope.linkrail[linkdata[i].code].lineleft.points[n].x;
-      //   circle.position.y = scope.linkrail[linkdata[i].code].lineleft.points[n].y;
-      //   circle.position.z = scope.linkrail[linkdata[i].code].lineleft.points[n].z;
-      //   circle.rotation.x = -Math.PI/2;
-      //   scene.add( circle );
-      // }
-      // // scope.linkrail[linkdata[i].code].lineright.tension = 0.11;
-      // var points = scope.linkrail[linkdata[i].code].lineleft.getPoints( 50 );
-      // var geometry = new THREE.BufferGeometry().setFromPoints( points );
-      // var material;
-      // if(scope.linkrail[linkdata[i].code].type == 0){
-      //   material = new THREE.LineBasicMaterial( { color : 0xff0000 } );
-      // }
-      // if(scope.linkrail[linkdata[i].code].type == 1){
-      //   material = new THREE.LineBasicMaterial( { color : 0x00ff00 } );
-      // }
-      // if(scope.linkrail[linkdata[i].code].type == 2){
-      //   material = new THREE.LineBasicMaterial( { color : 0x0000ff } );
-      // }
-      //
-      //
-      // // Create the final object to add to the scene
-      // var curveObject = new THREE.Line( geometry, material );
-      //
-      // curveObject.position.y = Math.random();
-      // scene.add(curveObject);
-    }
-    let standsections = [];
-    for(let i=0,len=sectiondata.length;i<len;i++){
-      if(sectiondata[i].isStandTrack == true){
-        standsections.push(sectiondata[i]);
-      }
-    }
-
-
-    for(let k in standsdata){
-      let stop = {
-        code:null,
-        direct1:{
-          percent:null,
-        },
-        direct2:{
-          percent:null,
-        }
-      };
-      for(let i=0,leni=standsections.length;i<leni;i++){
-        for(let j=0,lenj=linklist.length;j<lenj;j++){
-          if(standsections[i].linkCode == linklist[j].code){
-
-            // let geometry = new THREE.CircleGeometry( 2, 16 );
-            // let material = new THREE.MeshBasicMaterial( { color: 0x00ffff } );
-
-            if(standsdata[k].direction1.code == standsections[i].relStandCode){
-              stop.code = standsdata[k].code;
-              // let circle1 = new THREE.Mesh( geometry, material );
-              // let circle2 = new THREE.Mesh( geometry, material );
-              let num = scope.linkrail[linklist[j].code].lineleft.points.length-1;
-              let lengthfacts = scope.linkrail[linklist[j].code].lineleft.points[num].x - scope.linkrail[linklist[j].code].lineleft.points[0].x;
-              let directoffset1 = standsdata[k].position.x-stopoffset-scope.linkrail[linklist[j].code].lineleft.points[0].x;
-              stop.direct1.percent = directoffset1/lengthfacts;
-
-              // circle1.position.x = standsdata[k].position.x+stopoffset;
-              // circle1.position.y = 5;
-              // circle1.position.z = scope.linkrail[linklist[j].code].points[0].z;
-              // circle1.rotation.x = -Math.PI/2;
-              //
-              // circle2.position.x = standsdata[k].position.x-stopoffset;
-              // circle2.position.y = 5;
-              // circle2.position.z = scope.linkrail[linklist[j].code].points[0].z;
-              // circle2.rotation.x = -Math.PI/2;
-              // scene.add( circle1 );
-              // scene.add( circle2 );
-              // console.log(stop);
-            }
-            if(standsdata[k].direction2.code == standsections[i].relStandCode){
-              stop.code = standsdata[k].code;
-              // let circle1 = new THREE.Mesh( geometry, material );
-              // let circle2 = new THREE.Mesh( geometry, material );
-              let num = scope.linkrail[linklist[j].code].lineleft.points.length-1;
-              let lengthfacts = scope.linkrail[linklist[j].code].lineleft.points[num].x - scope.linkrail[linklist[j].code].lineleft.points[0].x;
-
-              let directoffset2 = parseInt(standsdata[k].position.x+stopoffset-scope.linkrail[linklist[j].code].lineleft.points[0].x);
-              // console.log(directoffset2);
-              stop.direct2.percent = directoffset2/lengthfacts;
-              // console.log("test");
-              // console.log(directoffset1);
-              // console.log(directoffset2);
-              // console.log("sectoffsetleft");
-              // console.log(stop.direct1.percent);
-              // console.log(scope.linkrail[linklist[j].code].lengthfact);
-              // console.log(lengthfacts);
-              // console.log("........................");
-              // console.log(standsections[i].leftStopPointOffset);
-              // console.log(standsdata[n].position.x-stopoffset-scope.linkrail[linklist[j].code].lineleft.points[0].x);
-              // console.log("........................");
-              // console.log(standsdata[n].position.x+stopoffset);
-              // console.log(scope.linkrail[linklist[j].code].lineleft.getPointAt(stop.direct1.percent).x);
-              // console.log("sectoffsetright");
-              // console.log(scope.linkrail[linklist[j].code]);
-              // console.log(stop.direct2.percent);
-              // console.log(scope.linkrail[linklist[j].code].lengthfact);
-              // console.log(lengthfacts);
-              // console.log("........................");
-              // console.log(standsections[i].rightStopPointOffset);
-              // console.log(standsdata[k].position.x+stopoffset-scope.linkrail[linklist[j].code].lineleft.points[0].x);
-              // console.log("........................");
-              // console.log(standsdata[k].position.x+stopoffset);
-              // console.log(scope.linkrail[linklist[j].code].lineleft.getPointAt(stop.direct2.percent).x);
-              // circle1.position.x = standsdata[k].position.x+stopoffset;
-              // circle1.position.y = 5;
-              // circle1.position.z = scope.linkrail[linklist[j].code].points[0].z;
-              // circle1.rotation.x = -Math.PI/2;
-              // //
-              // circle2.position.x = standsdata[k].position.x-stopoffset;
-              // circle2.position.y = 5;
-              // circle2.position.z = scope.linkrail[linklist[j].code].points[0].z;
-              // circle2.rotation.x = -Math.PI/2;
-              //
-              // scene.add( circle1 );
-              // scene.add( circle2 );
-              // console.log(stop);
-            }
-            if(stop.direct1.percent != null && stop.direct2.percent != null){
-              // console.log(stop)
-              scope.stops[standsdata[k].code] = stop;
-            }
-
-            j = lenj;
-          }
-        }
-      }
-    }
-
-    // console.log(scope.stops);
-  }
-
-  this.getrail = function(){
-
-  };
-}
diff --git a/src/jlmap3d/main/model/RealSectionList.js b/src/jlmap3d/main/model/RealSectionList.js
deleted file mode 100644
index 615ead8d2..000000000
--- a/src/jlmap3d/main/model/RealSectionList.js
+++ /dev/null
@@ -1,118 +0,0 @@
-import {RealSectionModel} from '@/jlmap3d/edit/editmodel/RealSectionModel.js';
-
-export function  RealSectionList(data) {
-
-  let scope = this;
-
-  this.type = "sectionlist";
-
-  this.list = [];
-
-  this.group = [];
-
-  this.switch = [];
-
-  this.initpromise = function(jlmap3ddata,scene,assetloader,mixers,actions){
-    return new Promise(function(resolve, reject){
-      let modelnum = null;
-      for(let i=0;i<assetloader.modellist.length;i++){
-        if(assetloader.modellist[i].deviceType == "mapSection"){
-          modelnum = i;
-        }
-      }
-
-      let newmesh = assetloader.modellist[modelnum].mesh;
-      let mixer = new THREE.AnimationMixer( newmesh );
-      for(let i=0;i<newmesh.children.length;i++){
-
-        let name = newmesh.children[i].name.split("_");
-        let newmeshname = name[0]+"_"+name[1]+"_"+name[2]+"."+name[3];
-        //console.log(newmeshname);
-        if(name[0] == "Switch"){
-
-          for(let j=0;j<jlmap3ddata.sectionlist.switchs.datalist.length;j++){
-            if(jlmap3ddata.sectionlist.switchs.datalist[j].name == newmeshname){
-
-              //绿色道岔
-              let nowname = jlmap3ddata.sectionlist.switchs.datalist[j].name;
-              let nowcode = jlmap3ddata.sectionlist.switchs.datalist[j].code;
-              newmesh.children[i].name = nowname;
-              newmesh.children[i].code = nowcode;
-              for(let n=0;n<newmesh.children[i].children.length;n++){
-                newmesh.children[i].children[n].code = nowcode;
-              }
-
-              jlmap3ddata.sectionlist.switchs.modellist[j] = newmesh.children[i];
-              for(let m=0;m<newmesh.animations[0].tracks.length;m++){
-                let animatename = newmesh.animations[0].tracks[m].name.split(".");
-                for(let nm=0;nm<jlmap3ddata.sectionlist.switchs.modellist[j].children.length;nm++){
-                  if(animatename[0] == jlmap3ddata.sectionlist.switchs.modellist[j].children[nm].name && animatename[1] == "position"){
-
-                    let newtracks = newmesh.animations[0].tracks.slice(m,m+6);
-
-                    let newclip = new THREE.AnimationClip(jlmap3ddata.sectionlist.switchs.modellist[j].name,2,newtracks);
-                    jlmap3ddata.sectionlist.switchs.modellist[j].locateType = null;
-                    jlmap3ddata.sectionlist.switchs.modellist[j].animations = [];
-                    jlmap3ddata.sectionlist.switchs.modellist[j].animations.push(newclip);
-                    let mixer = new THREE.AnimationMixer(  jlmap3ddata.sectionlist.switchs.modellist[j] );
-                    actions[jlmap3ddata.sectionlist.switchs.modellist[j].name] = mixer.clipAction( jlmap3ddata.sectionlist.switchs.modellist[j].animations[ 0 ] );
-                    actions[jlmap3ddata.sectionlist.switchs.modellist[j].name].setLoop(THREE.LoopOnce);
-                    actions[jlmap3ddata.sectionlist.switchs.modellist[j].name].clampWhenFinished = true;
-                    actions[jlmap3ddata.sectionlist.switchs.modellist[j].name].play();
-                    mixers.push(mixer);
-
-                    m = newmesh.animations[0].tracks.length;
-                  }
-                }
-
-
-              }
-
-              j = jlmap3ddata.sectionlist.switchs.datalist.length;
-            }
-
-
-          }
-
-        }
-
-        if(name[0] == "Section"){
-
-          //物理区段
-          if(jlmap3ddata.sectionlist.sections.datalist[newmeshname]){
-            if(jlmap3ddata.sectionlist.sections.datalist[newmeshname].isStandTrack == true){
-              //红色站台区段
-            }else{
-              //蓝色其他区段
-            }
-            let nowname = jlmap3ddata.sectionlist.sections.datalist[newmeshname].name;
-            let nowcode = jlmap3ddata.sectionlist.sections.datalist[newmeshname].code;
-            newmesh.children[i].name = nowname;
-            newmesh.children[i].code = nowcode;
-            let j = jlmap3ddata.sectionlist.sections.datalist[newmeshname].index;
-            jlmap3ddata.sectionlist.sections.modellist.push(newmesh.children[i]);
-          }
-
-        }
-
-        if(name[0] == "Singal"){
-          console.log();
-          newmesh.remove(newmesh.children[i]);
-          i = i-1;
-        }
-        if(name[0] == "Station"){
-          newmesh.remove(newmesh.children[i]);
-          i = i-1;
-        }
-
-
-      }
-
-      scene.add(newmesh);
-
-      resolve("loadedrealsection");
-    });
-  }
-
-
-}
diff --git a/src/jlmap3d/main/model/RealSectionModel.js b/src/jlmap3d/main/model/RealSectionModel.js
deleted file mode 100644
index e5d8ec36d..000000000
--- a/src/jlmap3d/main/model/RealSectionModel.js
+++ /dev/null
@@ -1,8 +0,0 @@
-export function  RealSectionModel(data) {
-	var scope = this;
-  
-  this.mesh = null;
-  this.meshurl = null;
-  this.picurl = null;
-
-}
diff --git a/src/jlmap3d/main/model/SectionList.js b/src/jlmap3d/main/model/SectionList.js
deleted file mode 100644
index d7ff1ffcd..000000000
--- a/src/jlmap3d/main/model/SectionList.js
+++ /dev/null
@@ -1,390 +0,0 @@
-import {SectionModel} from '@/jlmap3d/edit/editmodel/SectionModel.js';
-import {SwitchModel} from '@/jlmap3d/edit/editmodel/SwitchModel.js';
-export function SectionList() {
-
-	let scope = this;
-
-	this.type = 'sectionlist';
-
-	let sectiongroup = new THREE.Group();
-	sectiongroup.name = "section";
-
-	let switchgroup = new THREE.Group();
-	switchgroup.name = "switch";
-
-	this.sections = {
-		datalist: [],
-		modellist: []
-	};
-
-	this.switchs = {
-		datalist: [],
-		modellist: []
-	};
-	this.standtrack = [];
-
-	this.initpromise = function (sectiondata, switchdata, scene) {
-		return new Promise(function(resolve, reject) {
-			// 遍历区段
-
-			for (let i=0; i<sectiondata.length; i++) {
-				if (sectiondata[i].type == '01') {
-					// 初始化区段对象数据
-					let newsection = new SectionModel(sectiondata);
-					newsection.name = sectiondata[i].code;
-					newsection.code = sectiondata[i].code;
-					newsection.index = i;
-					newsection.isStandTrack = sectiondata[i].isStandTrack;
-					if (sectiondata[i].isStandTrack == true) {
-						newsection.rstop = sectiondata[i].offsetRight - sectiondata[i].rightStopPointOffset;
-						newsection.lstop = sectiondata[i].leftStopPointOffset - sectiondata[i].offsetLeft;
-					}
-					newsection.type = sectiondata[i].type;
-					newsection.distance = sectiondata[i].offsetRight - sectiondata[i].offsetLeft;
-					newsection.isStandTrack = sectiondata[i].isStandTrack;
-					scope.sections.datalist[sectiondata[i].code] = newsection;
-
-					// scope.sections.modellist.push("");
-				}
-
-			}
-
-			// 定义区分道岔组
-			let switchlist = [];
-			// 遍历道岔数据
-			for (let i=0; i<switchdata.length; i++) {
-				// 道岔信息
-				let newswitch = {
-					code: null,
-					pa: null,
-					pb: null,
-					pc: null,
-					paname: null,
-					pbname: null,
-					pcname: null
-				};
-				// 获取道岔分辨的点 PS:可能修改动态判断
-				for (let j=0; j<sectiondata.length; j++) {
-					if (switchdata[i].sectionACode == sectiondata[j].code) {
-						newswitch.pa = sectiondata[j].points;
-						newswitch.paname = switchdata[i].sectionACode;
-					}
-					if (switchdata[i].sectionBCode == sectiondata[j].code) {
-						newswitch.pb = sectiondata[j].points;
-						newswitch.pbname = switchdata[i].sectionBCode;
-					}
-					if (switchdata[i].sectionCCode == sectiondata[j].code) {
-						newswitch.pc = sectiondata[j].points;
-						newswitch.pcname = switchdata[i].sectionCCode;
-					}
-					if (newswitch.pa != null && newswitch.pb!= null && newswitch.pc != null) {
-						newswitch.code = switchdata[i].code;
-						switchlist.push(newswitch);
-						j = sectiondata.length;
-					}
-				}
-			}
-
-			// 道岔贴图
-			// 遍历道岔信息组合轨道
-			for (let i=0; i<switchlist.length; i++) {
-				// 道岔对象组
-				let newswitch = new SwitchModel();
-
-				newswitch.name = switchlist[i].code;
-				newswitch.code = switchlist[i].code;
-
-				newswitch.index = i;
-
-				scope.switchs.datalist.push(newswitch);
-				scope.switchs.modellist.push('');
-			}
-
-			resolve('loadersection');
-		});
-
-	};
-	this.loadpromise = function(linklist,assetloader,sectiondata,switchdata,scene){
-    return new Promise(function(resolve, reject){
-      // scene.add(sectiongroup);
-      scene.add(switchgroup);
-      let linkdata = linklist;
-
-      // for(let i=0;i<sectiondata.length;i++){
-      //   if(sectiondata[i].type == "01"){
-      //     //初始化区段对象数据
-      //     let newsection = new SectionModel(sectiondata);
-			//
-      //     newsection.name = sectiondata[i].code;
-      //     newsection.code = sectiondata[i].code;
-      //     newsection.index = i;
-      //     newsection.isStandTrack = sectiondata[i].isStandTrack;
-      //     newsection.relStandCode = sectiondata[i].relStandCode;
-      //     newsection.type = sectiondata[i].type;
-      //     newsection.offsetRight = sectiondata[i].offsetRight;
-      //     newsection.offsetLeft = sectiondata[i].offsetLeft;
-      //     newsection.linkCode = sectiondata[i].linkCode;
-			//
-      //     scope.sections.datalist.push(newsection);
-      //     // scope.sections.modellist.push("");
-      //   }
-      // }
-
-      let autosuidao;
-      for(let i=0;i<assetloader.modellist.length;i++){
-        if(assetloader.modellist[i].deviceType == "autosuidao"){
-          autosuidao = assetloader.modellist[i].mesh.children[0];
-        }
-      }
-
-      for(let i = 0;i < sectiondata.length;i++){
-
-        // let testmesh1 = autosuidao.clone(true);
-				let testmesh1 = {};
-        testmesh1.code = sectiondata[i].code;
-        testmesh1.name = sectiondata[i].code;
-        if(sectiondata[i].relStandCode){
-          testmesh1.relStandCode = sectiondata[i].relStandCode;
-        }else{
-          testmesh1.relStandCode = "";
-        }
-        testmesh1.rightlist = sectiondata[i].rightlist;
-        testmesh1.leftlist = sectiondata[i].leftlist;
-        testmesh1.rightpoint = sectiondata[i].rightpoint;
-        testmesh1.leftpoint = sectiondata[i].leftpoint;
-        testmesh1.isStandTrack = sectiondata[i].isStandTrack;
-        testmesh1.lengthfact = sectiondata[i].lengthfact;
-        // for(let i=0;i<testmesh1.rightlist.length;i++){
-  			// 	testmesh1.geometry.attributes.position.array[testmesh1.rightlist[i]*3] = testmesh1.lengthfact;
-  			// 	testmesh1.geometry.attributes.uv.array[testmesh1.rightlist[i]*2] = (testmesh1.geometry.attributes.position.array[3]-testmesh1.geometry.attributes.position.array[0])/15.3;
-        // }
-        // let newsuidao = new THREE.BufferGeometry();
-        // newsuidao.copy(testmesh1.geometry);
-        // testmesh1.geometry = newsuidao;
-        // testmesh1.geometry.attributes.position.needsUpdate = true;
-        // testmesh1.geometry.attributes.uv.needsUpdate = true;
-        // testmesh1.geometry.computeBoundingSphere();
-        // testmesh1.geometry.center();
-        // testmesh1.position.x = sectiondata[i].position.x;
-        // testmesh1.position.y = sectiondata[i].position.y;
-        // testmesh1.position.z = sectiondata[i].position.z;
-        // testmesh1.rotation.x = -Math.PI/2;
-        // testmesh1.rotation.z = sectiondata[i].rotation._z;
-				//
-        // let newsection = new SectionModel(sectiondata);
-				//
-        // newsection.name = sectiondata[i].code;
-        // newsection.code = sectiondata[i].code;
-        // newsection.isStandTrack = sectiondata[i].isStandTrack;
-        // newsection.relStandCode = sectiondata[i].relStandCode;
-        // newsection.linkCode = sectiondata[i].linkCode;
-
-        // scope.sections.datalist.push(newsection);
-
-				//
-        // if(testmesh1.isStandTrack == false){
-        //   sectiongroup.add(testmesh1);
-				//
-        // }else{
-        //   scope.standtrack.push(testmesh1);
-        //   var box = new THREE.BoxHelper( testmesh1, 0xff0000 );
-        //   sectiongroup.add( box );
-        // }
-        scope.sections.modellist.push(testmesh1);
-      }
-
-      let switchmesh1;
-      let switchmesh2;
-      for(let i=0;i<assetloader.modellist.length;i++){
-        if(assetloader.modellist[i].deviceType == "autoswitch1"){
-          switchmesh1 = assetloader.modellist[i].mesh;
-        }
-        if(assetloader.modellist[i].deviceType == "autoswitch2"){
-          switchmesh2 = assetloader.modellist[i].mesh;
-        }
-      }
-
-      for(let i=0;i<switchdata.length;i++){
-        let newswitch = {
-          code:switchdata[i].code,
-          pa:switchdata[i].pa,
-          pb:switchdata[i].pb,
-          pc:switchdata[i].pc,
-          paname:switchdata[i].paname,
-          pbname:switchdata[i].pbname,
-          pcname:switchdata[i].pcname,
-          alink:switchdata[i].alink,
-          blink:switchdata[i].blink,
-          clink:switchdata[i].clink
-        };
-        let sectionA,sectionB,sectionC;
-        for(let j=0;j<scope.sections.modellist.length;j++){
-          if(newswitch.paname == scope.sections.modellist[j].code){
-            sectionA = scope.sections.modellist[j];
-          }else if(newswitch.pbname == scope.sections.modellist[j].code){
-            sectionB = scope.sections.modellist[j];
-          }else if(newswitch.pcname == scope.sections.modellist[j].code){
-            sectionC = scope.sections.modellist[j];
-          }
-        }
-        let testswitch;
-
-        if(switchdata[i].pa[0].x>switchdata[i].pb[0].x){
-          if(((switchdata[i].pc[0].y+switchdata[i].pc[1].y)/2) < switchdata[i].pa[0].y){
-            if(((switchdata[i].pc[0].x+switchdata[i].pc[1].x)/2)>switchdata[i].pa[0].x){
-              testswitch = switchmesh1.clone(true);
-            }else{
-              testswitch = switchmesh2.clone(true);
-            }
-          }else{
-            if(((switchdata[i].pc[0].x+switchdata[i].pc[1].x)/2)>switchdata[i].pa[0].x){
-              testswitch = switchmesh2.clone(true);
-            }else{
-              testswitch = switchmesh1.clone(true);
-            }
-            testswitch.rotation.z = Math.PI;
-          }
-        }else{
-          if(((switchdata[i].pc[0].y+switchdata[i].pc[1].y)/2) < switchdata[i].pa[1].y){
-            if(((switchdata[i].pc[0].x+switchdata[i].pc[1].x)/2)>switchdata[i].pa[1].x){
-              testswitch = switchmesh1.clone(true);
-            }else{
-              testswitch = switchmesh2.clone(true);
-            }
-          }else{
-            if(((switchdata[i].pc[0].x+switchdata[i].pc[1].x)/2)>switchdata[i].pa[1].x){
-              testswitch = switchmesh2.clone(true);
-            }else{
-              testswitch = switchmesh1.clone(true);
-            }
-            testswitch.rotation.z = Math.PI;
-          }
-        }
-
-        testswitch.position.x = switchdata[i].position.x;
-        testswitch.position.y = switchdata[i].position.y;
-        testswitch.position.z = switchdata[i].position.z;
-        // testswitch.rotation.x = switchdata[i].rotation._x;
-        // testswitch.rotation.y = switchdata[i].rotation._y;
-        // testswitch.rotation.z = switchdata[i].rotation._z;
-
-        scope.switchs.datalist.push(newswitch);
-        scope.switchs.modellist.push(testswitch);
-        switchgroup.add(testswitch);
-      }
-
-      resolve("loadersection");
-    });
-
-  }
-
-  function buildsuidao(linkdata,suidaodata,assetloader,scene){
-    let autosuidao;
-    for(let i=0;i<assetloader.modellist.length;i++){
-      if(assetloader.modellist[i].deviceType == "autosuidao"){
-        autosuidao = assetloader.modellist[i].mesh.children[0];
-      }
-    }
-    let rightlist = [];
-    let leftlist = [];
-    let rightpoint = 0;
-    let leftpoint = 0;
-    let count = autosuidao.geometry.attributes.position.count;
-
-    for(let i=0;i<count;i++){
-      if(autosuidao.geometry.attributes.position.array[i*3] >7){
-        rightlist.push(i);
-        if(autosuidao.geometry.attributes.position.array[i*3] > rightpoint){
-          rightpoint = i;
-        }
-      }
-      if(autosuidao.geometry.attributes.position.array[i*3] <-7){
-        leftlist.push(i);
-        if(autosuidao.geometry.attributes.position.array[i*3] < rightpoint){
-          leftpoint = i;
-        }
-      }
-    }
-    autosuidao.rightlist = rightlist;
-    autosuidao.leftlist = leftlist;
-    autosuidao.rightpoint = rightpoint;
-    autosuidao.leftpoint = leftpoint;
-    // console.log(autosuidao);
-    // console.log(linkdata.linksgroup.children);
-    // console.log(suidaodata.datalist);
-    for(let i = 0;i < suidaodata.datalist.length;i++){
-      let link = linkdata.linksgroup.getObjectByProperty("code",suidaodata.datalist[i].linkCode);
-      let suidao = suidaodata.datalist[i];
-      let len = suidao.offsetRight-suidao.offsetLeft;
-      // console.log("-------------------------------------");
-      // console.log("name:"+link.name);
-      // console.log(link.lengthfact);
-      // console.log(len);
-      // console.log("ofl:"+suidao.offsetLeft+"   "+"ofr:"+suidao.offsetRight);
-      // console.log("-------------------------------------");
-
-      let testmesh1 = autosuidao.clone(true);
-      for(let i=0;i<autosuidao.rightlist.length;i++){
-				testmesh1.geometry.attributes.position.array[autosuidao.rightlist[i]*3] = len-7.5;
-				testmesh1.geometry.attributes.uv.array[autosuidao.rightlist[i]*2] = (testmesh1.geometry.attributes.position.array[3]-testmesh1.geometry.attributes.position.array[0])/15.3;
-      }
-      let newsuidao = new THREE.BufferGeometry();
-      newsuidao.copy(testmesh1.geometry);
-      testmesh1.geometry = newsuidao;
-      testmesh1.geometry.attributes.position.needsUpdate = true;
-      testmesh1.geometry.attributes.uv.needsUpdate = true;
-      testmesh1.geometry.computeBoundingSphere();
-      testmesh1.geometry.center();
-      let lenfact = link.lengthfact;
-
-      testmesh1.rotation.x = -Math.PI/2;
-      testmesh1.rotation.z = link.rotation.z;
-      //
-      // console.log(link.lp.x);
-      // console.log(link.rp.x);
-      // console.log(suidao.offsetLeft*(len/lenfact));
-      // console.log((link.rp.x-link.lp.x)*(len/lenfact)/2);
-      // console.log("==============");
-      //
-
-      if(testmesh1.rotation.z != 0){
-
-        testmesh1.position.x = link.lp.x+suidao.offsetLeft*(len/lenfact)+ (link.rp.x-link.lp.x)*(len/lenfact)/2;
-        if(link.lp.y > link.rp.y){
-          testmesh1.position.z = link.lp.y-suidao.offsetLeft*(len/lenfact) + (link.rp.y-link.lp.y)*(len/lenfact)/2;
-        }else{
-          testmesh1.position.z = link.lp.y+suidao.offsetLeft*(len/lenfact) + (link.rp.y-link.lp.y)*(len/lenfact)/2;
-        }
-      }else{
-        testmesh1.position.x = link.lp.x+suidao.offsetLeft+len/2;
-        testmesh1.position.z = link.position.z;
-      }
-      testmesh1.position.y = 3.5;
-      // testmesh1.rotation.x = Math.PI/4;
-      testmesh1.code = suidaodata.datalist[i].code;
-      testmesh1.name = suidaodata.datalist[i].code;
-      // testmesh1.position.z = link.position.z;
-      testmesh1.relStandCode = suidaodata.datalist[i].relStandCode;
-      // testmesh1.stationCode = suidaodata.datalist[i].stationCode;
-
-      testmesh1.rightlist = autosuidao.rightlist;
-      testmesh1.leftlist = autosuidao.leftlist;
-      testmesh1.rightpoint = autosuidao.rightpoint;
-      testmesh1.leftpoint = autosuidao.leftpoint;
-      testmesh1.isStandTrack = suidaodata.datalist[i].isStandTrack;
-      testmesh1.lengthfact = len;
-      testmesh1.linkCode = suidao.linkCode;
-      if(suidaodata.datalist[i].isStandTrack == false){
-        sectiongroup.add(testmesh1);
-
-      }else{
-        scope.standtrack.push(testmesh1);
-        var box = new THREE.BoxHelper( testmesh1, 0xff0000 );
-        sectiongroup.add( box );
-      }
-      scope.sections.modellist.push(testmesh1);
-    }
-  }
-
-
-}
diff --git a/src/jlmap3d/main/model/SectionModel.js b/src/jlmap3d/main/model/SectionModel.js
deleted file mode 100644
index 9ba9abb07..000000000
--- a/src/jlmap3d/main/model/SectionModel.js
+++ /dev/null
@@ -1,26 +0,0 @@
-export function  SectionModel(data) {
-	var scope = this;
-	//命名
-	this.name = null;
-	//code
-	this.code = null;
-	//索引位置
-	this.index = null;
-	//轨迹点
-	this.rail = [];
-
-	this.railline = null;
-	//长度
-	this.distance = [];
-
-	this.isStandTrack = null;
-
-	this.type = null;
-	//指向模型
-  this.mesh = null;
-	// //模型地址
-  // this.meshurl = null;
-	// //贴图地址
-  // this.picurl = null;
-
-}
diff --git a/src/jlmap3d/main/model/SignalList.js b/src/jlmap3d/main/model/SignalList.js
deleted file mode 100644
index 68c3727d3..000000000
--- a/src/jlmap3d/main/model/SignalList.js
+++ /dev/null
@@ -1,113 +0,0 @@
-import {SignalModel} from '@/jlmap3d/main/model/SignalModel.js';
-
-export function SignalList() {
-
-  let scope = this;
-
-  this.type = "signallist";
-
-  this.list = {};
-
-  this.group = new THREE.Group();
-
-  this.initpromise = function(data,scene,assetloader,netdata){
-    return new Promise(function(resolve, reject){
-      scope.group.name = "signal";
-      //遍历信号数据
-      let netsignal = null;
-      let haddata = false;
-      if(netdata){
-         netsignal = JSON.parse(netdata);
-         haddata = true;
-      }
-      let selectmesh = null;
-      for(let j=0;j<assetloader.modellist.length;j++){
-        if(assetloader.modellist[j].deviceType == "signal"){
-          selectmesh = assetloader.modellist[j].mesh;
-        }
-      }
-      for(let i=0;i<data.length;i++){
-
-        let newsignal = new SignalModel(data[i]);
-        let num;
-        if(haddata == false){
-
-
-          let newmesh = selectmesh.clone(true);
-          for(let j=0;j<newmesh.children.length;j++){
-            newmesh.children[j].material.map.uuid = data[i].code+j;
-            console.log(newmesh.children[j].material.map.uuid);
-          }
-
-          newmesh.name = assetloader.modellist[num].id;
-          newmesh.code = data[i].code;
-          for(let j=0;j<newmesh.children.length;j++){
-            newmesh.children[j].code = data[i].code;
-          }
-
-          //根据线路方向修改信号灯位置
-          if(data[i].directionType == "01"){
-            newmesh.position.set(data[i].position.x,1,data[i].position.y-10);
-            newmesh.rotation.z = ( Math.PI / 2 );
-          }else if(data[i].directionType == "02"){
-            newmesh.position.set(data[i].position.x,1,data[i].position.y+10);
-            newmesh.rotation.z = ( - Math.PI / 2 );
-          }
-
-          newsignal.mesh = newmesh;
-          newsignal.mesh.status = "01";
-          scope.group.add(newsignal.mesh);
-          scope.list.push(newsignal);
-
-        }else{
-          for(let j=0;j<assetloader.modellist.length;j++){
-            if(assetloader.modellist[j].id == netsignal[i].modelid){
-              num = j;
-
-            }
-          }
-
-          let newmesh = assetloader.modellist[num].mesh.clone(true);
-          for(let j=0;j<newmesh.children.length;j++){
-            let newmaterial = new THREE.MeshPhongMaterial();
-            newmaterial.copy(newmesh.children[j].material);
-
-            newmesh.children[j].material = newmaterial;
-            newmesh.children[j].material.needsUpdate = true;
-            newmaterial.dispose();
-          //  newmesh.children[j].material.map
-          }
-
-          newmesh.name = netsignal[i].id;
-          newmesh.code = netsignal[i].code;
-          for(let j=0;j<newmesh.children.length;j++){
-            newmesh.children[j].code = netsignal[i].code;
-
-          }
-          newmesh.position.x = netsignal[i].position.x;
-          newmesh.position.y = netsignal[i].position.y;
-          newmesh.position.z = netsignal[i].position.z;
-          newmesh.rotation.x = netsignal[i].rotation._x;
-          newmesh.rotation.y = netsignal[i].rotation._y;
-          newmesh.rotation.z = netsignal[i].rotation._z;
-          newmesh.scale.x = netsignal[i].scale.x;
-          newmesh.scale.y = netsignal[i].scale.y;
-          newmesh.scale.z = netsignal[i].scale.z;
-
-          newsignal.mesh = newmesh;
-          newsignal.mesh.status = "01";
-          scope.group.add(newsignal.mesh);
-          scope.list[netsignal[i].code] = newsignal;
-        }
-
-
-
-
-      }
-      scene.add(scope.group);
-
-      resolve("loadedsignal");
-    });
-  }
-
-}
diff --git a/src/jlmap3d/main/model/SignalModel.js b/src/jlmap3d/main/model/SignalModel.js
deleted file mode 100644
index 80ce60fff..000000000
--- a/src/jlmap3d/main/model/SignalModel.js
+++ /dev/null
@@ -1,11 +0,0 @@
-export function SignalModel(data) {
-
-  this.uuid = null;
-  this.type = null;
-  this.ismodel = false;
-  this.istexture = false;
-  this.modelurl = null;
-  this.mesh = null;
-  this.meshurl = null;
-  this.textureurl = null;
-}
diff --git a/src/jlmap3d/main/model/StationStandList.js b/src/jlmap3d/main/model/StationStandList.js
deleted file mode 100644
index 468d45882..000000000
--- a/src/jlmap3d/main/model/StationStandList.js
+++ /dev/null
@@ -1,263 +0,0 @@
-import {StationStandModel} from '@/jlmap3d/main/model/StationStandModel.js';
-import { JL3D_LOCAL_STATIC } from '@/api/jlmap3d/assets3d.js';
-
-export function StationStandList() {
-
-  let scope = this;
-
-  this.type = "stationstandlist";
-
-  this.list = {};
-
-  this.group = new THREE.Group();
-
-  this.textlist = [];
-
-  this.initpromise = function(stationdata,stationstanddata,scene,assetloader,netdata,mixers,actionss,mode){
-    return new Promise(function(resolve, reject){
-
-      let netstand = null;
-      let haddata = false;
-      if(netdata){
-         netstand = JSON.parse(netdata);
-         haddata = true;
-      }
-
-      scope.group.name = "station";
-      scene.add(scope.group);
-
-      let selectmesh = null;
-      // let topstationmesh = null;
-      let num = null;
-      for(let j=0;j<assetloader.modellist.length;j++){
-        if(assetloader.modellist[j].deviceType == "stand"){
-          num = j;
-          selectmesh = assetloader.modellist[num].mesh;
-        }
-        // if(assetloader.modellist[j].deviceType == "topstand"){
-        //   topstationmesh = assetloader.modellist[j].mesh;
-        // }
-      }
-      // console.log(haddata);
-      //遍历车站数据
-      for(let i=0;i<stationdata.length;i++){
-
-        let newstationstand = new StationStandModel(stationdata);
-        //判断站台是否显示
-        if(stationdata[i].visible == true){
-
-          //遍历车站站台数据
-          for(let j=0;j<stationstanddata.length;j++){
-            //收集有效车站数据
-            if(stationstanddata[j].stationCode == stationdata[i].code){
-
-              newstationstand.name = stationdata[i].name;
-              newstationstand.code = stationdata[i].code;
-
-              if(stationstanddata[j].direction == "01"){
-                newstationstand.direction1.position = stationstanddata[j].position;
-                newstationstand.direction1.name = stationstanddata[j].code;
-                newstationstand.direction1.code = stationstanddata[j].code;
-                newstationstand.direction1.screenDoorOpenStatus = "01";
-              }
-              if(stationstanddata[j].direction == "02"){
-                newstationstand.direction2.position = stationstanddata[j].position;
-                newstationstand.direction2.name = stationstanddata[j].code;
-                newstationstand.direction2.code = stationstanddata[j].code;
-                newstationstand.direction2.screenDoorOpenStatus = "01";
-              }
-            }
-          }
-
-
-          scope.list[stationdata[i].code] = newstationstand;
-          newstationstand.num = i;
-        }
-
-      }
-      let map = scope.list;
-      for(let k in map){
-
-        let num;
-        if(haddata == false){
-
-          map[k].mesh = assetloader.modellist[num].mesh.clone(true);
-          map[k].id = assetloader.modellist[num].id;
-          map[k].mesh.code = map[k].code;
-
-          for(let j=0;j<map[k].mesh.children.length;j++){
-            map[k].mesh.children[j].code = map[k].code;
-          }
-
-          map[k].mesh.position.set(map[k].direction1.position.x,-20000,( map[k].direction2.position.y + map[k].direction1.position.y)/2+map[k].height/2 );
-          map[k].type = "station";
-          map[k].rname = stationdata[map[k].index].runPlanName;
-          map[k].kmmark = stationdata[map[k].index].kmPost;
-
-          let textgeometry = new THREE.PlaneBufferGeometry( 271, 374, 1 );
-          let textt = new THREE.CanvasTexture(getTextCanvas(stationdata[map[k].index]));
-          let textmaterial = new THREE.MeshBasicMaterial( { side: THREE.DoubleSide,map:textt ,transparent: true} );
-          let textplane = new THREE.Mesh( textgeometry, textmaterial );
-          textplane.name = stationdata[map[k].index].code;
-          textplane.position.x = 250;
-          textplane.rotation.x = Math.PI;
-          //textplane.position.x = -30;
-          map[k].mesh.add(textplane);
-
-          scope.group.add(map[k].mesh);
-
-          textgeometry.dispose();
-          textmaterial.dispose();
-          textt.dispose();
-        }else{
-
-          for(let netnum =0;netnum <netstand.length;netnum++){
-            if(netstand[netnum].code == k ){
-
-                for(let j=0;j<assetloader.modellist.length;j++){
-                  if(assetloader.modellist[j].id == netstand[netnum].modelid){
-                    num = j;
-                    map[k].index = netnum;
-                    // j = assetloader.modellist.length;
-                  }
-                }
-
-                map[k].position = netstand[netnum].position;
-                netnum = netstand.length;
-            }
-
-          }
-          map[k].mesh = selectmesh.clone(true);
-          let newclip = selectmesh.animations[ 0 ];
-
-          for(let j=0;j<map[k].mesh.children.length;j++){
-
-            if(map[k].mesh.children[j].name == "top"){
-              map[k].mesh.children[j].animations = [];
-              map[k].mesh.children[j].animations.push(newclip.clone());
-
-              let mixer = new THREE.AnimationMixer(  map[k].mesh.children[j] );
-
-              let key = map[k].direction1.name;
-              actionss[key] = {
-                status:"01",
-                action:mixer.clipAction( map[k].mesh.children[j].animations[0])
-              };
-              actionss[key].action.setLoop(THREE.LoopOnce);
-              actionss[key].action.clampWhenFinished = true;
-              //actionss[key].play();
-              mixers.push(mixer);
-            }
-            if(map[k].mesh.children[j].name == "down"){
-              map[k].mesh.children[j].animations = [];
-              map[k].mesh.children[j].animations.push(newclip.clone());
-
-              let mixer = new THREE.AnimationMixer(  map[k].mesh.children[j] );
-
-              let key = map[k].direction2.name;
-              actionss[key] = {
-                status:"01",
-                action:mixer.clipAction( map[k].mesh.children[j].animations[0])
-              };
-              actionss[key].action.setLoop(THREE.LoopOnce);
-              actionss[key].action.clampWhenFinished = true;
-              //actionss[key].play();
-              mixers.push(mixer);
-            }
-
-          }
-
-          map[k].mesh.name = netstand[map[k].index].name;
-          map[k].mesh.code = netstand[map[k].index].code;
-          for(let j=0;j<map[k].mesh.children.length;j++){
-            map[k].mesh.children[j].code = netstand[map[k].index].code;
-          }
-          map[k].mesh.position.x = netstand[map[k].index].position.x-2.34;
-          map[k].mesh.position.y = netstand[map[k].index].position.y;
-          map[k].mesh.position.z = netstand[map[k].index].position.z-0.375;
-
-
-
-          // map[k].mesh.rotation.x = netstand[map[k].index].rotation._x;
-          // map[k].mesh.rotation.y = netstand[map[k].index].rotation._y;
-          // map[k].mesh.rotation.z = netstand[map[k].index].rotation._z;
-          map[k].mesh.scale.x = netstand[map[k].index].scale.x;
-          map[k].mesh.scale.y = netstand[map[k].index].scale.y;
-          map[k].mesh.scale.z = netstand[map[k].index].scale.z;
-
-          if(mode){
-            if(mode == "02"){
-              let textgeometry = new THREE.PlaneBufferGeometry( 271, 374, 1 );
-              let textt = new THREE.CanvasTexture(getTextCanvas(stationdata[map[k].num]));
-              let textmaterial = new THREE.MeshBasicMaterial( { side: THREE.DoubleSide,map:textt ,transparent: true} );
-              let textplane = new THREE.Mesh( textgeometry, textmaterial );
-              textplane.name = stationdata[map[k].num].code;
-              textplane.position.y = 50;
-              textplane.position.z = 250;
-              textplane.rotation.x = Math.PI/2;
-              //textplane.position.x = -30;
-              scope.textlist.push(textplane);
-              map[k].mesh.add(textplane);
-              textgeometry.dispose();
-              textmaterial.dispose();
-              textt.dispose();
-              // let newtopstation = topstationmesh.clone(true);
-              // newtopstation.position.x = map[k].mesh.position.x;
-              // newtopstation.position.z = map[k].mesh.position.z;
-              // scene.add(newtopstation);
-            }
-          }
-
-          map[k].type = "station";
-          map[k].rname = stationdata[map[k].num].runPlanName;
-          map[k].kmmark = stationdata[map[k].num].kmPost;
-
-          scope.group.add(map[k].mesh);
-
-        }
-
-      }
-      resolve("loadedstation");
-    });
-  }
-
-
-
-}
-//canvas文字贴图方法
-//PS:待提炼 增强功能
-var stationcanvas = new Image();
-stationcanvas.src = JL3D_LOCAL_STATIC+"/texture/msgt.png";
-function getTextCanvas(text){
-  let canvas = document.getElementById('canvastexture');
-
-  canvas.width = 256;
-  canvas.height = 512;
-  // canvas.style.width = width;
-  // canvas.style.height = height;
-
-  let ctx = canvas.getContext('2d');
-  //ctx.fillStyle = '#FFFFFF';
-  ctx.fillRect(0, 0,256,512);
-
-  ctx.fillStyle = '#FFFFFF';
-  // ctx.textAlign = 'center';
-  // ctx.textBaseline = 'middle';
-  ctx.clearRect(0,0,256,512);
-
-  ctx.drawImage(stationcanvas,0,0,256,512);
-
-  ctx.font = "20px Verdana";
-  ctx.fillText("车站名称:  "+text.name, 20,58);
-
-  ctx.fillText("漫游", 30,100);
-  ctx.fillText("信息", 114,100);
-  ctx.fillText("备忘", 190,100);
-
-  ctx.fillText("车站序号: "+text.name, 10,155);
-
-  ctx.fillText("公里标记:"+text.kmPost,10 ,256*3/4);
-
-  let data = ctx.getImageData(0, 0,256,512);
-  return data;
-}
diff --git a/src/jlmap3d/main/model/StationStandModel.js b/src/jlmap3d/main/model/StationStandModel.js
deleted file mode 100644
index 020992024..000000000
--- a/src/jlmap3d/main/model/StationStandModel.js
+++ /dev/null
@@ -1,34 +0,0 @@
-export function StationStandModel(opts) {
-
-	var scope = this;
-
-	this.uuid = null;
-	this.code = null;
-	this.name = null;
-	this.type = null;
-
-	this.ismodel = false;
-	this.istexture = false;
-	this.modelurl = null;
-	this.index = null;
-	this.direction1= {
-		position:null,
-		name:null,
-		screenDoorOpenStatus:null,
-		mesh:null,
-		openpos:[],
-		closepos:[]
-	}
-	this.direction2= {
-		position:null,
-		name:null,
-		screenDoorOpenStatus:null,
-		mesh:null,
-		openpos:[],
-		closepos:[]
-	}
-
-  this.mesh = null;
-  this.meshurl = null;
-  this.picurl = null;
-}
diff --git a/src/jlmap3d/main/model/SwitchList.js b/src/jlmap3d/main/model/SwitchList.js
deleted file mode 100644
index de8de49ab..000000000
--- a/src/jlmap3d/main/model/SwitchList.js
+++ /dev/null
@@ -1,13 +0,0 @@
-import {SwitchModel} from '@/jlmap3d/model/SwitchModel.js';
-
-export function SwitchList() {
-
-  this.type = "switchlist";
-
-  this.list = null;
-
-  this.init = function(){
-
-  }
-
-}
diff --git a/src/jlmap3d/main/model/SwitchModel.js b/src/jlmap3d/main/model/SwitchModel.js
deleted file mode 100644
index 781a584d5..000000000
--- a/src/jlmap3d/main/model/SwitchModel.js
+++ /dev/null
@@ -1,24 +0,0 @@
-export function SwitchModel() {
-
-  var scope = this;
-  //命名
-  this.name = null;
-  //code
-  this.code = null;
-  //索引位置
-  this.index = null;
-
-  this.locateType = null;
-  //轨迹点
-  this.rail = [];
-  //长度
-  this.distance = null;
-
-  this.action = null;
-  //指向模型
-  this.mesh = null;
-  // //模型地址
-  // this.meshurl = null;
-  // //贴图地址
-  // this.picurl = null;
-}
diff --git a/src/jlmap3d/main/model/TrainList.js b/src/jlmap3d/main/model/TrainList.js
deleted file mode 100644
index c315c78fe..000000000
--- a/src/jlmap3d/main/model/TrainList.js
+++ /dev/null
@@ -1,243 +0,0 @@
-import {TrainModel} from '@/jlmap3d/edit/editmodel/TrainModel.js';
-import { JL3D_LOCAL_STATIC } from '@/api/jlmap3d/assets3d.js';
-export function TrainList() {
-
-  let scope = this;
-
-  this.type = "trainlist";
-
-  this.list = {};
-
-  this.group = new THREE.Group();
-  this.group.name = "train";
-  this.textlist = [];
-
-  this.initpromise = function(data,scene,assetloader,mixers,actionss,mode){
-    return new Promise(function(resolve, reject){
-      let selectmesh,ntracks1,ntracks2,tclip,fclip;
-      for(let n=assetloader.modellist.length-1;n>=0;n--){
-        if(assetloader.modellist[n].deviceType == "train"){
-
-          selectmesh = assetloader.modellist[n].mesh
-
-          ntracks1 = assetloader.modellist[n].animations.slice(16,27);
-
-          tclip = new THREE.AnimationClip("three",2,ntracks1);
-
-          ntracks2 = assetloader.modellist[n].animations.slice(0,15);
-
-          fclip = new THREE.AnimationClip("four",2,ntracks2);
-
-          n = 0;
-        }
-      }
-      //遍历列车数据
-      // console.log(data.length);
-      for(let i=0;i<data.length;i++){
-
-
-        actionss[data[i].code] = {
-          top:[],
-          down:[]
-        };
-        let newmesh = selectmesh.clone(true);
-        newmesh.mixer = [];
-        // console.log("-------------------------");
-        //   console.log(data[i]);
-        for(let j=0;j<newmesh.children.length;j++){
-
-          if(newmesh.children[j].name == "c1" || newmesh.children[j].name == "c6"){
-            // console.log("===================");
-             for(let n=0,lenn = newmesh.children[j].children.length;n<lenn;n++){
-
-               if(newmesh.children[j].children[n].name == "top"){
-                 newmesh.children[j].children[n].animations = [];
-                 newmesh.children[j].children[n].animations.push(tclip.clone());
-                 let mixer = new THREE.AnimationMixer(  newmesh.children[j].children[n] );
-                 // console.log(n);
-                 // console.log(newmesh.children[j].children[n]);
-                 newmesh.mixer.push(mixer);
-                 newmesh.mixerpush = false;
-                 // mixers.push(mixer);
-                 let action = mixer.clipAction( newmesh.children[j].children[n].animations[ 0 ] );
-                 //action.play();
-                 action.setLoop(THREE.LoopOnce);
-                 action.clampWhenFinished = true;
-                 actionss[data[i].code].top.push(action);
-
-               }
-
-               if(newmesh.children[j].children[n].name == "down"){
-                 newmesh.children[j].children[n].animations = [];
-                 newmesh.children[j].children[n].animations.push(tclip.clone());
-                 let mixer = new THREE.AnimationMixer(  newmesh.children[j].children[n] );
-
-                 newmesh.mixer.push(mixer);
-                 newmesh.mixerpush = false;
-                 // mixers.push(mixer);
-                 let action = mixer.clipAction( newmesh.children[j].children[n].animations[ 0 ] );
-                 //action.play();
-                 action.setLoop(THREE.LoopOnce);
-                 action.clampWhenFinished = true;
-                 actionss[data[i].code].down.push(action);
-               }
-             }
-           }else{
-             for(let n=0,lenn = newmesh.children[j].children.length;n<lenn;n++){
-                 if(newmesh.children[j].children[n].name == "top"){
-                   newmesh.children[j].children[n].animations = [];
-                   newmesh.children[j].children[n].animations.push(fclip.clone());
-                   let mixer = new THREE.AnimationMixer(  newmesh.children[j].children[n] );
-                   newmesh.mixer.push(mixer);
-                   newmesh.mixerpush = false;
-                   // mixers.push(mixer);
-                   let action = mixer.clipAction( newmesh.children[j].children[n].animations[ 0 ] );
-                   //action.play();
-                   action.setLoop(THREE.LoopOnce);
-                   action.clampWhenFinished = true;
-                   actionss[data[i].code].top.push(action);
-                 }
-
-                 if(newmesh.children[j].children[n].name == "down"){
-                   newmesh.children[j].children[n].animations = [];
-                   newmesh.children[j].children[n].animations.push(fclip.clone());
-                   let mixer = new THREE.AnimationMixer(  newmesh.children[j].children[n] );
-                   newmesh.mixer.push(mixer);
-                   newmesh.mixerpush = false;
-                   // mixers.push(mixer);
-                   let action = mixer.clipAction( newmesh.children[j].children[n].animations[ 0 ] );
-                   //action.play();
-                   action.setLoop(THREE.LoopOnce);
-                   action.clampWhenFinished = true;
-                   actionss[data[i].code].down.push(action);
-                 }
-             }
-           }
-            //newmesh.children[j].name = data[i].code;
-            newmesh.children[j].code = data[i].code;
-            newmesh.children[j].axis = new THREE.Vector3();
-            newmesh.children[j].up = new THREE.Vector3(1, 0, 0);
-            // newmesh.axis = new THREE.Vector3();
-            // newmesh.up = new THREE.Vector3(1, 0, 0);
-            // var pos = new THREE.Mesh( geometryp, materialp);
-            // pos.position.x = -73.5;
-            // newmesh.children[j].add( pos );
-            newmesh.children[j].rotalist = [];
-            // console.log(newmesh);
-        }
-        //
-        // // newmesh.children[4].add(newmesh.children[5]);
-        // // newmesh.children[3].add(newmesh.children[4]);
-        // // newmesh.children[2].add(newmesh.children[3]);
-        // // newmesh.children[1].add(newmesh.children[2]);
-        // // newmesh.children[0].add(newmesh.children[1]);
-        // for(let n=newmesh.children.length-1;n>=1;n--){
-        //   newmesh.children[n].position.x = -76;
-        //   newmesh.children[n-1].add(newmesh.children[n]);
-        // }
-        //创建列车字牌
-        if(mode){
-          if(mode == "02"){
-            let textgeometry = new THREE.PlaneBufferGeometry( 150, 100, 1 );
-            let textt = new THREE.CanvasTexture(getTextCanvas(data[i]));
-            let textmaterial = new THREE.MeshBasicMaterial( {
-              side: THREE.DoubleSide,
-              map:textt ,transparent: true,
-              alphaTest:0.1
-            } );
-            let textplane = new THREE.Mesh( textgeometry, textmaterial );
-            textplane.name = data[i].code;
-            textplane.position.x = 0;
-            textplane.position.y = 0;
-            textplane.position.z = 60;
-            textplane.tcode = data[i].code;
-            //textplane.rotation.x = Math.PI;
-            scope.textlist.push(textplane);
-            newmesh.children[0].add(textplane);
-            textgeometry.dispose();
-    				textmaterial.dispose();
-    				textt.dispose();
-          }
-        }
-
-
-
-        //group.add(textplane);
-        newmesh.first = false;
-        newmesh.name = data[i].code;
-        newmesh.rname = data[i].groupNumber;
-        newmesh.groupNumber = data[i].groupNumber;
-
-        newmesh.position.set(0,-50000,0);
-        // newmesh.children[0].position.y = 0;
-        //newmesh.rotation.y = Math.PI/2;
-        newmesh.status = "00";
-        newmesh.nowcode = null;
-        newmesh.curve = null;
-        newmesh.doorStatus = "01";
-        newmesh.dispose = true;
-        newmesh.nowsection = null;
-        newmesh.nextsection = null;
-        newmesh.speed = 0;
-        newmesh.speeds = 0;
-        newmesh.progress = null;
-        newmesh.startmark = 0;
-
-
-        scope.list[data[i].code] = newmesh;
-        //scene.add(newmesh);
-      }
-      // console.log(selectmesh);
-      // for(let i=0,leni=selectmesh.children.length;i<leni;i++){
-      //   selectmesh.children[i].geometry.dispose();
-      //   selectmesh.children[i].material.dispose();
-      // }
-      scene.add(scope.group);
-      resolve("loadedtrain");
-    });
-  }
-
-}
-
-let onProgress = function ( xhr ) {
-
-  if ( xhr.lengthComputable ) {
-
-    let percentComplete = xhr.loaded / xhr.total * 100;
-    console.log( Math.round( percentComplete, 2 ) + '% downloaded' );
-
-  }
-
-};
-
-let onError = function () { };
-
-var beauty = new Image();
-beauty.src = JL3D_LOCAL_STATIC+"/texture/guide.png";
-//canvas文字贴图方法
-//PS:待提炼 增强功能
-function getTextCanvas(text){
-  var canvas = document.getElementById('canvastexture');
-
-  canvas.width = 128;
-  canvas.height = 64;
-
-  var ctx = canvas.getContext('2d');
-
-  //var bg = canvas.createPattern(img, "no-repeat");
-  //ctx.fillStyle = bg;
-  ctx.fillRect(0, 0,128,64);
-  ctx.font = "8px Verdana";
-  ctx.fillStyle = '#000000';
-  ctx.textAlign = 'center';
-  ctx.textBaseline = 'middle';
-  ctx.clearRect(0,0,128,64);
-  //console.log(text.groupNumber);
-  ctx.drawImage(beauty,0,0,128, 64);
-  ctx.fillText("车组号:"+text.groupNumber, 40,10);
-  ctx.fillText("车组人员:XXX", 40,20);
-  // ctx.fillText("速度:XXX.XXX", 40,30);
-  //ctx.fillText(text.trainModel.name, width/2,height*3/4);
-  let data = ctx.getImageData(0, 0,128,64);
-  return data;
-}
diff --git a/src/jlmap3d/main/model/TrainModel.js b/src/jlmap3d/main/model/TrainModel.js
deleted file mode 100644
index 7bf6a92cb..000000000
--- a/src/jlmap3d/main/model/TrainModel.js
+++ /dev/null
@@ -1,8 +0,0 @@
-export function TrainModel(opts) {
-
-	var scope = this;
-
-  this.mesh = null;
-  this.meshurl = null;
-  this.picurl = null;
-}
diff --git a/src/jlmap3d/main/newmodel/SectionListN.js b/src/jlmap3d/main/newmodel/SectionListN.js
index a213e8322..5f81fef35 100644
--- a/src/jlmap3d/main/newmodel/SectionListN.js
+++ b/src/jlmap3d/main/newmodel/SectionListN.js
@@ -101,8 +101,8 @@ this.loadpromise = function(sectionList,sectiondata,rails,scene,assetloader){
         // console.log(newsection);
         let height = Math.random()/1000;
         var closedSpline;
+
         if(Math.abs(newsection.railpoint[0].y-newsection.railpoint[2].y)>0.01){
-          console.log(newsection.railpoint);
           closedSpline = new THREE.CatmullRomCurve3( [
             new THREE.Vector3(newsection.railpoint[0].x,newsection.railpoint[0].y,newsection.railpoint[0].z),
             new THREE.Vector3(newsection.railpoint[1].x,newsection.railpoint[1].y,newsection.railpoint[1].z+0.001),
@@ -110,9 +110,9 @@ this.loadpromise = function(sectionList,sectiondata,rails,scene,assetloader){
   				] );
         }else{
           closedSpline = new THREE.CatmullRomCurve3( [
-            new THREE.Vector3(newsection.railpoint[0].x,newsection.railpoint[0].y,newsection.railpoint[0].z),
-            new THREE.Vector3(newsection.railpoint[1].x,newsection.railpoint[0].y,newsection.railpoint[1].z+0.001),
-            new THREE.Vector3(newsection.railpoint[2].x,newsection.railpoint[0].y,newsection.railpoint[2].z)
+            new THREE.Vector3(newsection.railpoint[0].x,newsection.railpoint[2].y,newsection.railpoint[0].z),
+            new THREE.Vector3(newsection.railpoint[1].x,newsection.railpoint[2].y,newsection.railpoint[1].z+0.0015),
+            new THREE.Vector3(newsection.railpoint[2].x,newsection.railpoint[2].y,newsection.railpoint[2].z)
           ] );
         }
 
@@ -123,18 +123,18 @@ this.loadpromise = function(sectionList,sectiondata,rails,scene,assetloader){
         closedSpline.tension = 0.15;
 				closedSpline.closed = false;
 				var extrudeSettings = {
-				    steps           : 6,
-				    curveSegments   : 1,
-				    bevelSegments   : 1,
-				    bevelEnabled    : false,
-				    extrudePath     : closedSpline,
+			    steps           : 6,
+			    curveSegments   : 1,
+			    bevelSegments   : 1,
+			    bevelEnabled    : false,
+			    extrudePath     : closedSpline,
 				};
 				var shape = new THREE.Shape();
 
         len = closedSpline.getLength();
 
 
-        if(Math.abs(newsection.railpoint[0].y - newsection.railpoint[2].y)>0.001){
+        if(Math.abs(newsection.railpoint[0].y - newsection.railpoint[2].y)>0.01){
           shape.moveTo( -2, 0 );
           shape.lineTo( 2, 0 );
         }else{
diff --git a/src/jlmap3d/main/newmodel/StationStandListN.js b/src/jlmap3d/main/newmodel/StationStandListN.js
index 89a61b2dd..22486a36e 100644
--- a/src/jlmap3d/main/newmodel/StationStandListN.js
+++ b/src/jlmap3d/main/newmodel/StationStandListN.js
@@ -110,6 +110,7 @@ export function StationStandListN() {
           if(mode == "02"){
             let textgeometry = new THREE.PlaneBufferGeometry( 65, 90, 1 );
             let textt = new THREE.CanvasTexture(getTextCanvas(stationdata[i]));
+
             let textmaterial = new THREE.MeshBasicMaterial( { side: THREE.DoubleSide,map:textt ,transparent: true} );
             let textplane = new THREE.Mesh( textgeometry, textmaterial );
             textplane.name = stationdata[i].code;
@@ -289,6 +290,7 @@ export function StationStandListN() {
             if(mode == "02"){
               let textgeometry = new THREE.PlaneBufferGeometry( 65, 90, 1 );
               let textt = new THREE.CanvasTexture(getTextCanvas(standsdata[i]));
+
               let textmaterial = new THREE.MeshBasicMaterial( { side: THREE.DoubleSide,map:textt ,transparent: true} );
               let textplane = new THREE.Mesh( textgeometry, textmaterial );
               textplane.name = standsdata[i].code;
@@ -414,7 +416,9 @@ export function StationStandListN() {
             }
           }
         }
+
       }
+
       // scene.add(scope.textlist);
       stationdata = null;
       psddata = null;
diff --git a/src/jlmap3d/main/model/jl3ddata.js b/src/jlmap3d/main/newmodel/jl3ddata.js
similarity index 100%
rename from src/jlmap3d/main/model/jl3ddata.js
rename to src/jlmap3d/main/newmodel/jl3ddata.js
diff --git a/src/jmap/config/defaultStyle.js b/src/jmap/config/defaultStyle.js
deleted file mode 100644
index d20fc5a23..000000000
--- a/src/jmap/config/defaultStyle.js
+++ /dev/null
@@ -1,124 +0,0 @@
-export default class defaultStyle {
-    constructor() {
-        /** 透明填充 颜色*/
-        this.transparentColor = 'rgba(0,0,0,0)';
-
-        /** 默认背景 颜色*/
-        this.backgroundColor = '#000000';
-
-        /** 默认提示背景 颜色*/
-        this.tipBackgroundColor = 'yellow';
-
-        /** 默认边线 颜色*/
-        this.sidelineColor = '#FFFFFF';
-
-        /** 默认字体 大小*/
-        this.textFontSize = 10;
-
-        /** 默认字体 族类*/
-        this.fontFamily = '宋体';
-
-        /** 默认字体颜色*/
-        this.textFontColor = '#C0C0C0';
-
-        /** 默认提示字体大小*/
-        this.arrowFontSize = 10;
-
-        /** 列车长度*/
-        this.trainWidth = 40;
-
-        /** 列车高度*/
-        this.trainHeight = 20;
-
-        /** 列车字号*/
-        this.trainTextFontSize = 12;
-
-        /** 列车HDSA字号*/
-        this.trainHSDATextFontSize = 9;
-
-        /** 列车信号的半径*/
-        this.trainConflictR = 3;
-
-        /** 列车信号距离车的距离*/
-        this.trainConflictDistance = 5;
-
-        /** 列车车头比车身高出的长度;上下相比车体伸出去的边框*/
-        this.trainMoreLength = 0;
-
-        /** 列车和车头之间的间距*/
-        this.trainHeadDistance = 4;
-
-        /** 列车竖杠的宽度*/
-        this.trainConntWidth = 3;
-
-        /** 列车竖杠和方向之间的间隔*/
-        this.trainPadding = 4;
-
-        /** 列车方向的宽度*/
-        this.trainArrowWidth = 6;
-
-        /** 列车和区段之间的距离*/
-        this.trainDistance = 30;
-
-        /** 列车边线颜色*/
-        this.trainSidelineColor = '#C0C0C0';
-
-        /** 列车背景*/
-        this.trainBackground = '#000000';
-
-        /** 列车 灰色*/
-        this.trainGrayColor = '#C0C0C0';
-
-        /** 列车 白色*/
-        this.trainWitheColor = '#FFFFFF';
-
-        /** 列车 棕色*/
-        this.trainBrownColor = '#A0522D';
-
-        /** 列车 黄色*/
-        this.trainYellowColor = '#FFFF00';
-
-        /** 列车 棕灰色 */
-        this.trainBrown1Color = '#725A64';
-
-        /** 列车 绿色*/
-        this.trainGreenColor = '#00FF00';
-
-        /** 列车 蓝色*/
-        this.trainBlueColor = '#3265FF';
-
-        /** 列车 红色*/
-        this.trainRedColor = '#FF0000';
-
-        /** 列车 橘色*/
-        this.trainOrangeColor = 'orange';
-
-        /** 列车 紫色*/
-        this.trainPurpleColor = 'purple';
-
-        /** 列车 粉色*/
-        this.trainPinkColor = 'pink';
-
-        /** 车次窗高度*/
-        this.trainWindowWidth = 40;
-
-        /** 车次窗高度*/
-        this.trainWindowHeight = 15;
-
-        /** 列车文字颜色*/
-        this.trainTextColor = '#ffffff';
-
-        /** 灯包围框样式 */
-        this.arcBorderStyle = {
-            lineDash: [3, 3],
-            stroke: '#FFFFFF',
-            fill: 'rgba(0,0,0,0)'
-        };
-        /** 字体包围框样式 */
-        this.textBorderStyle = {
-            lineDash: [3, 3],
-            stroke: '#FFFFFF',
-            fill: '#00FFFF'
-        };
-    }
-}
diff --git a/src/jmap/config/deviceStyle.js b/src/jmap/config/deviceStyle.js
deleted file mode 100644
index 1eb3cf035..000000000
--- a/src/jmap/config/deviceStyle.js
+++ /dev/null
@@ -1,10 +0,0 @@
-const mapDeviceStyle = {
-    // '01': 'chengdu_04',
-    '02': 'fuzhou_01'
-    // '03': 'bejing_01',
-    // '04': 'chengdu_03'
-};
-
-export function selectLineCode(code) {
-    return Object.assign({}, require(`./skinCode/${mapDeviceStyle[code || '02']}`).default);
-}
diff --git a/src/jmap/config/skinCode/fuzhou_01.js b/src/jmap/config/skinCode/fuzhou_01.js
deleted file mode 100644
index aa79a4871..000000000
--- a/src/jmap/config/skinCode/fuzhou_01.js
+++ /dev/null
@@ -1,547 +0,0 @@
-import defaultStyle from '../defaultStyle';
-import deviceType from '../../constant/deviceType';
-
-class SkinCode extends defaultStyle {
-    constructor() {
-        super();
-        this[deviceType.Link] = {
-            lineWidthColor: '#FFFFFF',							// line 颜色
-            linkWidth: 4.4,										// link 宽度
-            linkColor: '#3F3F3F',								// link 线条颜色
-            linkTextColor: '#FFFFFF'							// link 字体颜色
-        };
-
-        this[deviceType.Section] = {
-            active: {
-                routeColor: false							// 进路触发颜色
-            },
-            text: {
-                show: true,									// 物理区段名称显示
-                position: 0, 								// 区段名称位置 1 上面 -1 下面 0 对称
-                distance: 18,								// 文字离区段距离
-                fontSize: 11, 								// 字体大小
-                fontWeight: 'normal',						// 字体粗细
-                fontColor: '#FFFFFF', 						// 字体颜色
-                textAlign: 'center', 						// 水平对齐方式
-                textPosition: 'inside', 					// 文字位置
-                textVerticalAlign: 'middle' 				// 文字垂直对齐方式
-            },
-            logicText: {
-                show: true,									// 逻辑区段名称显示
-                position: 0, 								// 区段名称位置 1 上面 -1 下面 0 对称
-                distance: 6,								// 文字离区段距离
-                fontSize: 8, 								// 字体大小
-                fontWeight: 'normal',						// 字体粗细
-                fontColor: '#FFFFFF', 						// 字体颜色
-                textAlign: 'center', 						// 水平对齐方式
-                textPosition: 'inside', 					// 文字位置
-                textVerticalAlign: 'middle' 				// 文字垂直对齐方式
-            },
-            standText: {
-                show: true,									// 站台轨名称显示
-                position: 0, 								// 区段名称位置 1 上面 -1 下面 0 对称
-                distance: 30,								// 文字离区段距离
-                fontSize: 11, 								// 字体大小
-                fontWeight: 'normal',						// 字体粗细
-                fontColor: '#FFFFFF', 						// 字体颜色
-                textAlign: 'center', 						// 水平对齐方式
-                textPosition: 'inside', 					// 文字位置
-                textVerticalAlign: 'middle' 				// 文字垂直对齐方式
-            },
-            reentryText: {
-                show: true,									// 折返轨名称显示
-                position: 0, 								// 区段名称位置 1 上面 -1 下面 0 对称
-                distance: 30,								// 文字离区段距离
-                fontSize: 11, 								// 字体大小
-                fontWeight: 'normal',						// 字体粗细
-                fontColor: '#FFFFFF', 						// 字体颜色
-                textAlign: 'center', 						// 水平对齐方式
-                textPosition: 'inside', 					// 文字位置
-                textVerticalAlign: 'middle' 				// 文字垂直对齐方式
-            },
-            transferText: {
-                show: true,									// 转换轨名称显示
-                position: 0, 								// 区段名称位置 1 上面 -1 下面 0 对称
-                distance: 28,								// 文字离区段距离
-                fontSize: 11, 								// 字体大小
-                fontWeight: 'normal',						// 字体粗细
-                fontColor: '#FFFFFF', 						// 字体颜色
-                textAlign: 'center', 						// 水平对齐方式
-                textPosition: 'inside', 					// 文字位置
-                textVerticalAlign: 'middle' 				// 文字垂直对齐方式
-            },
-            destinationText: {
-                show: true,									// 目的码名称显示
-                opposite: true,								// 对称相反
-                position: 0, 								// 区段名称位置 1 上面 -1 下面 0 对称
-                distance: 10,								// 文字离区段距离
-                fontSize: 10, 								// 字体大小
-                fontWeight: 'bold',							// 字体粗细
-                fontColor: 'yellow', 						// 字体颜色
-                textAlign: 'center', 						// 水平对齐方式
-                textPosition: 'inside', 					// 文字位置
-                textVerticalAlign: 'middle' 				// 文字垂直对齐方式
-            },
-            line: {
-                width: 5, 										// 区段宽度
-                beyondWidth: 1, 								// 区段宽超出宽度
-                invadeColor: '#EF0C08', 						// 区段侵入颜色
-                spareColor: '#3F3F3F', 							// 区段空闲颜色
-                communicationOccupiedColor: '#FF329A', 			// 区段通信车占用颜色
-                unCommunicationOccupiedColor: '#FE0000', 		// 区段非通讯车占用颜色
-                routeLockColor: '#FFFFFF',						// 区段路由锁定颜色
-                faultLockColor: '#9B4A0A', 						// 区段故障锁定颜色
-                undefinedColor: '#0071C1', 						// 区段未定义颜色
-                protectionLockedColor: '#FEFF00', 				// 保护区段锁闭(未用)
-                blockColor: '#800080', 							// 区段封锁颜色
-                atcExcisionColor: '#A0522D', 					// 区段atc切除颜色
-                atsExcisionColor: '#A0522D', 					// 区段ats切除颜色
-                timeReleaseColor: '#3F3F3F', 					// 区段延时释放颜色
-                protectiveLockColor: '#FFFF00', 				// 区段保护锁闭
-                protectiveTimeReleaseColor: '#0071C1', 			// 区段保护延时解锁
-                logicalColor: '#FFFF00', 						// 逻辑区段颜色 (未用)
-                logicalTextColor: '#FFFFFF' 					// 逻辑区段名称颜色 (未用)
-            },
-            axle: {
-                radius: 3, 										// 计轴 半径
-                distance: 5, 									// 计轴和区段之间的距离 （未用）
-                color: '#FFFFFF', 								// 区段计轴颜色
-                resetColor: '#00FFFF', 							// 区段计轴预复位颜色
-                Failure: '#E6A23C' 								// #FFFF00 计轴失效
-            },
-            speedLimit: { 										// 限速元素
-                width: 1, 										// 限速线的宽短
-                distance: 5, 									// 限速线距离区段距离
-                lineColor: '#FFFF00', 							// 限速线颜色
-                nameShow: false 								// 名称显示
-            },
-            separator: {
-                z: 6,											// 分割符层级
-                width: 1.2, 									// 分隔符宽度
-                endWidth: 3.5, 									// 尽头分隔符宽度
-                endColor: '#3F3F3F', 							// 尽头分隔符颜色
-                color: '#3149C3' 								// 区段边界符颜色
-            }
-        };
-
-        this[deviceType.Signal] = {
-            distance: 3,									// 设备距离区段的距离
-            post: {
-                standardColor: '#3149C3',						// 灯珠颜色
-                standardWidth: 2								// 灯珠宽度
-            },
-            text: {
-                show: true,										// 信号机名称显示
-                distance: 0,									// 文字和灯杆的距离
-                isNoRotation: true,								// 是否禁止旋转
-                isAlignCenter: true,							// 信号字体对其方式
-                fontSize: 11,									// 信号机名称字体大小
-                fontWeight: 'bold',								// 信号机名称字体粗细
-                defaultColor: '#FFFFFF',						// 信号灯字体默认色
-                blockColor: '#FFFFFF',							// 信号灯字体锁定颜色
-                checkColor: '#00FF00',							// 信号字体
-                nameBorderShow: true							// 信号机名字边框显示
-            },
-            lamp: {
-                guidName: 'defult',								// 默认引导类型
-                stopWidth: 2,									// 禁止线宽度
-                borderWidth: 1,									// 信号灯边框线宽度
-                borderColor: '#3149C3',							// 信号灯边框线颜色
-                radiusR: 6,										// 信号灯半径
-                blockColor: '#EF0C08',							// 信号灯锁闭
-                grayColor: '#7F7F7F',							// 信号灯灰色
-                redColor: '#FF0000',							// 信号灯红色
-                greenColor: '#00FF00',							// 信号灯绿色
-                yellowColor: '#FFFF00',							// 信号灯黄色
-                whiteColor: '#FFFFFF',							// 信号灯白色
-                blueColor: '#0070C0'							// 信号灯蓝色
-            },
-            route: {
-                direction: false,								// 自动进路方向
-                offset: { x: -4, y: 0 },						// 自动进路偏移量
-                routeColor: '#00FF00'							// 自动进路
-            },
-            auto: {
-                direction: false,								// 自动通过方向
-                offset: { x: -4, y: 0},							// 自动通过偏移量
-                width: 5,										// 自动宽度
-                autoRoute: '#00FF00',							// 自动进路
-                autoTrigger: '#FFFF00',							// 自动触发
-                manualControl: '#FFFF00',						// 人工控制
-                outConflict: '#C00808'							// 出车冲突
-            },
-            delay: {
-                direction: true,								// 延时解锁方向
-                offset: { x: 15, y: -10},						// 延时解锁偏移量
-                fontSize: 11,									// 延迟解锁字体大小
-                fontColor: '#FF0000',							// 延迟解锁颜色
-                fontWeight: 'bold'								// 字体粗细
-            },
-            button: {
-                distance: 5,									// 信号灯按钮距离区段的距离
-                borderDashColor: '#FFFFFF',						// 信号灯按钮边线
-                buttonColor: 'darkgreen',						// 信号灯按钮颜色
-                buttonLightenColor: '#E4EF50'					// 信号灯按钮闪烁颜色
-            }
-        };
-
-        this[deviceType.StationStand] = {
-            common: { 											// 通用属性
-                textFontSize: 11 								// 站台默认字体大小
-            },
-            safetyDoor: { 										// 屏蔽门
-                height: 3, 										// 站台屏蔽门高度
-                distance: 8, 									// 站台和屏蔽门之间的距离
-                defaultColor: '#00FF00', 						// 屏蔽门默认颜色
-                splitDoorColor: '#F61107' 						// 屏蔽门切除颜色
-            },
-            stand: { 											// 站台
-                headFontSize: 11, 								// 站台首端字体大小
-                spareColor: '#606060', 							// 站台空闲颜色
-                stopColor: '#FEFE00', 							// 站台列车停站颜色
-                jumpStopColor: '#9A99FF', 						// 站台跳停颜色
-                designatedJumpStopColor: 'lightSkyBlue' 		// 站台指定列车跳停颜色
-            },
-            standEmergent: { 									// 紧急关闭
-                mergentR: 4, 									// 站台紧急关闭半径
-                offset: {x: 0, y: 40}, 							// 站台紧急关闭偏移量
-                closeColor: '#F61107' 							// 站台紧急关闭颜色
-            },
-            reentry: { 											// 站台折返策略
-                position: 0, 									// 折返方向
-                offset: {x: -16, y: 20}, 						// 折返偏移量
-                noHumanColor: '#0F16DA', 						// 站台无人折返
-                autoChangeEndsColor: '#0BF400' 					// 站台自动换端
-            },
-            detainCar: { 										// 扣车
-                text: 'H', 										// 扣车显示内容
-                position: -1, 									// 扣车方向
-                offset: {x: -8, y: -6}, 						// 扣车偏移量
-                trainColor: '#E4EF50', 							// 车站扣车颜色
-                centerTrainColor: '#FFFFFF', 					// 中心扣车颜色
-                andCenterTrainColor: '#F61107', 				// 车站+中心扣车颜色
-                detainTrainTextColor: '#E4EF50' 				// 车站扣除文字颜色
-            },
-            stopTime: { 										// 停站时间
-                position: 1, 									// 运行时间方向
-                offset: {x: -8, y: 26},		 					// 运行时间偏移量
-                textColor: '#FFFFFF' 							// 停站时间字体颜色
-            },
-            level: { 											// 运行等级
-                position: 1, 									// 运行等级方向
-                offset: {x: -8, y: 6}, 							// 运行等级偏移量
-                textColor: '#FFFFFF' 							// 停站等级字体颜色
-            }
-        };
-
-        this[deviceType.StationControl] = {
-            text: {
-                distance: 2,									// 灯和文字之间的距离
-                fontSize: 11,									// 字体大小
-                fontFormat: 'consolas',							// 字体格式
-                fontColor: '#ffffff',							// 字体颜色
-                fontWeight: 'normal',							// 字体粗细
-                textAlign: 'middle',							// 字体水平对齐
-                textVerticalAlign: 'top'						// 字体垂直对齐
-            },
-            lamp: {
-                count: 2,										// 控制模式灯个数
-                offset: {x: 0, y: 0},							// 控制模式灯偏移量
-                radiusR: 4,										// 控制模式灯的半径
-                distance: 36,									// 控制模式之间灯之间的距离
-                grayColor: '#7F7F7F',							// 控制模式灰色
-                greenColor: '#00FF00',							// 控制模式绿色
-                redColor: '#FF0000',							// 控制模式红色
-                yellowColor: '#FFFF00',							// 控制模式黄色
-                emergencyControlShow: false,					// 紧急站控显示
-                centerControlShow: true,						// 中控显示
-                substationControlShow: true,					// 站控按钮显示
-                interconnectedControlShow: false				// 联锁控显示
-            },
-            arrow: {
-                show: true		 								// 控制模式箭头显隐
-            },
-            mouseOverStyle: {										// 鼠标悬浮样式
-                fontSize: null,
-                fontFormat: 'consolas',
-                fontColor: '#000',
-                fontWeight: 'normal',
-                textAlign: 'middle',
-                textVerticalAlign: 'top'
-            }
-        };
-
-        this[deviceType.StationCounter] = {
-            text: {
-                distance: 2,							 		// 计数器名称和文字的距离
-                fontColor: '#FFFFFF',		 			 		// 计数器字体颜色
-                borderColor: '#E4EF50'	 				 		// 计数器边框颜色
-            }
-        };
-
-        this[deviceType.StationDelayUnlock] = {
-            text: {
-                distance: 3,									// 延迟解锁和设备之间的距离
-                fontColor: '#FFFFFF',							// 延时解锁字体颜色
-                borderColor: '#FFFFFF'							// 延迟解锁边框颜色
-            }
-        };
-
-        this[deviceType.Station] = {
-            // text: {
-            // 	show: true											// 公里标名称显示
-            // },
-            kmPostShow: true,										// 公里标显示
-            kilometerPosition: 'up'									// 公里标朝向
-        };
-
-        this[deviceType.Switch] = {
-            text: {
-                show: true,											// 道岔名称显示
-                position: 0, 									// 区段名称位置 1 上面 -1 下面 0 对称
-                offset: {x: 0, y: 8},							// 道岔名称与区段距离
-                fontSize: 11,									// 字体大小
-                fontColor: '#C0C0C0',							// 道岔名称颜色
-                fontWeight: 'bold',							// 字体粗细
-                borderColor: '#FE0000',							// 道岔边框颜色
-                lossColor: '#FFFFFF',							// 道岔失去颜色
-                locateColor: '#00FF00',							// 道岔定位颜色
-                inversionColor: '#9C9D09',						// 道岔反位颜色
-                monolockColor: '#870E10'						// 道岔单锁颜色
-            },
-            core: {
-                length: 6										// 	道岔单边长度
-            },
-            block: {											// 道岔封锁配置
-                nameBorderShow: true, 							// 道岔名称是否有包围框 显示
-                contentRectShow: false							// 道岔封锁显示
-            },
-            monolock: {											// 道岔单锁配置
-                locationColor: '#ea282c', 						// 道岔单锁定位颜色 (红色)
-                inversionColor: '#ea282c', 						// 道岔单锁反位颜色 (红色)
-                rectShow: false 								// 道岔单锁 矩形框是否显示
-            }
-        };
-
-        this[deviceType.Line] = {
-            lineColor: '#FFFFFF'								// 线条颜色
-        };
-
-        this[deviceType.LcControl] = {
-            text: {
-                fontSize: 10,										// 灯字体大小
-                fontWeight: 'normal',								// 字体粗细
-                distance: 5 										// 灯跟文字距离
-            },
-            lamp: {
-                radiusR: 6,											// 灯大小
-                controlColor: '#FFFF00'								// 灯颜色
-            },
-            mouseOverStyle: {
-                fontSize: 10,
-                fontFormat: 'consolas',
-                fontColor: '#FFF000',
-                fontWeight: 'normal',
-                textAlign: 'middle',
-                textVerticalAlign: 'top',
-                arcColor: '#00FFFF',
-                textColor: '#000000'
-            }
-        };
-
-        this[deviceType.ZcControl] = {
-            text: {
-                fontSize: 10,										// 字体大小
-                fontWeight: 'normal',								// 字体粗细
-                distance: 5 										// 灯跟文字距离
-            },
-            lamp: {
-                radiusR: 6,											// 灯大小
-                controlColor: '#00FF00'								// 灯颜色
-            },
-            mouseOverStyle: {
-                fontSize: 10,
-                fontFormat: 'consolas',
-                fontColor: '#FFF000',
-                fontWeight: 'normal',
-                textAlign: 'middle',
-                textVerticalAlign: 'top',
-                arcColor: '#00FFFF',
-                textColor: '#000000'
-            }
-        };
-
-        this[deviceType.LimitControl] = {
-            text: {
-                fontSize: 10,										// 字体大小
-                fontWeight: 'normal',								// 字体粗细
-                distance: 5 										// 灯跟文字距离
-            },
-            lamp: {
-                radiusR: 6,											// 灯大小
-                controlColor: '#ECE9D8'								// 灯颜色
-            },
-            mouseOverStyle: {
-                fontSize: 10,
-                fontFormat: 'consolas',
-                fontColor: '#FFF000',
-                fontWeight: 'normal',
-                textAlign: 'middle',
-                textVerticalAlign: 'top',
-                textColor: '#000000',
-                arcColor: '#00FFFF'
-            }
-        };
-
-        this[deviceType.TrainWindow] = {
-            lineColor: '#4DD43F',								// 车次窗颜色
-            lineDash: null,										// 车次窗虚线间隔
-            lineWidth: 1,										// 车次窗线宽
-            trainWindowSmooth: 0								// 车次窗矩形圆滑程度
-        };
-
-        this[deviceType.Train] = {
-            trainBody: {
-                trainBodyLineWidth: 0, // 车身line宽
-                changeTrainWidth: true, // 是否根据车身上车组号、服务号、车次号、目的地码显示情况改变列车长度
-                specialTrainType: [
-                    {
-                        type: '03',
-                        serviceNumber: 'MM',
-                        nameFormat: 'serviceNumber:groupNumber'
-                    },
-                    {
-                        type: '02',
-                        nameFormat: 'targetCode:groupNumber'
-                    }
-                ], // 特殊列车类型需设置显示格式
-                lrPadding: 1, // 两边间隔
-                upPadding: 1, // 上边距离
-                trainBodyFillColor: '#000000', // 列车车身填充颜色
-                trainNameFormat: 'targetCode:serviceNumber:tripNumber'// 列车显示格式
-            },
-            hsda: {
-                trainHSDATextFontSize: 8// 列车HDSA字号
-            },
-            trainNumber: {
-                targetCodePrefix: '000', // 目的地码前缀
-                defaultTargetCode: 'AAA', // 默认目的地码
-                trainTargetTextAlign: 'left', // 车次号文字显示位置
-                trainNumberOffset: { x: 1, y: 1}// 目的地码偏移量
-            },
-            trainServer: {
-                serviceNumberPrefix: '00', // 服务号(表号)前缀
-                defaultServiceNumber: 'BB', // 默认服务号（表号）
-                trainServerOffset: { x: 26, y: 1}// 列车服务号偏移
-            },
-            trainTarget: {
-                tripNumberPrefix: '0000', // 车次号前缀
-                defaultDirectionCode: 'D', // 默认车次号1
-                defaultTripNumber: 'CCC', // 默认车次号2
-                trainTargetOffset: { x: 42, y: 1}// 列车车次号偏移
-            },
-            trainTargetNumber: {
-                groupNumberPrefix: '000', // 车组号前缀
-                defaultGroupNumber: 'EEE', // 默认车组号
-                trainTargetNumberOffset: {x: 0, y: 1}// 车组号偏移量
-            },
-            trainHead: {
-                trainMoreLength: 1, // 列车车头比车身高出的长度,上下相比车体伸出去的边框
-                trainHeadTriangleFirst: { x: 0, y: 0}, // 列车车头三角坐标1偏移量
-                trainHeadTriangleSecond: { x: 4, y: 7.5}, // 列车车头三角坐标2偏移量
-                trainHeadTriangleThird: { x: 0, y: 15}, // 列车车头三角坐标3偏移量
-                trainHeadRectHeight: 15, // 列车车头矩形高度
-                trainConntWidth: 4, // 列车竖杠的宽度
-                trainHeadFillColor: '#EF0C08'// 列车车头矩形填充颜色
-            },
-            common: {
-                trainHeight: 17, // 列车高度
-                trainHeadDistance: 2, // 列车和车头之间的间距
-                trainWidth: 76, // 列车长度
-                trainTextFontSize: 15, // 列车字号
-                fontFamily: 'consolas', // 默认字体 族类
-                nameFontSize: 15, // 字体大小
-                haveTextHSDA: false, // 是否需创建textHSDA对象
-                haveArrowText: true, // 是否需创建arrowText对象
-                haveTrainBorder: false, // 是否需创建trainBorder对象
-                aspectRatio: 8 / 15, // 字体宽高比例（用以拼接text是计算位置）
-                textOffset: 1, // 字体偏移（用以控制字体据车头的距离）
-                trainWidthMoreText: 2 // 计算列车长度时--列车长比text多出尺寸
-            },
-            trainStatusStyle: {
-                destinationStatus: [
-                    {status: '01', showColor: '#FFFFFF'},
-                    {status: '02', showColor: '#00FF00'},
-                    {status: '03', showColor: '#3265FF'},
-                    {status: '04', showColor: '#9B4A09'},
-                    {status: '05', showColor: '#EF0C08'},
-                    {status: '06', showColor: '#FFFFFF'},
-                    {status: '07', showColor: '#FFFF00'}
-                ], // 目的地状态 01准点 02早点 03严重早点 04晚点 05严重晚点 06头码车 07ATP切除
-                destinationStatusSetText: 'trainServer', // 目的地状态设置的对应哪个text的颜色
-                directionType: [
-                    {
-                        type: '01',
-                        lineLShow: false,
-                        lineRShow: false,
-                        arrowLShow: false,
-                        arrowRShow: false
-                    },
-                    {
-                        type: '02',
-                        lineLShow: false,
-                        lineRShow: false,
-                        arrowLShow: false,
-                        arrowRShow: true
-                    },
-                    {
-                        type: '03',
-                        lineLShow: false,
-                        lineRShow: false,
-                        arrowLShow: true,
-                        arrowRShow: false
-                    }
-                ], // 运行方向状态类型对应车头显示状态  01未知方向 02从左往右 上行 03从右往左 下行
-                directionStopType: [
-                    {type: '01', lineLShow: false, lineRShow: false},
-                    {type: '02', lineLShow: false, lineRShow: true},
-                    {type: '03', lineLShow: true, lineRShow: false}
-                ], // 列车停止方向类型对应车头显示状态   01未知方向 02从左往右 上行 03从右往左 下行
-                runModeStatus: [
-                    {
-                        status: '01',
-                        trainLColor: '#EF0C08',
-                        trainRColor: '#EF0C08'
-                    },
-                    {
-                        status: '02',
-                        trainLColor: '#00FF00',
-                        trainRColor: '#00FF00'
-                    },
-                    {
-                        status: '03',
-                        trainLColor: '#FFFF00',
-                        trainRColor: '#FFFF00'
-                    },
-                    {
-                        status: '04',
-                        trainLColor: '#EA700D',
-                        trainRColor: '#EA700D'
-                    },
-                    {
-                        status: '05',
-                        trainLColor: '#A0522D',
-                        trainRColor: '#A0522D'
-                    }
-                ], // 列车运行模式对应车头颜色 01信号中断 02 ATO自动驾驶模式AM  03 ATP监控下的人工驾驶模式CM 04 限制人工驾驶模式RM 05 非限制人工驾驶模式RM
-                runControlStatus: [], // 设置运行控制状态类型 eg:{status: '01', hShow: false, sShow: false}
-                doorStatus: [], // 设置车门状态类型 eg:{status: '01', dShow: false}
-                communicationStatus: [], // 设置通信状态  eg:{status: '01', trainColor:'#725A64'}
-                alarmStatus: [], // 设置报警状态 eg:{status: '01', aShow: false}
-                serverNoType: []// 服务号状态类型 eg:{type: '01', showColor: '#FFFFFF'}
-            }
-        };
-    }
-}
-
-export default new SkinCode();
diff --git a/src/jmap/constant/deviceRender.js b/src/jmap/constant/deviceRender.js
deleted file mode 100644
index 1bac56f0e..000000000
--- a/src/jmap/constant/deviceRender.js
+++ /dev/null
@@ -1,117 +0,0 @@
-import deviceType from './deviceType';
-
-const deviceRender = {};
-
-/** link渲染配置*/
-deviceRender[deviceType.Link] = {
-    _type: deviceType.Link,
-    zlevel: 1
-};
-
-/** Section渲染配置*/
-deviceRender[deviceType.Section] = {
-    _type: deviceType.Section,
-    zlevel: 1
-};
-
-/** Signal渲染配置*/
-deviceRender[deviceType.Signal] = {
-    _type: deviceType.Signal,
-    zlevel: 1
-};
-
-/** Switch渲染配置*/
-deviceRender[deviceType.Switch] = {
-    _type: deviceType.Switch,
-    zlevel: 1
-};
-
-/** Station渲染配置*/
-deviceRender[deviceType.Station] = {
-    _type: deviceType.Station,
-    zlevel: 1
-};
-
-/** StationStand渲染配置*/
-deviceRender[deviceType.StationStand] = {
-    _type: deviceType.StationStand,
-    zlevel: 1
-};
-
-/** StationControl渲染配置*/
-deviceRender[deviceType.StationControl] = {
-    _type: deviceType.StationControl,
-    zlevel: 1
-};
-
-/** ImageControl渲染配置*/
-deviceRender[deviceType.ImageControl] = {
-    _type: deviceType.ImageControl,
-    zlevel: 1
-};
-
-/** ZcControl渲染配置*/
-deviceRender[deviceType.ZcControl] = {
-    _type: deviceType.ZcControl,
-    zlevel: 1
-};
-
-/** LcControl渲染配置*/
-deviceRender[deviceType.LcControl] = {
-    _type: deviceType.LcControl,
-    zlevel: 1
-};
-
-/** LimitControl渲染配置*/
-deviceRender[deviceType.LimitControl] = {
-    _type: deviceType.LimitControl,
-    zlevel: 1
-};
-
-/** StationDelayUnlock渲染配置*/
-deviceRender[deviceType.StationDelayUnlock] = {
-    _type: deviceType.StationDelayUnlock,
-    zlevel: 1
-};
-
-/** Train渲染配置*/
-deviceRender[deviceType.Train] = {
-    _type: deviceType.Train,
-    zlevel: 1
-};
-
-/** TrainWindow渲染配置*/
-deviceRender[deviceType.TrainWindow] = {
-    _type: deviceType.TrainWindow,
-    zlevel: 1
-};
-
-/** Line渲染配置*/
-deviceRender[deviceType.Line] = {
-    _type: deviceType.Line,
-    zlevel: 1
-};
-
-/** Text渲染配置*/
-deviceRender[deviceType.Text] = {
-    _type: deviceType.Text,
-    zlevel: 1
-};
-
-/** TrainWindow渲染配置*/
-deviceRender[deviceType.TrainWindow] = {
-    _type: deviceType.TrainWindow,
-    zlevel: 1
-};
-/** Train渲染配置*/
-deviceRender[deviceType.TRain] = {
-    _type: deviceType.TRain,
-    zlevel: 1
-};
-/** CheckBox渲染配置*/
-deviceRender[deviceType.CheckBox] = {
-    _type: deviceType.CheckBox,
-    zlevel: 1
-};
-
-export default deviceRender;
diff --git a/src/jmap/constant/deviceState.js b/src/jmap/constant/deviceState.js
deleted file mode 100644
index dfa97f886..000000000
--- a/src/jmap/constant/deviceState.js
+++ /dev/null
@@ -1,334 +0,0 @@
-import deviceType from './deviceType';
-
-const deviceState = {};
-
-deviceState[deviceType.Section] = {
-/** 区段状态*/
-    status: {
-        Default: '01',			/** 空闲（缺省值）*/
-        State00: '00',			/** 未定义状态 */
-        State01: '01', 			/** 空闲 */
-        State02: '02', 			/** 通信车占用 */
-        State03: '03', 			/** 非通信车占用 */
-        State04: '04', 			/** 进路锁闭 */
-        State05: '05', 			/** 故障锁闭 */
-        State06: '06', 			/** 封锁 */
-        State07: '07', 			/** ATC切除 */
-        State08: '08', 			/** ATS切除 */
-        State09: '09', 			/** 进路延续保护 */
-        State10: '10', 			/** 延时释放 */
-        State11: '11',			/** 保护区段锁闭 */
-        State12: '12', 			/** 保护区段延时解锁 */
-        State13: '13', 			/** ARB出清检测错误状态 */
-        State14: '14' 			/** 计轴失效 */
-    },
-    /** 限速*/
-    speedUpperLimit: {
-        Default: -1				/** 不限速*/
-    },
-    /** 是否切除*/
-    cutOff: {
-        Default: false			/** 是否切除*/
-    },
-    /** 是否故障*/
-    fault: {
-        Default: false			/** 非故障*/
-    }
-};
-
-deviceState[deviceType.Switch] = {
-    /** 定位状态*/
-    locateType: {
-        Default: '01',			/** 道岔位置类型 - 定位（缺省值）*/
-        State01: '01',			/** 道岔位置类型 - 定位 */
-        State02: '02',			/** 道岔位置类型 - 反位 */
-        State03: '03',			/** 道岔位置类型 - 失去表示 */
-        State04: '04'			/** 道岔位置类型 - 挤岔 */
-    },
-    /** 道岔状态*/
-    status: {
-        Default: '01', 			/** 道岔状态类型 - 空闲（缺省值）*/
-        State01: '01', 			/** 道岔状态类型 - 空闲 */
-        State02: '02', 			/** 道岔状态类型 - 通信车占用 */
-        State03: '03', 			/** 道岔状态类型 - 非通信车占用 */
-        State04: '04', 			/** 道岔状态类型 - 进路锁闭 */
-        State05: '05', 			/** 道岔状态类型 - 故障锁闭 */
-        State06: '06', 			/** 道岔状态类型 - 进路延续保护 */
-        State07: '07', 			/** 道岔状态类型 - 进路延续保护解锁 */
-        State08: '08', 			/** 道岔状态类型 - ATC切除 */
-        State09: '09', 			/** 道岔状态类型 - ATS切除 */
-        State10: '10', 			/** 道岔状态类型 - 人工单锁 */
-        State11: '11', 			/** 道岔状态类型 - 逻辑锁 */
-        State12: '12', 			/** 道岔状态类型 - 人工锁+逻辑锁 */
-        State13: '13',			/** 道岔状态类型 - 延时释放*/
-        State14: '14'			/** 道岔状态类型 - 封锁*/
-    },
-    /** 是否故障*/
-    fault: {
-        Default: false			/** 非故障*/
-    },
-    /** 是否切除*/
-    cutOff: {
-        Default: false			/** 是否切除*/
-    }
-};
-
-deviceState[deviceType.Signal] = {
-    /** 进路性质类型 */
-    natureType: {
-        Default: '00', 			/** 无状态（缺省值）*/
-        State01: '01', 			/** 列车进路 */
-        State02: '02', 			/** 调车进路 */
-        State03: '03' 			/** 折返进路 */
-    },
-    /** 信号机状态类型 */
-    status: {
-        Default: '01', 			/** 关闭（缺省值）*/
-        State01: '01', 			/** 关闭 */
-        State02: '02', 			/** 开放正向 */
-        State03: '03', 			/** 开放侧向 */
-        State04: '04', 			/** 引导 */
-        State05: '05', 			/** 封锁 */
-        State06: '06', /** 故障 */
-        State07: '07', /** 功能封锁 */
-        State08: '08' /** 信号保护区段监视 */
-    },
-    /** 信号机状态类型 */
-    lightType: {
-        Default: '01', 			/** 物理点灯（缺省值）*/
-        State01: '01', 			/** 物理点灯 */
-        State02: '02' 			/** 逻辑点灯 */
-    },
-    /** 信号机延时状态类型 */
-    delayType: {
-        Default: '01',			/** 未延时解锁（缺省值）*/
-        State01: '01',			/** 未延时解锁 */
-        State02: '02',			/** 人工闭塞延时解锁 */
-        State03: '03'			/** 自动闭塞延时解锁 */
-    },
-    /** 信号机自动信号状态类型 */
-    autoType: {
-        Default: '01', 			/** 隐藏（缺省值）*/
-        State01: '01', 			/** 隐藏 */
-        State02: '02', 			/** 设置自动信号模式状态类型 */
-        State03: '03',			/** 设置自动进路模式状态类型 */
-        State04: '04'			/** 信号机进路自动触发模式状态类型 */
-    },
-    /** 信号机自动通过信号状态类型 */
-    autoRouteType: {
-        Default: '01', 			/** 不自动通过（缺省值）*/
-        State01: '01', 			/** 不自动通过 */
-        State02: '02' 			/** 自动通过 */
-    },
-    /** 信号机按钮状态类型 */
-    buttonState: {
-        Default: '01', 			/** 空闲（缺省值）*/
-        State01: '01', 			/** 空闲 */
-        State02: '02', 			/** 选择基本进路始端 */
-        State03: '03', 			/** 选择折返进路始端 */
-        State04: '04', 			/** 基本进路终端待选 */
-        State05: '05' 			/** 折返进路终端待选 */
-    },
-    /** 引导信号按钮状态类型 */
-    guideStatus: {
-        Default: '01', 			/** 空闲（缺省值）*/
-        State01: '01', 			/** 空闲 */
-        State02: '02' 			/** 引导 */
-
-    },
-    /** 道岔定位状态*/
-    switchLocateType: {
-        Default: '01', 			/** 定位（缺省值）*/
-        State01: '01',			/** 定位*/
-        State02: '02'			/** 反位*/
-    },
-    /** 信号机进路办理*/
-    routeSetting: {
-        Default: false			/** 信号机进路办理*/
-    },
-    /** 是否故障*/
-    fault: {
-        Default: false			/** 非故障*/
-    }
-};
-
-deviceState[deviceType.Station] = {
-    /** 是否故障*/
-    fault: {
-        Default: false			/** 非故障*/
-    }
-};
-
-deviceState[deviceType.StationControl] = {
-    /** 控制模式状态 */
-    status: {
-        Default: '01', 			/** 中控（缺省值）*/
-        State01: '01', 			/** 中控 */
-        State02: '02', 			/** 站控  */
-        State03: '03' 			/** 紧急站控  */
-    },
-    /** 是否故障*/
-    fault: {
-        Default: false			/** 非故障*/
-    }
-};
-
-deviceState[deviceType.StationDelayUnlock] = {
-    /** 延迟解锁状态*/
-    status: {
-        Default: '01', 			/** 关闭（默认值）*/
-        State01: '01', 		/** 关闭 */
-        State02: '02' 			/** 显示 */
-
-    },
-    /** 是否故障*/
-    fault: {
-        Default: false			/** 非故障*/
-    }
-};
-
-deviceState[deviceType.StationStand] = {
-    /** 车站状态*/
-    status: {
-        Default: '01', 			/** 空闲（缺省值）*/
-        State01: '01', 			/** 空闲 */
-        State02: '02', 			/** 列车停站 */
-        State05: '03' 			/** 站台紧急关闭 */
-    },
-    /** 屏蔽门状态*/
-    screenDoorStatus: {
-        Default: '01',			/** 关门（缺省值）*/
-        State01: '01', 			/** 正常 */
-        State02: '02', 			/** 故障 */
-        State03: '03'			/** 切除 */
-    },
-    /** 屏蔽门开门状态*/
-    screenDoorOpenStatus: {
-        Default: '01', 			/** 关门（缺省值）*/
-        State01: '01', 			/** 关门 */
-        State02: '02' 			/** 开门 */
-    },
-    /** 扣车状态*/
-    holdStatus: {
-        Default: '01',			/** 未设置扣车（缺省值）*/
-        State01: '01',			/** 未设置扣车*/
-        State02: '02',			/** 车站扣车*/
-        State03: '03',			/** 中心扣车*/
-        State04: '04'			/** 中心+车站扣车*/
-    },
-    /** 跳停*/
-    jumpStopStatus: {
-        Default: '01',			/** 未设置跳停（缺省值）*/
-        State01: '01',			/** 未设置跳停 */
-        State02: '02',			/** 指定列车跳停 */
-        State03: '03'			/** 全部跳停 */
-    },
-    /** 停站时间*/
-    parkingTime: {
-        Default: -1				/** 无停站时间*/
-    },
-    /** 运行等级*/
-    intervalRunTime: {
-        Default: -1				/** 无运行等级*/
-    },
-    /** 折返策略*/
-    reentryStrategy: {
-        Default: '01',			/** 默认（缺省值）*/
-        State01: '01',			/** 无折返策略 */
-        State02: '02',			/** 无人折返 */
-        State03: '03',			/** 自动换端 */
-        State04: '04'			/** 默认 */
-    },
-    /** 是否故障*/
-    fault: {
-        Default: false			/** 非故障*/
-    }
-};
-
-deviceState[deviceType.Train] = {
-    /** 列车类型*/
-    type: {
-        Default: '01',			/** 计划车-指运行图编制出的有车组号、表号、车次号的列车（缺省值）*/
-        State01: '01',			/** 计划车-指运行图编制出的有车组号、表号、车次号的列车*/
-        State02: '02',			/** 头码车-指赋予了车组号和运行目的地的非计划列车*/
-        State03: '03'			/** 人工车-指由调度员手工添加的并人工组织运行的只赋予车组号的非计划列车*/
-    },
-    /** 服务号状态类型*/
-    serverNoType: {
-        Default: '01', 			/** 显示服务号，白色（缺省值）*/
-        State01: '01', 			/** 显示服务号，白色 */
-        State02: '02', 			/** 显示车组号（计划车、头码车），黄色 */
-        State03: '03' 			/** 显示车组号（人工车），粉色 */
-    },
-    /** 目的地状态类型*/
-    destinationStatus: {
-        Default: '01',			/** 准点（缺省值）*/
-        State01: '01',			/** 准点*/
-        State02: '02',			/** 早点*/
-        State03: '03',			/** 严重早点*/
-        State04: '04',			/** 晚点*/
-        State05: '05',			/** 严重晚点*/
-        State06: '06',			/** 头码车*/
-        State07: '07'			/** ATP切除*/
-    },
-    /** 运行方向状态类型*/
-    directionType: {
-        Default: '01', 			/** 未知方向（缺省值）*/
-        State01: '01', 			/** 未知方向 */
-        State02: '02', 			/** 从左向右 */
-        State03: '03' 			/** 从右向左 */
-    },
-    /** 运行状态*/
-    runStatus: {
-        Default: '01', 			/** 停止（缺省值）*/
-        State01: '01', 			/** 停止 */
-        State02: '02' 			/** 运行 */
-    },
-    /** 运行模式*/
-    runMode: {
-        Default: '01', 			/** 未知模式（缺省值）*/
-        State01: '01', 			/** 未知模式 */
-        State02: '02', 			/** ATO自动驾驶模式 AM */
-        State03: '03', 			/** ATP监控下的人工驾驶模式 CM */
-        State04: '04', 			/** 限制人工驾驶模式 RM */
-        State05: '05' 			/** 非限制人工驾驶模式 RM */
-    },
-    /** 运行控制状态类型*/
-    runControlStatus: {
-        Default: '01', 			/** 正常（缺省值）*/
-        State01: '01', 			/** 正常 */
-        State02: '02', 			/** 扣车 */
-        State03: '03' 			/** 跳停 */
-    },
-    /**	车门状态 */
-    doorStatus: {
-        Default: '01', 			/** 关门（缺省值）*/
-        State01: '01', 			/** 关门 */
-        State02: '02', 			/** 开门 */
-        State03: '03' 			/** 故障 */
-    },
-    /**  通信状态类型*/
-    communicationStatus: {
-        Default: '01', 			/** 正常（缺省值）*/
-        State01: '01', 			/** 正常 */
-        State02: '02' 			/** 故障 */
-    },
-    /** 计划冲突状态*/
-    planConflictStatus: {
-        Default: '01', 			/** 无冲突（缺省值）*/
-        State01: '01', 			/** 无冲突 */
-        State02: '02' 			/** 有冲突 */
-    },
-    /** 报警状态*/
-    alarmStatus: {
-        Default: '01', 			/** 无报警（缺省值）*/
-        State01: '01', 			/** 无报警 */
-        State02: '02' 			/** 有报警 */
-    },
-    /** 是否故障*/
-    fault: {
-        Default: false			/** 非故障*/
-    }
-};
-
-export default deviceState;
diff --git a/src/jmap/constant/deviceType.js b/src/jmap/constant/deviceType.js
deleted file mode 100644
index 9ecbe5129..000000000
--- a/src/jmap/constant/deviceType.js
+++ /dev/null
@@ -1,23 +0,0 @@
-const deviceType = {
-    Link: 'Link',
-    Section: 'Section',
-    Switch: 'Switch',
-    Signal: 'Signal',
-    ZcControl: 'ZcControl',
-    LcControl: 'LcControl',
-    LimitControl: 'LimitControl',
-    ImageControl: 'ImageControl',
-    Station: 'Station',
-    StationStand: 'StationStand',
-    StationControl: 'StationControl',
-    StationCounter: 'StationCounter',
-    ButtonControl: 'ButtonControl',
-    StationDelayUnlock: 'StationDelayUnlock',
-    Train: 'Train',
-    TrainWindow: 'TrainWindow',
-    Line: 'Line',
-    Text: 'Text',
-    CheckBox: 'CheckBox'
-};
-
-export default deviceType;
diff --git a/src/jmap/keyboardController.js b/src/jmap/keyboardController.js
deleted file mode 100644
index 9c40ef810..000000000
--- a/src/jmap/keyboardController.js
+++ /dev/null
@@ -1,82 +0,0 @@
-import Eventful from 'zrender/src/mixin/Eventful';
-
-class KeyboardController extends Eventful {
-    constructor(jmap) {
-        super();
-        this.$jmap = jmap;
-        this.$zr = jmap.getZr();
-        this.events = jmap.getEvents();
-        this.initData();
-        this.initHandler(this.$zr);
-    }
-
-    initHandler(zr) {
-        if (zr) {
-            var keydownHandle = this.keydown.bind(this);
-			var keyupHandle = this.keyup.bind(this);
-			var dom =  this.$zr.dom;
-
-            this.enable = function (opts) {
-                opts = opts || {};
-                this._keyOnDownUp = opts.keyOnDownUp || true;
-
-               	dom.addEventListener('keydown', keydownHandle, false);
-				dom.addEventListener('keyup', keyupHandle, false);
-				dom.focus();
-            };
-
-            this.disable = function () {
-				dom.removeEventListener('keydown', keydownHandle, false);
-				dom.removeEventListener('keyup', keyupHandle, false);
-            };
-
-            this.dispose = function() {
-                this.disable();
-            };
-        }
-    }
-
-    initData() {
-        this._keyboards = [
-            { key: 'Control', keyCode: 17, active: false },
-            { key: 'Shift', keyCode: 16, active: false },
-            { key: 'Alt', keyCode: 18, active: false }
-        ];
-    }
-
-    keydown(e) {
-        if (this._keyOnDownUp && !e.repeat) {
-            var index = this._keyboards.findIndex(
-                elem=> { return elem.keyCode == e.keyCode; }
-            );
-
-            if (index >= 0) {
-                this._keyboards[index].active = true;
-            } else {
-                var str = '';
-                this._keyboards.forEach(elem => {
-                    if (elem.active) {
-                        str += elem.key;
-                        str += '_';
-                    }
-                });
-
-                str += e.key.toUpperCase();
-                this.trigger(this.events.Keyboard, str);
-                this._keyboards.forEach(elem => { elem.active = false; });
-            }
-        }
-    }
-
-    keyup(e) {
-        if (this._keyOnDownUp && !e.repeat) {
-            this._keyboards.forEach(elem=> {
-                if (elem.keyCode == e.keyCode) {
-                    elem.active = false;
-                }
-            });
-        }
-    }
-}
-
-export default KeyboardController;
diff --git a/src/jmap/map.js b/src/jmap/map.js
deleted file mode 100644
index 0f52b3dde..000000000
--- a/src/jmap/map.js
+++ /dev/null
@@ -1,400 +0,0 @@
-import * as zrUtil from 'zrender/src/core/util';
-import zrender from 'zrender';
-import localStore from 'storejs';
-import Painter from './painter';
-import Options from './options';
-import MouseController from './mouseController';
-import KeyboardController from './keyboardController';
-import deviceState from './constant/deviceState';
-import deviceType from './constant/deviceType';
-import { selectLineCode } from './config/deviceStyle';
-import { deviceFactory, createBoundingRect, calculateDCenter } from './utils/parser';
-import { deepAssign } from '@/utils/index';
-
-const renderer = 'canvas';
-const devicePixelRatio = 1;
-
-class Jlmap {
-    constructor(opts) {
-        // 回调事件
-        this.methods = opts.methods;
-
-        // 鼠标事件
-        this.events = { __Pan: 'pan', __Zoom: 'zoom', Selected: 'selected', Contextmenu: 'contextmenu', DataZoom: 'dataZoom', Keyboard: 'keyboard'};
-
-        // 线路参数
-        this.lineCode = '';
-
-        // 皮肤风格
-        this.style = {};
-
-        // 设备数据
-        this.mapDevice = {};
-
-        // 默认状态
-        this.defaultStateDict = this.loadDefaultState();
-
-        this.initMapInstance(opts);
-    }
-
-    // 初始化属性有鼠标事件 缩放等
-    initMapInstance(opts) {
-        const width = opts.dom.clientWidth;
-        const height = opts.dom.clientHeight;
-        this.zoomOnMouseWheel = opts.options.zoomOnMouseWheel;
-
-        this.$zr = zrender.init(opts.dom, deepAssign({ renderer, devicePixelRatio, width, height }, opts.config));
-		this.$zr.dom.setAttribute('tabIndex', -1);
-        this.$options = new Options(deepAssign({ scaleRate: 1, offsetX: 0, offsetY: 0 }, opts.options || {}), (dataZoom) => { this.$mouseController.trigger(this.events.DataZoom, dataZoom); }); // 缩放
-        this.$painter = new Painter(this);
-        this.$painter.updateZrSize({width: this.$zr.getWidth(), height: this.$zr.getHeight()});
-        this.$painter.updateTransform(this.$options);
-
-        this.optionsHandler = this.setOptions.bind(this);
-
-        this.$mouseController = new MouseController(this);
-        this.$mouseController.enable();
-
-        this.$mouseController.on(this.events.__Pan, this.optionsHandler);
-        this.$mouseController.on(this.events.__Zoom, this.optionsHandler);
-
-        this.$keyboardController = new KeyboardController(this);
-        this.$keyboardController.enable();
-    }
-
-    loadStyle(lineCode) {
-        return selectLineCode(lineCode);
-    }
-
-    loadDefaultState() {
-        const defaultStateDict = {};
-
-        zrUtil.each(Object.keys(deviceState), (type) => {
-            defaultStateDict[type] = {};
-            zrUtil.each(Object.keys(deviceState[type] || {}), (state) => {
-                defaultStateDict[type][state] = deviceState[type][state].Default;
-            }, this);
-        }, this);
-
-        return defaultStateDict;
-    }
-
-    setMap(map, mapDevice) {
-        // 保存皮肤类型
-        if (map.skinVO) {
-            this.lineCode = map.skinVO.code;
-            this.$options.scaleRate = map.skinVO.scaling || 1;
-            this.$options.offsetX = map.skinVO.origin ? map.skinVO.origin.x : 0;
-            this.$options.offsetY = map.skinVO.origin ? map.skinVO.origin.y : 0;
-        }
-
-        // 更新视图大小
-        this.$painter.updateTransform({ scaleRate: this.$options.scaleRate, offsetX: this.$options.offsetX, offsetY: this.$options.offsetY });
-
-        // 解析后的数据
-        this.mapDevice = mapDevice;
-
-        // 加载对应皮肤
-        this.style = this.loadStyle(this.lineCode);
-
-        // 数据加载完成 回调
-        if (this.methods.dataLoaded instanceof Function) { this.methods.dataLoaded(this.mapDevice); }
-
-        // 初次渲染视图
-        this.$painter.repaint(this.mapDevice);
-
-        // 视图加载完成 回调
-        if (this.methods.viewLoaded instanceof Function) { this.methods.viewLoaded(this.mapDevice); }
-    }
-
-    setMapDevice(mapDevice) {
-        this.mapDevice = mapDevice;
-    }
-
-    setDefaultState() {
-        const list = [];
-
-        Object.values(this.mapDevice).forEach(elem => {
-            const code = elem.code;
-            const type = elem._type;
-            // 列车不需要设置默认状态
-            type != deviceType.Train && list.push(Object.assign({ code, _type: type }, this.defaultStateDict[type]));
-        });
-
-        this.update(list);
-
-        if (this.methods.stateLoaded instanceof Function) { this.methods.stateLoaded(list); }
-    }
-
-    setOptions(opts) {
-        const options = this.pullBack(opts);
-        this.$options.update(options);
-        this.$painter.updateTransform(this.$options);
-
-        if (this.$options.disabled == true) {
-            this.$mouseController.disable();
-        } else {
-            opts['zoomOnMouseWheel'] = this.zoomOnMouseWheel;
-            this.$mouseController.enable(opts);
-        }
-
-        if (this.methods.optionsUpdate instanceof Function) { this.methods.optionsUpdate(this.$options); }
-    }
-
-    setCenter(deviceCode) {
-        const device = this.mapDevice[deviceCode];
-        if (device && device.instance) {
-            var rect = createBoundingRect(device.instance);
-            var dcenter = calculateDCenter(rect, { width: this.$zr.getWidth(), height: this.$zr.getHeight() });
-            this.setOptions(dcenter);
-        }
-    }
-
-    setLayerVisible(layer) {
-        this.$painter.setLayerVisible(layer);
-    }
-
-    setLevelVisible(list) {
-        this.$painter.setLevelVisible(list);
-    }
-
-    render(list) {
-        (list || []).forEach(elem => {
-            const code = elem.code;
-            const type = elem._type;
-            const oDevice = this.mapDevice[code] || deviceFactory(type, elem);
-            const nDevice = deepAssign(oDevice || {}, elem);
-            this.$painter.delete(oDevice);
-            delete this.mapDevice[code];
-            if (!elem._dispose) {
-                this.mapDevice[code] = nDevice;
-                this.$painter.add(nDevice);
-            }
-        });
-
-        if (this.methods.viewUpdate instanceof Function) { this.methods.viewUpdate(list); }
-    }
-
-    // 中间处理
-    hookHandle(oDevice, elem) {
-        const code = elem.code;
-        const type = elem._type;
-        // 如果是延时计时，需要保存计数值到全局
-        if (type === deviceType.StationCounter) {
-            let val = '' + elem.val;
-            if (val === '0' || !elem.val) {
-                val = elem.val = localStore.get(code) || '0';
-            }
-
-            localStore(code, val);
-        }
-
-        for (var prop in elem) {
-            if (oDevice[prop] != elem[prop]) {
-                deepAssign(oDevice, elem);
-                return true;
-            }
-        }
-
-        return false;
-    }
-
-    // 后处理
-    postHandle(list) {
-        list.forEach(elem => {
-            const code = elem.code;
-            const type = elem._type;
-            if (type == deviceType.Switch) {
-                const item = this.mapDevice[code];
-                if (item) {
-                    const sectionA = this.mapDevice[item.sectionACode];
-                    const sectionB = this.mapDevice[item.sectionBCode];
-                    const sectionC = this.mapDevice[item.sectionCCode];
-                    if (sectionA && sectionB && sectionC) {
-                        item['cutOff'] = sectionA.cutOff;
-                        item['sectionAstatus'] = sectionA.status;
-                        item['sectionBstatus'] = sectionB.status;
-                        item['sectionCstatus'] = sectionC.status;
-                    }
-                }
-
-                this.$painter.update(item);
-            }
-
-            if (type == deviceType.Section) {
-                const item = this.mapDevice[code];
-                if (item) {
-                    const swch = this.mapDevice[item.relSwitchCode];
-                    if (swch) {
-                        const sectionA = this.mapDevice[swch.sectionACode];
-                        const sectionB = this.mapDevice[swch.sectionBCode];
-                        const sectionC = this.mapDevice[swch.sectionCCode];
-                        if (sectionA && sectionB && sectionC) {
-                            swch['cutOff'] = sectionA.cutOff;
-                            swch['sectionAstatus'] = sectionA.status;
-                            swch['sectionBstatus'] = sectionB.status;
-                            swch['sectionCstatus'] = sectionC.status;
-                        }
-
-                        this.$painter.update(swch);
-                    }
-                }
-            }
-        });
-    }
-
-    update(list) {
-        (list || []).forEach(elem => {
-            const code = elem.code;
-            const type = elem._type;
-            const oDevice = this.mapDevice[code] || deviceFactory(type, elem);
-            if (elem.dispose) {
-                this.$painter.delete(oDevice);
-            } else {
-                if (this.hookHandle(oDevice, elem)) {
-                    this.$painter.update(oDevice);
-                }
-            }
-        });
-
-        // 状态后处理
-        this.postHandle(list || []);
-
-        if (this.methods.stateUpdate instanceof Function) { this.methods.stateUpdate(list); }
-    }
-
-    pullBack(payload) {
-        if (payload.type === 'zoom') {
-            const zrWidth = this.$zr.getWidth();
-            const zrHeight = this.$zr.getHeight();
-            const originX = payload.originX || zrWidth / 2;
-            const originY = payload.originY || zrHeight / 2;
-            const x = (this.$options.offsetX + originX) / this.$options.scaleRate;
-            const y = (this.$options.offsetY + originY) / this.$options.scaleRate;
-            const newScaleRate = this.$options.getScaleRate(payload.scale);
-            const dx = originX - (x * newScaleRate - this.$options.offsetX);
-            const dy = originY - (y * newScaleRate - this.$options.offsetY);
-            payload.dx = dx;
-            payload.dy = dy;
-        }
-
-        return payload || {};
-    }
-
-    getZr() {
-        return this.$zr;
-    }
-
-    getEvents() {
-        return this.events;
-    }
-
-    getDeviceByCode(code) {
-        return this.mapDevice[code];
-    }
-
-    getShapeTipPoint(opts) {
-        const device = this.mapDevice[opts.code];
-        if (device) {
-            return this.$painter.getShapeTipPoint(device.instance, opts);
-        }
-    }
-
-    resize(opt) {
-        this.$zr.resize(opt);
-        this.$painter.updateZrSize(opt);
-    }
-
-    refresh() {
-        this.$painter.refresh();
-    }
-
-    clearTrainView() {
-        this.$painter.clearLevel(deviceType.Train);
-        zrUtil.each(Object.values(this.mapDevice), device => {
-            if (device._type == deviceType.Train) {
-                device.instance = null;
-            }
-        });
-    }
-
-    clear() {
-        this.lineCode = '';
-        this.style = {};
-        this.mapDevice = {};
-        this.$painter.clear();
-    }
-
-    dispose() {
-        this.off(this.events.Pan, this.optionsHandler);
-        this.off(this.events.Zoom, this.optionsHandler);
-
-        this.clear();
-
-        this.$mouseController.dispose();
-        this.$keyboardController.dispose();
-        this.$zr && zrender.dispose(this.$zr);
-        this.$painter.dispose();
-    }
-
-    on(eventname, cb, context) {
-        const idx = Object.values(this.events).indexOf(eventname);
-        if (idx >= 0) {
-            switch (eventname) {
-            case this.events.Selected:
-                this.$mouseController.on(this.events.Selected, cb, context);
-                break;
-            case this.events.Contextmenu:
-                this.$mouseController.on(this.events.Contextmenu, cb, context);
-                break;
-            case this.events.DataZoom:
-                this.$mouseController.on(this.events.DataZoom, cb, context);
-                break;
-            case this.events.Keyboard:
-                this.$keyboardController.on(this.events.Keyboard, cb, context);
-            }
-        }
-    }
-
-    off(eventname, cb) {
-        const idx = Object.values(this.events).indexOf(eventname);
-        if (idx >= 0) {
-            switch (eventname) {
-            case this.events.Selected:
-                this.$mouseController.off(this.events.Selected, cb);
-                break;
-            case this.events.Contextmenu:
-                this.$mouseController.off(this.events.Contextmenu, cb);
-                break;
-            case this.events.DataZoom:
-                this.$mouseController.off(this.events.DataZoom, cb);
-                break;
-            case this.events.Keyboard:
-                this.$keyboardController.off(this.events.keyboard, cb);
-                break;
-            }
-        }
-    }
-
-    renderCheckBox(model) {
-        const type = model._type;
-        const code = model.code;
-        const oDevice = this.mapDevice[code] || deviceFactory(type, model);
-        const nDevice = deviceFactory(type, Object.assign(oDevice.model || {}, model));
-        delete this.mapDevice[code];
-        this.$painter.delete(oDevice);
-        if (!model._dispose) {
-            this.mapDevice[code] = nDevice;
-            this.$painter.add(nDevice);
-        }
-    }
-    deleteCheckBox(code) {
-        const oDevice = this.mapDevice[code];
-        if (oDevice) {
-            delete this.mapDevice[code];
-            this.$painter.delete(oDevice);
-        }
-    }
-}
-
-export default Jlmap;
diff --git a/src/jmap/mouseController.js b/src/jmap/mouseController.js
deleted file mode 100644
index a3262fbd7..000000000
--- a/src/jmap/mouseController.js
+++ /dev/null
@@ -1,306 +0,0 @@
-import deviceType from './constant/deviceType';
-import Eventful from 'zrender/src/mixin/Eventful';
-import * as eventTool from 'zrender/src/core/event';
-import store from '@/store/index_APP_TARGET';
-
-class EventModel {
-    constructor(e) {
-        this.clientX = e.event.clientX;
-        this.clientY = e.event.clientY;
-
-        let view = e.target;
-        while (view) {
-            if (Object.values(deviceType).includes(view._type)) {
-                this.deviceCode = view._code;
-                this.deviceType = view._type;
-                this.eventTarget = view;
-                break;
-            }
-
-            if (view._subType) {
-                this.subType = view._subType;
-            }
-            if (view._val) {
-                this.val = view._val;
-            }
-
-            view = view.parent;
-        }
-    }
-}
-
-class MouseController extends Eventful {
-    constructor(jmap) {
-        super();
-        this.$jmap = jmap;
-        this.deviceList = [];
-        this.rightClickPoint = {
-            x: 0,
-            y: 0
-        }; // 右键点击坐标
-        this.$zr = jmap.getZr();
-        this.events = jmap.getEvents();
-        this.initHandler(this.$zr);
-    }
-
-    initHandler(zr) {
-        if (zr) {
-            zr.on('click', this.click, this);
-            zr.on('contextmenu', this.contextmenu, this);
-            zr.on('mousemove', this.moveEvent, this);
-
-            this.enable = function (opts) {
-                opts = opts || {};
-                this._moveOnMouseMove = opts.moveOnMouseMove || true;
-                this._zoomOnMouseWheel = opts.zoomOnMouseWheel || false;
-                this._preventDefaultMouseMove = opts.preventDefaultMouseMove || true;
-
-                this.disable();
-
-                zr.on('mousedown', this.mousedown, this);
-                zr.on('mousemove', this.mousemove, this);
-                zr.on('mouseup', this.mouseup, this);
-                zr.on('mousewheel', this.mousewheel, this);
-            };
-
-            this.disable = function () {
-                zr.off('mousedown', this.mousedown);
-                zr.off('mousemove', this.mousemove);
-                zr.off('mouseup', this.mouseup);
-                zr.off('mousewheel', this.mousewheel);
-            };
-
-            this.dispose = function () {
-                zr.off('click', this.click);
-                zr.off('contextmenu', this.contextmenu);
-                zr.off('mousemove', this.moveEvent);
-                this.disable();
-            };
-
-            this.isDragging = function () { return this._dragging; };
-        }
-    }
-
-    mousedown(e) {
-        // if (eventTool.notLeftMouse(e)) {
-        //     return;
-		// }
-
-		this.$zr.dom.focus();
-        if (e.which == 1 || e.which == 3) {
-            var x = e.offsetX;
-            var y = e.offsetY;
-
-            this._x = x;
-            this._y = y;
-            this._dragging = true;
-            if (e.which == 3 && this._zoomOnMouseWheel) {
-                this.handleMouseDownRight(e);
-            } else if (e.which == 1 && this._zoomOnMouseWheel) {
-                this.handleMouseDownLeft(e);
-            }
-        }
-    }
-
-    mousemove(e) {
-        // if (eventTool.notLeftMouse(e) ||
-        // 	!this._moveOnMouseMove ||
-        // 	!this._dragging
-        // ) {
-        //     return;
-        // }
-
-        const oldX = this._x;
-        const oldY = this._y;
-
-        const dx = e.offsetX - oldX;
-        const dy = e.offsetY - oldY;
-
-        this._x = e.offsetX;
-        this._y = e.offsetY;
-
-        if (e.which == 1) {
-            this._preventDefaultMouseMove && eventTool.stop(e.event);
-
-            this.trigger(this.events.__Pan, { dx, dy, oldX, oldY, newX: this._x, newY: this._y });
-        } else if (e.which === 3 && this._zoomOnMouseWheel) {
-            this.handleMouseMoveRight({x: e.offsetX, y: e.offsetY});
-        }
-    }
-
-    mouseup(e) {
-        if (!eventTool.notLeftMouse(e)) {
-            this._dragging = false;
-        }
-        if (this._zoomOnMouseWheel && this.$jmap.mapDevice['check_box']) {
-            this.eventTarget = this.$jmap.mapDevice['check_box'].instance;
-            this.handleBoundingRect(this.eventTarget);
-            var em = this.checkEvent(e);
-            this.trigger(this.events.Selected, em);
-        }
-    }
-
-    mousewheel(e) {
-        const shouldZoom = this._zoomOnMouseWheel;
-        const wheelDelta = e.wheelDelta;
-        const originX = e.offsetX;
-        const originY = e.offsetY;
-
-        if (wheelDelta === 0 || !shouldZoom) {
-            return;
-        }
-
-        if (shouldZoom) {
-            eventTool.stop(e.event);
-            let scale = 1;
-            if (wheelDelta > 0) {
-                scale = 1;
-            } else if (wheelDelta < 0) {
-                scale = -1;
-            }
-
-            this.trigger(this.events.__Zoom, {type: this.events.__Zoom, scale, originX, originY });
-        }
-    }
-
-    click(e) {
-        var em = this.checkEvent(e);
-        this.trigger(this.events.Selected, em);
-    }
-
-    contextmenu(e) {
-        var em = this.checkEvent(e);
-        this.trigger(this.events.Contextmenu, em);
-    }
-
-    moveEvent(e) {
-        const newEm = new EventModel(e);
-        const trainDetails = store.state.map.trainDetails;
-        if (trainDetails) {
-            if (newEm.deviceType != deviceType.Train || trainDetails.code != newEm.deviceCode) {
-                var instance = (this.$jmap.getDeviceByCode(trainDetails.code) || {} ).instance;
-                instance && instance.removeTrainDetail && instance.removeTrainDetail();
-            }
-        }
-    }
-
-    checkEvent(e) {
-        var oldEm = new EventModel(this.$zr.curEvent || { event: {} });
-        var newEm = new EventModel(e);
-        if ([1, 3].includes(e.which)) {
-            // 查找之前和当前鼠标选中的实例
-            var oldDevice = this.$jmap.getDeviceByCode(oldEm.deviceCode) || {};
-            var newDevice = this.$jmap.getDeviceByCode(newEm.deviceCode) || {};
-            var oldInstance = (this.$jmap.getDeviceByCode(oldEm.deviceCode) || {}).instance || {};
-            var newInstance = (this.$jmap.getDeviceByCode(newEm.deviceCode) || {}).instance || {};
-
-            // 如果之前和当前选中的实例不一致
-            if (oldInstance != newInstance) {
-                // 如果实例有取消选择函数并且被点击，则执行取消选中函数
-                if (oldInstance.mouseEvent && oldInstance.mouseEvent.mouseout) {
-                    // 视图数据设置点击标志，同步执行
-                    oldDevice['down'] = false;
-                    oldInstance.mouseEvent['mouseout'](e);
-                }
-
-                // 如果实例有选中函数并且被点击，则执行选中函数
-                if (e.which == 3 && newInstance.mouseEvent && newInstance.mouseEvent.mouseover) {
-                    newDevice['down'] = true;
-                    newInstance.mouseEvent['mouseover'](e);
-                }
-            }
-
-            // 保存当前实例到全局
-            this.$zr.curEvent = e;
-        }
-
-        return newEm;
-    }
-
-    // 处理鼠标右键按下事件
-    handleMouseDownRight(e) {
-        this.rightClickPoint.x = e.offsetX;
-        this.rightClickPoint.y = e.offsetY;
-    }
-    // 处理鼠标左键按下事件
-    handleMouseDownLeft(e) {
-        const em = new EventModel(e);
-        this.eventTarget = em.eventTarget;
-        if (this.eventTarget && this.eventTarget._type === deviceType.CheckBox) {
-            this.handleBoundingRect(this.eventTarget);
-        } else {
-            this.$jmap.deleteCheckBox('check_box');
-            this.eventTarget = '';
-            this.deviceList = [];
-        }
-    }
-    // 通过包围盒筛选选中区域的元素
-    handleBoundingRect(eventTarget) {
-        this.deviceList = [];
-        const boundingRect = this.createFakeBoundingRect(eventTarget);
-        const deviceList = Object.values(this.$jmap.mapDevice);
-        const includeDeviceList = [];
-        deviceList.forEach( item =>{
-            if (item.instance && item.instance._type == deviceType.Section) {
-                let deviceBoundingRect = {};
-                if (item.type == '03') {
-                    deviceBoundingRect = {
-                        x1: item.namePosition.x,
-                        y1: item.namePosition.y,
-                        x2: item.namePosition.x,
-                        y2: item.namePosition.y
-                    };
-                } else {
-                    deviceBoundingRect = {
-                        x1: item.points[0].x,
-                        y1: item.points[0].y,
-                        x2: item.points[item.points.length - 1].x,
-                        y2: item.points[item.points.length - 1].y
-                    };
-                }
-                if (this.whetherInclude(boundingRect, deviceBoundingRect )) {
-                    includeDeviceList.push(item);
-                }
-            }
-            if (item.instance && item.instance._type == deviceType.Switch) {
-                const deviceBoundingRect = {
-                    x1: item.intersection.x,
-                    y1: item.intersection.y,
-                    x2: item.intersection.x,
-                    y2: item.intersection.y
-                };
-                if (this.whetherInclude(boundingRect, deviceBoundingRect )) {
-                    includeDeviceList.push(item);
-                }
-            }
-        });
-        this.deviceList = includeDeviceList;
-        store.dispatch('map/setSeclectDeviceList', this.deviceList);
-    }
-    // 生成包围盒对象坐标
-    createFakeBoundingRect(instance) {
-        return {
-            x1: instance.model.point.x,
-            y1: instance.model.point.y,
-            x2: instance.model.point.x + instance.model.width,
-            y2: instance.model.point.y + instance.model.height
-        };
-    }
-
-    // 判断元素包围盒是否在选中区域
-    whetherInclude(boundingRect1, boundingRect2) {
-        return boundingRect1.x1 <= boundingRect2.x1 && boundingRect1.y1 <= boundingRect2.y1 && boundingRect1.x2 >= boundingRect2.x2 && boundingRect1.y2 >= boundingRect2.y2;
-    }
-
-    // 右键拖动区域大小
-    handleMouseMoveRight(point2) {
-        const point1 = this.rightClickPoint;
-        const x = Math.min(point1.x, point2.x) + this.$jmap.$options.offsetX;
-        const y = Math.min(point1.y, point2.y) + this.$jmap.$options.offsetY;
-        const width = Math.abs(point1.x - point2.x);
-        const height = Math.abs(point1.y - point2.y);
-        this.$jmap.renderCheckBox({code: 'check_box', _type: 'CheckBox', point: {x: x, y: y}, width: width, height: height });
-    }
-}
-
-export default MouseController;
diff --git a/src/jmap/options.js b/src/jmap/options.js
deleted file mode 100644
index 8cb57b92f..000000000
--- a/src/jmap/options.js
+++ /dev/null
@@ -1,100 +0,0 @@
-class Options {
-    constructor(opts, trigger) {
-        this.scaleIndex = 0;
-        this.scaleList = [
-            0.8, 0.9,
-            1, 1.2, 1.4, 1.6, 1.8,
-            2, 2.2, 2.4, 2.6, 2.8,
-            3, 3.2, 3.4, 3.6, 3.8,
-            4, 4.2, 4.4, 4.6, 4.8,
-            5, 5.2, 5.4, 5.6, 5.8,
-            6, 6.2, 6.4, 6.6, 6.8,
-            7, 7.2, 7.4, 7.6, 7.8,
-            8
-        ];
-
-        if (Number.isFinite(opts.scaleRate)) {
-            const idx = this.scaleList.indexOf(opts.scaleRate);
-            if (idx >= 0) {
-                this.scaleIndex = idx;
-            }
-        }
-
-        this.scaleRate = opts.scaleRate || this.scaleList[this.scaleIndex]; // 缩放比例
-
-        this.offsetX = opts.offsetX || 0; // x偏移
-
-        this.offsetY = opts.offsetY || 0; // y偏移
-
-        this.throttle = opts.throttle || 100; // 刷新频率
-
-        this.disabled = false;
-
-        this.moveOnMouseMove = true;
-
-        this.zoomOnMouseWheel = false;
-
-        this.preventDefaultMouseMove = true;
-
-        this.trigger = trigger;
-    }
-
-    update(payload) {
-        if (Number.isFinite(payload.dx)) {
-            this.offsetX -= payload.dx;
-        }
-        if (Number.isFinite(payload.dy)) {
-            this.offsetY -= payload.dy;
-        }
-
-        if (Number.isFinite(payload.offsetX)) {
-            this.offsetX = payload.offsetX;
-        }
-        if (Number.isFinite(payload.offsetY)) {
-            this.offsetY = payload.offsetY;
-        }
-
-        if (Number.isFinite(payload.scale)) {
-            if (Number.isFinite(payload.scale)) {
-                if ((this.scaleIndex + payload.scale) >= 0 && (this.scaleIndex + payload.scale) < this.scaleList.length) {
-                    this.scaleIndex = this.scaleIndex + payload.scale;
-                }
-            }
-            this.scaleRate = this.scaleList[this.scaleIndex];
-        }
-
-        if (Number.isFinite(payload.scaleRate)) {
-            const idx = this.scaleList.indexOf(payload.scaleRate);
-            if (idx < 0) {
-                return;
-            }
-            this.scaleIndex = idx;
-            this.scaleRate = payload.scaleRate;
-        }
-
-        if (payload.disabled === true || payload.disabled === false) {
-            this.disabled = payload.disabled;
-        }
-
-        if (payload.moveOnMouseMove === true || payload.moveOnMouseMove === false) {
-            this.moveOnMouseMove = payload.moveOnMouseMove;
-        }
-
-        if (payload.zoomOnMouseWheel === true || payload.zoomOnMouseWheel === false) {
-            this.zoomOnMouseWheel = payload.zoomOnMouseWheel;
-        }
-
-        if (this.trigger instanceof Function) { this.trigger(this); }
-    }
-
-    getScaleRate(scale) {
-        if (Number.isFinite(scale)) {
-            if ((this.scaleIndex + scale) >= 0 && (this.scaleIndex + scale) < this.scaleList.length) {
-                return this.scaleList[this.scaleIndex + scale];
-            }
-        }
-        return this.scaleList[this.scaleIndex];
-    }
-}
-
-export default Options;
diff --git a/src/jmap/painter.js b/src/jmap/painter.js
deleted file mode 100644
index f2a5cdc82..000000000
--- a/src/jmap/painter.js
+++ /dev/null
@@ -1,271 +0,0 @@
-import * as zrUtil from 'zrender/src/core/util';
-import * as vector from 'zrender/src/core/vector';
-import Group from 'zrender/src/container/Group';
-import deviceType from './constant/deviceType';
-import shapefactory from './shape/factory';
-import TransformHandle from './transformHandle';
-
-class Painter {
-    constructor(jmap) {
-        // 父级实例
-        this.$jmap = jmap;
-        this.$zr = jmap.getZr();
-
-        // 图层数据
-        this.mapInstanceLevel = {};
-
-        // 初始图层
-        this.initLevels();
-
-        // 视图控制器
-        this.$transformHandle = new TransformHandle(this);
-    }
-
-    /**
-     * 初始绘图实例
-     * @param {*} dom
-     * @param {*} config
-     */
-    initLevels() {
-        // 图层分级策略
-        this.layerBranch = {};
-        this.layerBranch['01'] = (type) => { return type == deviceType.Link; };	// 逻辑图层级
-        this.layerBranch['02'] = (type) => { return type != deviceType.Link; };	// 物理图层级
-        this.layerBranch['03'] = (type) => { return true; };					// 混合图层级
-
-        // 添加父级图层
-        this.parentLevel = new Group({ name: '__parent__' });
-        this.$zr.add(this.parentLevel);
-
-        // 添加子级图层
-        zrUtil.each(Object.values(deviceType), (type) => {
-            const level = new Group({ name: `__${type}__` });
-            this.mapInstanceLevel[type] = level;
-            this.parentLevel.add(level);
-        });
-
-        // 设置默认显示图级
-        this.setLayerVisible('02');
-    }
-
-    /**
-     * 重绘视图
-     * @param {*} mapDevice
-     */
-    repaint(mapDevice) {
-        // 清空视图
-        this.clear();
-
-        // 创建视图
-        Object.values(mapDevice).forEach(device => {
-            this.add(device);
-        });
-    }
-
-    /**
-     * 添加视图
-     * @param {*} device
-     */
-    add(device) {
-        try {
-            const instance = shapefactory(device, this.$jmap);
-            if (instance) {
-                device.instance = instance;
-                this.$transformHandle.transformView(instance);
-                this.mapInstanceLevel[device._type].add(instance);
-            }
-        } catch (err) {
-            console.error(err);
-        }
-    }
-
-    /**
-     * 删除视图
-     * @param {*} device
-     */
-    delete(device) {
-        const instance = device.instance;
-        if (instance) {
-            this.mapInstanceLevel[device._type].remove(instance);
-        }
-    }
-
-    checkIntersect(device) {
-        var intersect = false;
-        var befor = device.instance;
-        var train = shapefactory(device, this.$jmap);
-
-        this.mapInstanceLevel[deviceType.Train].eachChild(elem => {
-            if (elem !== befor && elem.getBoundingRect().intersect(train.getBoundingRect())) {
-                intersect = true;
-                return;
-            }
-        });
-
-        return intersect;
-    }
-
-    /**
-	 * 更新列车
-	 * @param {*} device
-	 */
-    updateTrain(device) {
-        var oldTrainWindowModel = null;
-        var instance = device.instance;
-        var curModel = device;
-
-        if (instance) {
-            oldTrainWindowModel = device.trainWindowModel;
-        }
-
-        if (curModel.sectionCode) {
-            curModel.sectionModel = this.$jmap.getDeviceByCode(curModel.sectionCode);
-        }
-
-        if (curModel.trainWindowCode) {
-            curModel.trainWindowModel = this.$jmap.getDeviceByCode(curModel.trainWindowCode);
-        }
-
-        if (instance && oldTrainWindowModel && this.checkIntersect(device)) {
-            device.trainWindowModel = oldTrainWindowModel;
-        }
-
-        instance && this.mapInstanceLevel[deviceType.Train].remove(instance);
-        this.add(device);
-    }
-
-    /**
-     * 更新视图
-     * @param {*} device
-     */
-    update(device) {
-        if (device) {
-            try {
-                if (device._dispose) {
-                    this.delete(device);
-                } else if (deviceType.Train == device._type) {
-                    this.updateTrain(device);
-                } else {
-                    const instance = device.instance;
-                    if (instance) {
-                        instance.setState(device);
-                    }
-                }
-            } catch (err) {
-                console.error(err);
-            }
-        }
-    }
-
-    /**
-     * 更新transform变化
-     * @param {*} opt
-     */
-    updateTransform(opt) {
-        this.$transformHandle.updateTransform(opt);
-    }
-
-    /**
-	 * 更新zrender尺寸
-	 * @param {*} opt
-	 */
-    updateZrSize(opt) {
-        this.$transformHandle.updateZrSize(opt);
-    }
-
-    /**
-	 * 过去坐标提示位置
-	 * @param {*} opts
-	 */
-    getShapeTipPoint(instance, opts) {
-        if (instance) {
-            var point = instance.getShapeTipPoint(opts);
-            if (point) {
-                // 矩阵变换
-                var transform = this.$transformHandle.transform;
-                var transPoint = vector.applyTransform([], [point.x, point.y], transform);
-                return {
-                    x: transPoint[0],
-                    y: transPoint[1]
-                };
-            }
-
-        }
-    }
-
-    /**
-	 * 设置逻辑和物理图层
-	 * @param {*} layer
-	 */
-    setLayerVisible(layer) {
-        zrUtil.each(Object.values(deviceType), type => {
-            const level = this.mapInstanceLevel[type];
-            if (this.layerBranch[layer](type)) {
-                level.show();
-            } else {
-                level.hide();
-            }
-        }, this);
-    }
-
-    /**
-	 * 设置图层可见
-	 * @param {*} code
-	 */
-    setLevelVisible(list) {
-        zrUtil.each(Object.values(deviceType), type => {
-            const level = this.mapInstanceLevel[type];
-            if (list.includes(type)) {
-                level.show();
-            } else {
-                level.hide();
-            }
-        }, this);
-    }
-
-    /**
-     * 刷新图层
-     */
-    refresh() {
-        this.$zr.refresh();
-    }
-
-    /**
-	 * 清除图层
-	 */
-    clearLevel(type) {
-        const level = this.mapInstanceLevel[type];
-        if (level) {
-            level.removeAll();
-        }
-    }
-
-    /**
-     * 清除canvas
-     */
-    clear() {
-        zrUtil.each(Object.values(this.mapInstanceLevel), (level) => {
-            level && level.removeAll();
-        }, this);
-
-        this.refresh();
-    }
-
-    /**
-     * 销毁图层
-     */
-    dispose() {
-        this.mapInstanceLevel = {};
-        this.parentLevel = null;
-    }
-
-    /**
-     * 父级图层
-     */
-    getParentLevel() {
-        return this.parentLevel;
-    }
-
-}
-
-export default Painter;
diff --git a/src/jmap/shape/ButtonControl/index.js b/src/jmap/shape/ButtonControl/index.js
deleted file mode 100644
index 29e2887d4..000000000
--- a/src/jmap/shape/ButtonControl/index.js
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
-*	lC区域控制模式
-*/
-import Group from 'zrender/src/container/Group';
-import EControl from '../element/EControl';
-
-export default class ButtonControl extends Group {
-	constructor(model, style) {
-		super();
-		this.z = 20;
-		this._code = model.code;
-		this._type = model._type;
-		this.zlevel = 10;
-		this.model = model;
-		this.style = style;
-		this.create();
-		this.setState(model);
-	}
-
-	create() {
-		const model = this.model;
-		this.control = new EControl({
-			zlevel: this.zlevel,
-			z: this.z,
-			arc: {
-				shape: {
-					cx: model.position.x,
-					cy: model.position.y,
-					r: this.style.ButtonControl.lamp.radiusR
-				},
-				lineWidth: 0,
-				fill: this.style.ButtonControl.lamp.controlColor
-			},
-			text: {
-				position: [0, 0],
-				x: model.position.x,
-				y: model.position.y + this.style.ButtonControl.lamp.radiusR + this.style.ButtonControl.text.distance,
-				fontWeight: this.style.ButtonControl.text.fontWeight,
-				fontSize: this.style.ButtonControl.text.fontSize,
-				fontFamily: this.style.fontFamily,
-				text: model.text || '按图折返',
-				textFill: '#fff',
-				textAlign: 'middle',
-				textVerticalAlign: 'top'
-			},
-			style: this.style
-		});
-
-		this.add(this.control);
-	}
-
-	// 设置状态
-	setState(model) {
-	}
-
-	getShapeTipPoint() {
-		if (this.control) {
-			var distance = 2;
-			var rect = this.control.getBoundingRect();
-			return {
-				x: rect.x + rect.width / 2,
-				y: rect.y - distance
-			};
-		}
-		return null;
-	}
-}
diff --git a/src/jmap/shape/ImageControl/index.js b/src/jmap/shape/ImageControl/index.js
deleted file mode 100644
index c00ba0664..000000000
--- a/src/jmap/shape/ImageControl/index.js
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
-*	图片list
-*/
-import Group from 'zrender/src/container/Group';
-import Image from 'zrender/src/graphic/Image';
-
-export default class ImageControl extends Group {
-    constructor(model, style) {
-        super();
-        this._code = model.code;
-        this._type = model._type;
-        this.zlevel = model.zlevel;
-        this.model = model;
-        this.style = style;
-        this.z = model.zIndex || 1;
-        this.create();
-    }
-
-    create() {
-        const model = this.model;
-        this.image = new Image({
-            zlevel: this.zlevel,
-            z: this.z,
-            origin: {
-                x: model.position.x,
-                y: model.position.y
-            },
-            rotation: -Math.PI / 180 * model.rotate,
-            style: {
-                image: model.url,
-                x: model.position.x,
-                y: model.position.y,
-                width: model.width,
-                height: model.height
-            }
-        });
-        this.add(this.image);
-        // 旋转
-        if (model.rotate) {
-            this.transformRotation(this.image);
-        }
-    }
-
-    setState(model) {
-    }
-
-    // 整体图片
-    transformRotation(item) {
-        if (this.model.rotate) {
-            const origin = [this.model.position.x, this.model.position.y];
-            const rotation = -Math.PI / 180 * Number(this.model.rotate);
-            item.origin = origin;
-            item.rotation = rotation;
-            item.dirty();
-        }
-    }
-
-    getShapeTipPoint() {
-        if (this.image) {
-            var distance = 2;
-            var rect = this.image.getBoundingRect();
-            return {
-                x: rect.x + rect.width / 2,
-                y: rect.y - distance
-            };
-        }
-        return null;
-    }
-}
diff --git a/src/jmap/shape/LcControl/EMouse.js b/src/jmap/shape/LcControl/EMouse.js
deleted file mode 100644
index fdb639e95..000000000
--- a/src/jmap/shape/LcControl/EMouse.js
+++ /dev/null
@@ -1,53 +0,0 @@
-import Group from 'zrender/src/container/Group';
-import Text from 'zrender/src/graphic/Text';
-
-export default class EMouse extends Group {
-	constructor(device) {
-		super();
-		this.device = device;
-		this.create();
-	}
-	create() {
-		this.text = new Text({
-			zlevel: this.device.zlevel,
-			z: this.device.z+1,
-			position: [0, 0],
-			style: {
-				x: this.device.model.position.x,
-				y: this.device.model.position.y + this.device.style.LcControl.lamp.radiusR + this.device.style.LcControl.text.distance-30,
-				fontWeight: 'normal',
-				fontSize: this.device.style.LcControl.mouseOverStyle.fontSize,
-				fontFamily: this.device.style.LcControl.mouseOverStyle.fontFamily,
-				text: this.device.model.name,
-				textFill: this.device.style.LcControl.mouseOverStyle.fontColor,
-				textAlign: this.device.style.LcControl.mouseOverStyle.textAlign,
-				textVerticalAlign: this.device.style.LcControl.mouseOverStyle.textVerticalAlign
-			}
-		});
-		this.add(this.text);
-		this.text.hide();
-	}
-	mouseover(e) {
-		if (e.target && e.target._subType == 'Text') {
-			this.text.show();
-		} else {
-			this.device.control.setControlColor(this.device.style.LcControl.mouseOverStyle.arcColor);
-			this.device.control.setTextColor(this.device.style.LcControl.mouseOverStyle.textColor);
-			this.device.control.setTextBorder(true);
-			this.device.control.setArcBorder(true);
-		}
-	}
-
-	mouseout(e) {
-		if (!this.device.model.down) {
-			if (e.target && e.target._subType == 'Text') {
-				this.text.hide();
-			} else {
-				this.device.control.setControlColor(this.device.style.LcControl.lamp.controlColor);
-				this.device.control.setTextColor('#FFFFFF');
-				this.device.control.setTextBorder(false);
-				this.device.control.setArcBorder(false);
-			}
-		}
-	}
-}
diff --git a/src/jmap/shape/LcControl/index.js b/src/jmap/shape/LcControl/index.js
deleted file mode 100644
index 985bea40d..000000000
--- a/src/jmap/shape/LcControl/index.js
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
-*	lC区域控制模式
-*/
-import Group from 'zrender/src/container/Group';
-import EControl from '../element/EControl';
-import EMouse from './EMouse';
-
-export default class LcControl extends Group {
-	constructor(model, style) {
-		super();
-		this.z = 20;
-		this._code = model.code;
-		this._type = model._type;
-		this.zlevel = model.zlevel;
-		this.model = model;
-		this.style = style;
-		this.create();
-		this.createMouseEvent();
-		this.setState(model);
-	}
-
-	create() {
-		const model = this.model;
-		this.control = new EControl({
-			zlevel: this.zlevel,
-			z: this.z,
-			arc: {
-				shape: {
-					cx: model.position.x,
-					cy: model.position.y,
-					r: this.style.LcControl.lamp.radiusR
-				},
-				lineWidth: 0,
-				fill: this.style.LcControl.lamp.controlColor
-			},
-			text: {
-				position: [0, 0],
-				x: model.position.x,
-				y: model.position.y + this.style.LcControl.lamp.radiusR + this.style.LcControl.text.distance,
-				fontWeight: this.style.LcControl.text.fontWeight,
-				fontSize: this.style.LcControl.text.fontSize,
-				fontFamily: this.style.fontFamily,
-				text: model.name,
-				textFill: '#fff',
-				textAlign: 'middle',
-				textVerticalAlign: 'top'
-			},
-			style: this.style
-		});
-
-		this.add(this.control);
-	}
-
-	// 设置状态
-	setState(model) {
-	}
-
-	createMouseEvent() {
-		if (this.style.LcControl.mouseOverStyle) {
-			this.mouseEvent = new EMouse(this);
-			this.add(this.mouseEvent);
-			this.on('mouseout', (e) => { this.mouseEvent.mouseout(e); });
-			this.on('mouseover', (e) => { this.mouseEvent.mouseover(e); });
-		}
-	}
-
-	getShapeTipPoint() {
-		if (this.control) {
-			var distance = 2;
-			var rect = this.control.getBoundingRect();
-			return {
-				x: rect.x + rect.width / 2,
-				y: rect.y - distance
-			};
-		}
-		return null;
-	}
-}
diff --git a/src/jmap/shape/LimitControl/EMouse.js b/src/jmap/shape/LimitControl/EMouse.js
deleted file mode 100644
index 4abd12d5d..000000000
--- a/src/jmap/shape/LimitControl/EMouse.js
+++ /dev/null
@@ -1,54 +0,0 @@
-import Group from 'zrender/src/container/Group';
-import Text from 'zrender/src/graphic/Text';
-
-export default class EMouse extends Group {
-	constructor(device) {
-		super();
-		this.device = device;
-		this.create();
-	}
-	create() {
-		this.text = new Text({
-			_subType: 'Text',
-			zlevel: this.device.zlevel,
-			z: this.device.z+1,
-			position: [0, 0],
-			style: {
-				x: this.device.model.position.x,
-				y: this.device.model.position.y + this.device.style.LimitControl.lamp.radiusR + this.device.style.LimitControl.text.distance-30,
-				fontWeight: this.device.style.LimitControl.mouseOverStyle.fontWeight,
-				fontSize: this.device.style.LimitControl.mouseOverStyle.fontSize,
-				fontFamily: this.device.style.LimitControl.mouseOverStyle.fontFormat,
-				text: this.device.model.name,
-				textFill: this.device.style.LimitControl.mouseOverStyle.fontColor,
-				textAlign: this.device.style.LimitControl.mouseOverStyle.textAlign,
-				textVerticalAlign: this.device.style.LimitControl.mouseOverStyle.textVerticalAlign
-			}
-		});
-		this.add(this.text);
-		this.text.hide();
-	}
-	mouseover(e) {
-		if (e.target && e.target._subType == 'Text') {
-			this.text.show();
-		} else {
-			this.device.control.setControlColor(this.device.style.LimitControl.mouseOverStyle.arcColor);
-			this.device.control.setTextColor(this.device.style.LimitControl.mouseOverStyle.textColor);
-			this.device.control.setTextBorder(true);
-			this.device.control.setArcBorder(true);
-		}
-	}
-
-	mouseout(e) {
-		if (!this.device.model.down) {
-			if (e.target && e.target._subType == 'Text') {
-				this.text.hide();
-			} else {
-				this.device.control.setControlColor(this.device.style.LimitControl.lamp.controlColor);
-				this.device.control.setTextColor('#FFFFFF');
-				this.device.control.setTextBorder(false);
-				this.device.control.setArcBorder(false);
-			}
-		}
-	}
-}
diff --git a/src/jmap/shape/LimitControl/index.js b/src/jmap/shape/LimitControl/index.js
deleted file mode 100644
index cc2bf0d94..000000000
--- a/src/jmap/shape/LimitControl/index.js
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
-*	权限临时限速
-*/
-import Group from 'zrender/src/container/Group';
-import EControl from '../element/EControl';
-import EMouse from './EMouse';
-
-export default class LimitControl extends Group {
-	constructor(model, style) {
-		super();
-		this.selected = false;
-		this._code = model.code;
-		this._type = model._type;
-		this.zlevel = model.zlevel;
-		this.model = model;
-		this.style = style;
-		this.z = 20;
-		this.create(model);
-		this.createMouseEvent();
-		this.setState(model);
-	}
-
-	create(model) {
-		this.control = new EControl({
-			zlevel: this.zlevel,
-			z: this.z,
-			arc: {
-				shape: {
-					cx: model.position.x,
-					cy: model.position.y,
-					r: this.style.LimitControl.lamp.radiusR
-				},
-				lineWidth: 0,
-				fill: this.style.LimitControl.lamp.controlColor,
-				mouseover: this.mouseoverArc,
-				mouseout: this.mouseoutArc
-			},
-			text: {
-				position: [0, 0],
-				x: model.position.x,
-				y: model.position.y + this.style.LimitControl.lamp.radiusR + this.style.LimitControl.text.distance,
-				fontWeight: this.style.LimitControl.text.fontWeight,
-				fontSize: this.style.LimitControl.text.fontSize,
-				fontFamily: this.style.fontFamily,
-				text: model.name,
-				textFill: '#fff',
-				textAlign: 'middle',
-				textVerticalAlign: 'top',
-				mouseover: this.mouseoverText,
-				mouseout: this.mouseoutText
-			},
-			style: this.style
-		});
-
-		this.add(this.control);
-	}
-
-	// 设置状态
-	setState(model) {
-	}
-
-	createMouseEvent() {
-		if (this.style.LimitControl.mouseOverStyle) {
-			this.mouseEvent = new EMouse(this);
-			this.add(this.mouseEvent);
-			this.on('mouseout', (e) => { this.mouseEvent.mouseout(e); });
-			this.on('mouseover', (e) => { this.mouseEvent.mouseover(e); });
-		}
-	}
-
-	getShapeTipPoint() {
-		if (this.control) {
-			var distance = 2;
-			var rect = this.control.getBoundingRect();
-			return {
-				x: rect.x + rect.width / 2,
-				y: rect.y - distance
-			};
-		}
-		return null;
-	}
-}
diff --git a/src/jmap/shape/Line/index.js b/src/jmap/shape/Line/index.js
deleted file mode 100644
index 05be49bec..000000000
--- a/src/jmap/shape/Line/index.js
+++ /dev/null
@@ -1,54 +0,0 @@
-import Line from 'zrender/src/graphic/shape/Line';
-import Group from 'zrender/src/container/Group';
-
-export default class Line2 extends Group {
-	constructor(model, style) {
-		super();
-		this._code = model.code;
-		this._type = model._type;
-		this.zlevel = model.zlevel;
-		this.z = 0;
-		this.model = model;
-		this.style = style;
-		this.create();
-		this.setState(model);
-	}
-
-	create() {
-		const model = this.model;
-		const style = this.style;
-		if (model && model.points.length > 1) {
-			for (let i = 0; i < (model.points.length - 1); i++) {
-				this.add(new Line({
-					zlevel: model.zlevel,
-					z: model.isLogic ? this.z : this.z + 1,
-					shape: {
-						x1: model.points[i].x,
-						y1: model.points[i].y,
-						x2: model.points[i + 1].x,
-						y2: model.points[i + 1].y
-					},
-					style: {
-						lineWidth: model.width,
-						stroke: style.Line.lineColor
-					}
-				}));
-			}
-		}
-	}
-
-	setLineType(type) {
-		switch (type) {
-		case '01': break;
-		case '02':
-			this.eachChild((child) => {
-				child.setStyle('lineDash', [4]);
-			});
-			break;
-		}
-	}
-
-	setState(model) {
-		this.setLineType(model.type);
-	}
-}
diff --git a/src/jmap/shape/Link/EMouse.js b/src/jmap/shape/Link/EMouse.js
deleted file mode 100644
index 7b35db79e..000000000
--- a/src/jmap/shape/Link/EMouse.js
+++ /dev/null
@@ -1,39 +0,0 @@
-import Group from 'zrender/src/container/Group';
-import Rect from 'zrender/src/graphic/shape/Rect';
-// import Vue from 'vue';
-// import store from '@/store';
-
-class EMouse extends Group {
-    constructor(device) {
-        super();
-        this.device = device;
-        this.create();
-    }
-    create() {
-        if (this.device.link) {
-            const rect = this.device.link.getBoundingRect();
-            this.lineBorder = new Rect({
-                zlevel: this.device.zlevel,
-                z: this.device.z - 1,
-                shape: rect,
-                style: {
-                    lineDash: [3, 3],
-                    stroke: '#fff',
-                    fill: this.device.style.transparentColor
-                }
-            });
-
-            this.add(this.lineBorder);
-            this.lineBorder.hide();
-        }
-    }
-
-    mouseover(e) {
-        this.lineBorder && this.lineBorder.show();
-    }
-
-    mouseout(e) {
-        this.lineBorder && this.lineBorder.hide();
-    }
-}
-export default EMouse;
diff --git a/src/jmap/shape/Link/index.js b/src/jmap/shape/Link/index.js
deleted file mode 100644
index 08079f026..000000000
--- a/src/jmap/shape/Link/index.js
+++ /dev/null
@@ -1,68 +0,0 @@
-import Line from 'zrender/src/graphic/shape/Line';
-import Group from 'zrender/src/container/Group';
-import EMouse from './EMouse';
-
-class Link extends Group {
-    constructor(model, style) {
-        super();
-        this._code = model.code;
-        this._type = model._type;
-        this.zlevel = model.zlevel;
-        this.model = model;
-        this.style = style;
-        this.create();
-    }
-
-    create() {
-        const model = this.model;
-        const style = this.style;
-
-        let textPosition = 'insideBottom';
-        if (model.lp.x !== model.rp.x && model.lp.y !== model.rp.y) {
-            textPosition = model.lp.y > model.rp.y ? 'insideLeft' : 'insideRight';
-        }
-        // 标准link
-        this.link = new Line({
-            zlevel: this.zlevel,
-            z: 0,
-            shape: {
-                x1: model.lp.x,
-                y1: model.lp.y,
-                x2: model.rp.x,
-                y2: model.rp.y
-            },
-            style: {
-                lineWidth: style.Link.linkWidth,
-                stroke: style.Link.linkColor,
-                text: model.name,
-                textDistance: style.Link.linkWidth * 2,
-                textPosition: textPosition, // 'inside',
-                textAlign: 'middle',
-                fontSize: style.Link.textFontSize,
-                textFill: style.Link.linkTextColor,
-                textStroke: style.Link.backgroundColor
-            }
-        });
-        this.add(this.link);
-        const path = window.location.href;
-        if (path.includes('/map/draw')) {
-            // 鼠标事件
-            this.mouseEvent = new EMouse(this);
-            this.add(this.mouseEvent);
-            this.on('mouseout', (e) => { this.mouseEvent.mouseout(e); });
-            this.on('mouseover', (e) => { this.mouseEvent.mouseover(e); });
-        }
-    }
-
-    setState(model) {
-    }
-
-    tipBasePoint() {
-    }
-
-    getBoundingRect() {
-        return this.link.getBoundingRect();
-    }
-}
-
-export default Link;
diff --git a/src/jmap/shape/Section/EAxle.js b/src/jmap/shape/Section/EAxle.js
deleted file mode 100644
index 17e404671..000000000
--- a/src/jmap/shape/Section/EAxle.js
+++ /dev/null
@@ -1,85 +0,0 @@
-// import Group from 'zrender/src/container/Group';
-// import Line from 'zrender/src/graphic/shape/Line';
-// import Circle from 'zrender/src/graphic/shape/Circle';
-import Path from 'zrender/src/graphic/Path';
-
-// 计轴
-export const EAxle = Path.extend({
-	type: 'EAxle',
-	shape: {
-		point: null
-	},
-	buildPath: function (ctx, model) {
-		if (model && model.style && model.traingle) {
-			const axleLength = 2 * model.style.Section.axle.radius;
-			const positionx = model.point.x + model.drictx * (model.traingle.getCos(axleLength));
-			const positiony = model.point.y + model.dricty * (model.traingle.getCos(axleLength));
-			// 圆弧
-			const arcX = positionx - model.dricty * model.traingle.getSin(axleLength);
-			const arcY = positiony + model.drictx * model.traingle.getSin(axleLength);
-			const arcR = model.style.Section.axle.radius;
-			ctx.arc(arcX, arcY, arcR, 0, 2 * Math.PI, false);
-			ctx.closePath();
-
-			const x1 = positionx - model.traingle.getCos(axleLength) - model.dricty * model.traingle.getSin(axleLength);
-			const y1 = positiony + model.drictx * model.traingle.getSin(axleLength) - model.traingle.getSin(axleLength);
-			const x2 = positionx + model.traingle.getCos(axleLength) - model.dricty * model.traingle.getSin(axleLength);
-			const y2 = positiony + model.drictx * model.traingle.getSin(axleLength) + model.traingle.getSin(axleLength);
-			ctx.moveTo(x1, y1);
-			ctx.lineTo(x2, y2);
-			ctx.closePath();
-		}
-	}
-});
-
-// export default class EAxle extends Group {
-// 	constructor(model) {
-// 		super();
-// 		this.model = model;
-// 		this.zlevel = model.zlevel;
-// 		this.z = 5;
-// 		this.create(model);
-// 	}
-
-// 	create(model) {
-// 		if (model && model.style && model.traingle) {
-// 			const axleLength = 2 * model.style.Section.axle.radius;
-// 			const positionx = model.point.x + model.drictx * (model.traingle.getCos(axleLength));
-// 			const positiony = model.point.y + model.dricty * (model.traingle.getCos(axleLength));
-
-// 			this.line = new Line({
-// 				zlevel: this.zlevel,
-// 				z: this.z,
-// 				progressive: model.progressive,
-// 				shape: {
-// 					x1: positionx - model.traingle.getCos(axleLength) - model.dricty * model.traingle.getSin(axleLength),
-// 					y1: positiony + model.drictx * model.traingle.getSin(axleLength) - model.traingle.getSin(axleLength),
-// 					x2: positionx + model.traingle.getCos(axleLength) - model.dricty * model.traingle.getSin(axleLength),
-// 					y2: positiony + model.drictx * model.traingle.getSin(axleLength) + model.traingle.getSin(axleLength)
-// 				},
-// 				style: {
-// 					GBaseLineWidth: 1,
-// 					stroke: model.style.Section.axle.color
-// 				}
-// 			});
-// 			this.axle = new Circle({
-// 				zlevel: this.zlevel,
-// 				z: this.z,
-// 				progressive: model.progressive,
-// 				shape: {
-// 					cx: positionx - model.dricty * model.traingle.getSin(axleLength),
-// 					cy: positiony + model.drictx * model.traingle.getSin(axleLength),
-// 					r: model.style.Section.axle.radius
-// 				},
-// 				style: {
-// 					GBaseLineWidth: 1,
-// 					stroke: model.style.Section.axle.color,
-// 					fill: model.style.transparentColor
-// 				}
-// 			});
-
-// 			this.add(this.line);
-// 			this.add(this.axle);
-// 		}
-// 	}
-// }
diff --git a/src/jmap/shape/Section/EBackArrow.js b/src/jmap/shape/Section/EBackArrow.js
deleted file mode 100644
index 5c3506271..000000000
--- a/src/jmap/shape/Section/EBackArrow.js
+++ /dev/null
@@ -1,42 +0,0 @@
-import Path from 'zrender/src/graphic/Path';
-
-// 成都三号线 折返进路
-export const EBackArrow = Path.extend({
-	type: 'EBackArrow',
-	shape: {
-		points: null
-	},
-	buildPath: function (ctx, shape) {
-		const points = shape.points;
-		var r = shape.height;
-		var x = points.x + shape.drict * shape.width / 2;
-		var y = points.y;
-		ctx.moveTo(points.x - shape.drict * shape.width, points.y + shape.height);
-		ctx.lineTo(points.x + shape.drict * shape.width / 2, points.y + shape.height);
-		if (shape.drict) {
-			ctx.arc(x, y, r, Math.PI / 2, Math.PI * 3 / 2, true);
-		} else {
-			ctx.arc(x, y, r, Math.PI / 2, Math.PI * 3 / 2, false);
-		}
-		ctx.moveTo(points.x + shape.drict * shape.width / 2, points.y - shape.height);
-		ctx.lineTo(points.x - shape.drict * (shape.width - 5), points.y - shape.height);
-	}
-});
-
-// 箭头
-export const EBackArrowTriangle = Path.extend({
-	type: 'EBackArrowTriangle',
-	shape: {
-		points: null
-	},
-	buildPath: function (ctx, shape) {
-		const points = shape.points;
-		ctx.moveTo(points.x - shape.drict * (shape.width - 5), points.y - shape.height - 3);
-		if (shape.drict) {
-			ctx.lineTo(points.x - shape.drict * shape.width, points.y - shape.height);
-		} else {
-			ctx.lineTo(points.x - shape.drict * shape.width, points.y - shape.height);
-		}
-		ctx.lineTo(points.x - shape.drict * (shape.width - 5), points.y - shape.height + 3);
-	}
-});
diff --git a/src/jmap/shape/Section/ELimitLines.js b/src/jmap/shape/Section/ELimitLines.js
deleted file mode 100644
index 6056db14d..000000000
--- a/src/jmap/shape/Section/ELimitLines.js
+++ /dev/null
@@ -1,218 +0,0 @@
-import Group from 'zrender/src/container/Group';
-import BezierCurve from 'zrender/src/graphic/shape/BezierCurve';
-import Line from 'zrender/src/graphic/shape/Line';
-import JTriangle from '../../utils/JTriangle';
-// import Path from 'zrender/src/graphic/Path';
-
-// 创建区段限速限集合
-// export const ELimitLines = Path.extend({
-// 	type: 'ELimitLines',
-// 	shape: {
-// 		points: null
-// 	},
-// 	buildPath: function (ctx, model) {
-// 		/** 创建区段*/
-// 		if (model && model.points.length > 1) {
-// 			if (model.isCurve) {
-// 				ctx.beginPath();
-// 				const shape = {};
-// 				for (let i = 1; i < (model.points.length - 1); i++) {
-// 					shape[`cpx${i}`] = model.points[i].x;
-// 					shape[`cpy${i}`] = model.points[i].y;
-// 				}
-// 				shape[`x1`] = model.points[0].x;
-// 				shape[`y1`] = model.points[0].y;
-// 				shape[`x2`] = model.points[model.points.length - 1].x;
-// 				shape[`y2`] = model.points[model.points.length - 1].y;
-
-// 				ctx.moveTo(shape[`x1`], shape[`y1`]);
-// 				if (model.points.length <= 3) {
-// 					ctx.quadraticCurveTo(shape[`cpx1`], shape[`cpy1`], shape[`x2`], shape[`y2`]);
-// 				} else {
-// 					ctx.bezierCurveTo(shape[`cpx1`], shape[`cpy1`], shape[`cpx2`], shape[`cpy2`], shape[`x2`], shape[`y2`]);
-// 				}
-// 			} else {
-// 				const swPadding = model.style.Switch.core.length; // 定位和反位时区段距离岔芯的距离
-// 				var switchWidth = model.style.Section.line.width + model.style.Section.line.beyondWidth; // 道岔宽度
-// 				const beg = Object.assign({}, model.points[0]);
-// 				const end = Object.assign({}, model.points[model.points.length - 1]);
-// 				if (model.isSwitchSection && beg.y !== end.y) {
-// 					const swch = model.switch;
-// 					if (swch) {
-// 						const traingle = new JTriangle(swch.intersection, swch.skew);
-// 						if ((swch.intersection.x === beg.x) && (swch.intersection.y === beg.y)) {
-// 							beg.x = beg.x + traingle.drictx * (swPadding + switchWidth) * traingle.getCotRate();
-// 							beg.y = beg.y + traingle.dricty * (swPadding + switchWidth);
-// 						}
-
-// 						if ((swch.intersection.x === end.x) && (swch.intersection.y === end.y)) {
-// 							end.x = end.x + traingle.drictx * (swPadding + switchWidth) * traingle.getCotRate();
-// 							end.y = end.y + traingle.dricty * (swPadding + switchWidth);
-// 						}
-// 					}
-// 				}
-
-// 				if (model.points.length == 2) {
-// 					ctx.moveTo(beg.x, beg.y);
-// 					ctx.lineTo(end.x, end.y);
-// 					ctx.closePath();
-// 				} else {
-// 					ctx.moveTo(beg.x, beg.y);
-// 					ctx.lineTo(model.points[1].x, model.points[1].y);
-// 					ctx.closePath();
-
-// 					for (let i = 1; i < (model.points.length - 2); i++) {
-// 						ctx.moveTo(model.points[i].x, model.points[i].y);
-// 						ctx.lineTo(model.points[i + 1].x, model.points[i + 1].y);
-// 						ctx.closePath();
-// 					}
-// 					ctx.moveTo(model.points[model.points.length - 2].x, model.points[model.points.length - 2].y);
-// 					ctx.lineTo(end.x, end.y);
-// 					ctx.closePath();
-// 				}
-// 			}
-// 		}
-// 	}
-// });
-
-export default class ELimitLines extends Group {
-	constructor(model) {
-		super();
-		this.model = model;
-		this.zlevel = model.zlevel;
-		this.z = model.z;
-		this.create(model);
-	}
-
-	create(model) {
-		/** 创建区段*/
-		if (model && model.points.length > 1) {
-			if (model.isCurve) {
-				const shape = {};
-				for (let i = 1; i < (model.points.length - 1); i++) {
-					shape[`cpx${i}`] = model.points[i].x;
-					shape[`cpy${i}`] = model.points[i].y;
-				}
-
-				shape[`x1`] = model.points[0].x;
-				shape[`y1`] = model.points[0].y;
-				shape[`x2`] = model.points[model.points.length - 1].x;
-				shape[`y2`] = model.points[model.points.length - 1].y;
-
-				this.add(new BezierCurve({
-					isLine: true,
-					zlevel: this.zlevel,
-					progressive: model.progressive,
-					z: this.z,
-					culling: true,
-					shape: shape,
-					position: model.position,
-					style: {
-						lineWidth: model.style.Section.speedLimit.width,
-						stroke: model.style.Section.speedLimit.lineColor,
-						fillOpacity: 0
-					}
-				}));
-			} else {
-				// const beg = Object.assign({}, model.points[0]);
-				// const end = Object.assign({}, model.points[model.points.length - 1]);
-
-				const swPadding = model.style.Switch.core.length; // 定位和反位时区段距离岔芯的距离
-				var switchWidth = model.style.Section.line.width + model.style.Section.line.beyondWidth; // 道岔宽度
-				const beg = Object.assign({}, model.points[0]);
-				const end = Object.assign({}, model.points[model.points.length - 1]);
-				if (model.isSwitchSection && beg.y !== end.y) {
-					const swch = model.switch;
-					if (swch) {
-						const traingle = new JTriangle(swch.intersection, swch.skew);
-						if ((swch.intersection.x === beg.x) && (swch.intersection.y === beg.y)) {
-							beg.x = beg.x + traingle.drictx * (swPadding + switchWidth) * traingle.getCotRate();
-							beg.y = beg.y + traingle.dricty * (swPadding + switchWidth);
-						}
-
-						if ((swch.intersection.x === end.x) && (swch.intersection.y === end.y)) {
-							end.x = end.x + traingle.drictx * (swPadding + switchWidth) * traingle.getCotRate();
-							end.y = end.y + traingle.dricty * (swPadding + switchWidth);
-						}
-					}
-				}
-
-				if (model.points.length == 2) {
-					this.add(new Line({
-						isLine: true,
-						zlevel: this.zlevel,
-						progressive: model.progressive,
-						z: this.z,
-						position: model.position,
-						shape: {
-							x1: beg.x,
-							y1: beg.y,
-							x2: end.x,
-							y2: end.y
-						},
-						style: {
-							lineWidth: model.style.Section.speedLimit.width,
-							stroke: model.style.Section.speedLimit.lineColor
-						}
-					}));
-				} else {
-					this.add(new Line({
-						isLine: true,
-						zlevel: this.zlevel,
-						progressive: model.progressive,
-						z: this.z,
-						position: model.position,
-						shape: {
-							x1: beg.x,
-							y1: beg.y,
-							x2: model.points[1].x,
-							y2: model.points[1].y
-						},
-						style: {
-							lineWidth: model.style.Section.speedLimit.width,
-							stroke: model.style.Section.speedLimit.lineColor
-						}
-					}));
-
-					for (let i = 1; i < (model.points.length - 2); i++) {
-						this.add(new Line({
-							isLine: true,
-							zlevel: this.zlevel,
-							z: this.z,
-							progressive: model.progressive,
-							position: model.position,
-							shape: {
-								x1: model.points[i].x,
-								y1: model.points[i].y,
-								x2: model.points[i + 1].x,
-								y2: model.points[i + 1].y
-							},
-							style: {
-								lineWidth: model.style.Section.speedLimit.width,
-								stroke: model.style.Section.speedLimit.lineColor
-							}
-						}));
-					}
-
-					this.add(new Line({
-						isLine: true,
-						zlevel: this.zlevel,
-						z: this.z,
-						position: model.position,
-						progressive: model.progressive,
-						shape: {
-							x1: model.points[model.points.length - 2].x,
-							y1: model.points[model.points.length - 2].y,
-							x2: end.x,
-							y2: end.y
-						},
-						style: {
-							lineWidth: model.style.Section.speedLimit.width,
-							stroke: model.style.Section.speedLimit.lineColor
-						}
-					}));
-				}
-			}
-		}
-	}
-}
diff --git a/src/jmap/shape/Section/ELimitName.js b/src/jmap/shape/Section/ELimitName.js
deleted file mode 100644
index dbdcf0494..000000000
--- a/src/jmap/shape/Section/ELimitName.js
+++ /dev/null
@@ -1,91 +0,0 @@
-// import Path from 'zrender/src/graphic/Path';
-
-// 成都三号线 临时限速名称显示
-// export const ELimitName = Path.extend({
-// 	type: 'ELimitName',
-// 	shape: {
-// 		points: null
-// 	},
-// 	buildPath: function (ctx, shape) {
-// 		const points = shape.points;
-// 		const y = points.y - 15;
-// 		ctx.moveTo(points.x, y);
-// 		ctx.lineTo(points.x - shape.drict * shape.style.Section.speedLimit.drogueWidth, y);
-// 		ctx.lineTo(points.x - shape.drict * (shape.style.Section.speedLimit.drogueWidth + 5), y - 5);
-// 		ctx.lineTo(points.x - shape.drict * shape.style.Section.speedLimit.drogueWidth, y - 10);
-// 		ctx.lineTo(points.x, y - 10);
-// 		ctx.lineTo(points.x, y);
-// 	}
-// });
-
-import Group from 'zrender/src/container/Group';
-import Text from 'zrender/src/graphic/Text';
-import Polygon from 'zrender/src/graphic/shape/Polygon';
-
-export default class ELimitName extends Group {
-	constructor(model) {
-		super();
-		this.model = model;
-		this.zlevel = model.zlevel;
-		this.z = model.z;
-		this.create(model);
-	}
-
-	create(model) {
-		const rectW = model.style.Section.speedLimit.drogueWidth;
-		const rectH = model.style.Section.speedLimit.drogueHeight;
-		this.add(new Polygon({
-			zlevel: this.zlevel,
-			z: this.z + 9,
-			shape: {
-				points: [
-					[model.x, model.y],
-					[model.x - model.drict * rectW, model.y],
-					[model.x - model.drict * (rectW + rectH / 2), model.y - rectH / 2],
-					[model.x - model.drict * rectW, model.y - rectH],
-					[model.x, model.y - rectH]
-				]
-			},
-			style: {
-				lineWidth: 0,
-				fill: model.style.Section.speedLimit.nameBackground
-			}
-		}));
-
-		// 公里标内容
-		this.add(new Text({
-			zlevel: this.zlevel,
-			z: this.z + 10,
-			style: {
-				x: model.x - model.drict * 2,
-				y: model.y,
-				fontWeight: 'normal',
-				fontSize: model.style.Section.speedLimit.nameNumberFontSize,
-				fontFamily: model.style.fontFamily,
-				text: '15',
-				textFill: model.style.Section.speedLimit.nameNumberColor,
-				textAlign: model.drict == -1 ? 'left' : 'right',
-				textPosition: model.style.Section.text.textPosition || 'inside',
-				textVerticalAlign: 'bottom'
-			}
-		}));
-
-		// 公里值
-		this.add(new Text({
-			zlevel: this.zlevel,
-			z: this.z + 10,
-			style: {
-				x: model.x,
-				y: model.y + 12,
-				fontWeight: 'normal',
-				fontSize: model.style.Section.speedLimit.kilometerFontSize,
-				fontFamily: model.style.fontFamily,
-				text: '17.981km',
-				textFill: model.style.Section.speedLimit.kilometerColor,
-				textAlign: model.drict == -1 ? 'left' : 'right',
-				textPosition: model.style.Section.text.textPosition || 'inside',
-				textVerticalAlign: 'bottom'
-			}
-		}));
-	}
-}
diff --git a/src/jmap/shape/Section/ELines.js b/src/jmap/shape/Section/ELines.js
deleted file mode 100644
index 8d4b80c8b..000000000
--- a/src/jmap/shape/Section/ELines.js
+++ /dev/null
@@ -1,102 +0,0 @@
-import Group from 'zrender/src/container/Group';
-import Line from 'zrender/src/graphic/shape/Line';
-import BezierCurve from 'zrender/src/graphic/shape/BezierCurve';
-
-/** 创建区段线集合*/
-export default class ELines extends Group {
-	constructor(model) {
-		super();
-		this.model = model;
-		this.zlevel = model.zlevel;
-		this.z = model.z;
-		this.create(model);
-	}
-
-	create(model) {
-		/** 创建区段*/
-		if (model && model.points.length > 1) {
-			if (model.isCurve) {
-				const shape = {};
-				for (let i = 1; i < (model.points.length - 1); i++) {
-					shape[`cpx${i}`] = model.points[i].x;
-					shape[`cpy${i}`] = model.points[i].y;
-				}
-
-				shape[`x1`] = model.points[0].x;
-				shape[`y1`] = model.points[0].y;
-				shape[`x2`] = model.points[model.points.length - 1].x;
-				shape[`y2`] = model.points[model.points.length - 1].y;
-
-				this.add(new BezierCurve({
-					isLine: true,
-					zlevel: this.zlevel,
-					progressive: model.progressive,
-					z: this.z + 1,
-					culling: true,
-					shape: shape,
-					style: {
-						lineWidth: model.style.Section.line.width,
-						stroke: model.style.Section.line.spareColor,
-						fillOpacity: 0
-					}
-				}));
-			} else {
-				for (let i = 0; i < (model.points.length - 1); i++) {
-					this.add(new Line({
-						isLine: true,
-						zlevel: this.zlevel,
-						progressive: model.progressive,
-						z: this.z,
-						shape: {
-							x1: model.points[i].x,
-							y1: model.points[i].y,
-							x2: model.points[i + 1].x,
-							y2: model.points[i + 1].y
-						},
-						style: {
-							lineWidth: model.style.Section.line.width,
-							stroke: model.style.Section.line.spareColor
-						}
-					}));
-				}
-			}
-		}
-	}
-
-	setStyle(styles) {
-		this.eachChild((child) => {
-			if (child.setStyle && child.isLine) {
-				child.setStyle(styles);
-			}
-		});
-	}
-
-	animateStyle(loop, animates) {
-		if (animates && animates.length) {
-			this.eachChild((child) => {
-				if (child.animateStyle && child.isLine) {
-					let an = child.animateStyle(loop);
-					animates.forEach(elem => {
-						an = an.when(elem.time, elem.styles);
-					});
-					an.start();
-				}
-			});
-		}
-	}
-
-	stopAnimation(flag) {
-		this.eachChild((child) => {
-			if (child.stopAnimation && child.isLine) {
-				child.stopAnimation(flag);
-			}
-		});
-	}
-
-	setBorderVisible(isVisible) {
-		this.lineBorder && this.lineBorder.hide();
-		if (isVisible) {
-			this.lineBorder && this.lineBorder.show();
-		}
-	}
-}
diff --git a/src/jmap/shape/Section/EMouse.js b/src/jmap/shape/Section/EMouse.js
deleted file mode 100644
index 17a26e812..000000000
--- a/src/jmap/shape/Section/EMouse.js
+++ /dev/null
@@ -1,152 +0,0 @@
-import Group from 'zrender/src/container/Group';
-import Text from 'zrender/src/graphic/Text';
-import Rect from 'zrender/src/graphic/shape/Rect';
-// import Vue from 'vue';
-import store from '@/store/index_APP_TARGET';
-class EMouse extends Group {
-    constructor(device, code) {
-        super();
-        this.device = device;
-        this.code = code;
-        this.create();
-    }
-    create() {
-        if (this.device.name) {
-            const rect = this.device.name.getBoundingRect();
-            if (!this.device.isSwitchSection) {
-                this.sectionTextBorder = new Rect({
-                    zlevel: this.device.zlevel,
-                    z: this.device.z + 4,
-                    shape: rect,
-                    style: {
-                        lineDash: [3, 3],
-                        stroke: '#fff', // 白色
-                        fill: this.device.model.sectionType == '02' ? this.device.style.Section.line.logicalColor : '#00FFFF' // 蓝色
-                    }
-                });
-                this.add(this.sectionTextBorder);
-                this.sectionTextBorder.hide();
-            }
-
-            const fontSize = this.device.model.type == '02' ? this.device.style.Section.text.fontSize + 2 : this.device.style.Section.text.fontSize;
-            this.TextName = new Text({
-                zlevel: this.device.zlevel,
-                z: this.device.z + 4,
-                style: {
-                    x: rect.x + (rect.width / 2),
-                    y: rect.y + (rect.height / 2),
-                    fontWeight: 'normal',
-                    fontSize: fontSize,
-                    fontFamily: this.device.style.fontFamily,
-                    text: this.device.model.name,
-                    textFill: '#000',
-                    textAlign: this.device.style.Section.text.textAlign,
-                    textPosition: this.device.style.Section.text.textPosition || 'inside',
-                    textVerticalAlign: this.device.style.Section.text.textVerticalAlign || null
-                }
-            });
-            this.add(this.TextName);
-            this.TextName.hide();
-
-            this.sectionTextShadow = new Text({
-                zlevel: this.zlevel + 3,
-                z: 5,
-                position: [4, -2],
-                silent: true,
-                style: {
-                    x: rect.x + (rect.width / 2),
-                    y: rect.y + (rect.height / 2),
-                    text: this.device.model.name,
-                    textFill: this.device.style.Section.mouseOverStyle.textShadowColor, // 黄色
-                    textAlign: 'middle',
-                    textVerticalAlign: 'top',
-                    textFont: 'bold ' + (fontSize + 1) + 'px ' + this.device.style.fontFamily
-                }
-            });
-            this.add(this.sectionTextShadow);
-            this.sectionTextShadow.hide();
-        }
-        if (this.device.section) {
-            const rect = this.device.section.getBoundingRect();
-            this.lineBorder = new Rect({
-                zlevel: this.device.zlevel,
-                z: this.device.z - 1,
-                shape: rect,
-                style: {
-                    lineDash: [3, 3],
-                    stroke: this.device.style.Section.mouseOverStyle.borderColor,
-                    fill: this.device.style.transparentColor
-                }
-            });
-
-            this.add(this.lineBorder);
-            this.lineBorder.hide();
-        }
-    }
-
-    getInstanceByCode(code) {
-        return (store.getters['map/getDeviceByCode'](code) || {}).instance;
-    }
-
-    mouseover(e) {
-        if (this.device.model.isSwitchSection && this.device.model.relSwitchCode) {
-            const instance = this.getInstanceByCode(this.device.model.relSwitchCode);
-            if (instance && instance.mouseEvent && instance.mouseEvent.mouseover) {
-                instance.mouseEvent.mouseover(e);
-            }
-        } else {
-            this.TextName && this.TextName.show();
-            this.sectionTextBorder && this.sectionTextBorder.show();
-            this.lineBorder && this.lineBorder.show();
-            const instance = this.getInstanceByCode(this.device.model.trainWindowCode);
-            if (instance && instance.mouseEvent && instance.mouseEvent.mouseEnter) {
-                instance.mouseEvent.mouseEnter(e);
-            }
-        }
-    }
-
-    mouseout(e) {
-        if (!this.device.model.down) {
-            this.sectionTextShadow && this.sectionTextShadow.hide();
-            if (this.device.model.isSwitchSection && this.device.model.relSwitchCode) {
-                const instance = this.getInstanceByCode(this.device.model.relSwitchCode);
-                if (instance && instance.mouseEvent && instance.mouseEvent.mouseout) {
-                    instance.mouseEvent.mouseout(e);
-                }
-            } else {
-                this.TextName && this.TextName.hide();
-                this.sectionTextBorder && this.sectionTextBorder.hide();
-                this.lineBorder && this.lineBorder.hide();
-                const instance = this.getInstanceByCode(this.device.model.trainWindowCode);
-                if (instance && instance.mouseEvent && instance.mouseEvent.mouseLeave) {
-                    instance.mouseEvent.mouseLeave(e);
-                }
-            }
-        }
-    }
-
-    mouseEnter(e) {
-        this.TextName && this.TextName.show();
-        this.sectionTextBorder && this.sectionTextBorder.show();
-        this.lineBorder && this.lineBorder.show();
-        if (this.device.model.isSwitchSection && this.device.model.relSwitchCode) {
-            const instance = this.getInstanceByCode(this.device.model.relSwitchCode);
-            if (instance && instance.mouseEvent && instance.mouseEvent.mouseEnter) {
-                instance.mouseEvent.mouseEnter(e);
-            }
-        }
-    }
-
-    mouseLeave(e) {
-        this.TextName && this.TextName.hide();
-        this.sectionTextBorder && this.sectionTextBorder.hide();
-        this.lineBorder && this.lineBorder.hide();
-        if (this.device.model.isSwitchSection && this.device.model.relSwitchCode) {
-            const instance = this.getInstanceByCode(this.device.model.relSwitchCode);
-            if (instance && instance.mouseEvent && instance.mouseEvent.mouseLeave) {
-                instance.mouseEvent.mouseLeave(e);
-            }
-        }
-    }
-}
-export default EMouse;
diff --git a/src/jmap/shape/Section/ERelease.js b/src/jmap/shape/Section/ERelease.js
deleted file mode 100644
index d71c886c2..000000000
--- a/src/jmap/shape/Section/ERelease.js
+++ /dev/null
@@ -1,72 +0,0 @@
-import Group from 'zrender/src/container/Group';
-import Line from 'zrender/src/graphic/shape/Line';
-
-/** 延时释放*/
-export default class ERelease extends Group {
-	constructor(model) {
-		super();
-		this.model = model;
-		this.isNew = false;
-
-	}
-
-	create() {
-		if (!this.isNew) {
-			const model = this.model;
-
-			this.isNew = true;
-			this.lines = new Line({
-				zlevel: model.zlevel,
-				z: model.z,
-				shape: model.shape,
-				progressive: model.progressive,
-				style: {
-					lineWidth: model.lineWidth,
-					stroke: model.stroke
-				}
-			});
-			this.add(this.lines);
-		}
-	}
-
-	setStyle(model) {
-		this.create();
-		this.lines.setStyle(model);
-	}
-
-	hide() {
-		this.create();
-		this.lines.hide();
-	}
-
-	show() {
-		this.create();
-		this.lines.show();
-	}
-
-	// 开始动画
-	animateStyle(loop, animates) {
-		this.create();
-		if (animates && animates.length) {
-			this.eachChild((child) => {
-				if (child.animateStyle) {
-					let an = child.animateStyle(loop);
-					animates.forEach(elem => {
-						an = an.when(elem.time, elem.styles);
-					});
-					an.start();
-				}
-			});
-		}
-	}
-
-	// 结束动画
-	stopAnimation(flag) {
-		this.create();
-		this.eachChild((child) => {
-			if (child.stopAnimation) {
-				child.stopAnimation(flag);
-			}
-		});
-	}
-}
diff --git a/src/jmap/shape/Section/ESeparator.js b/src/jmap/shape/Section/ESeparator.js
deleted file mode 100644
index ee5cc27ef..000000000
--- a/src/jmap/shape/Section/ESeparator.js
+++ /dev/null
@@ -1,92 +0,0 @@
-import Group from 'zrender/src/container/Group';
-import Polyline from 'zrender/src/graphic/shape/Polyline';
-import Circle from 'zrender/src/graphic/shape/Circle';
-
-/** 分隔符*/
-export default class ESeparator extends Group {
-	constructor(model) {
-		super();
-		this.model = model;
-		this.zlevel = model.zlevel;
-		this.z = model.style.Section.separator.z || 6;
-		this.style = model.style;
-		this.setType();
-	}
-
-	createModel(points, lineWidth = null, stroke = null) {
-		const model = this.model;
-		this.partition = new Polyline({
-			zlevel: this.zlevel,
-			progressive: model.progressive,
-			z: this.z,
-			shape: {
-				points: points
-			},
-			style: {
-				lineWidth: lineWidth || this.style.Section.separator.width,
-				stroke: stroke || this.style.Section.separator.color
-			}
-		});
-		this.add(this.partition);
-	}
-
-	// 创建 侵限分隔符
-	createCircle() {
-		const model = this.model;
-		this.circle = new Circle({
-			zlevel: this.zlevel,
-			z: this.z,
-			progressive: model.progressive,
-			shape: {
-				cx: model.point.x,
-				cy: model.point.y,
-				r: this.style.Section.line.width
-			},
-			style: {
-				stroke: this.style.Section.line.invadeColor,
-				GBaseLineWidth: 0.5,
-				fill: this.style.transparentColor
-			}
-		});
-		this.add(this.circle);
-	}
-
-	setType() {
-		const type = this.model.sepType;
-		const model = this.model;
-		if (model && this.style && model.traingle) {
-			if (type === '01') { // 普通分割
-				const points = [
-					[model.point.x, model.point.y - (this.style.Section.line.width)],
-					[model.point.x, model.point.y + (this.style.Section.line.width)]
-				];
-				this.createModel(points);
-			} else if (type === '02') { // 单侧分割符
-				const points = [
-					[model.point.x + model.drict * (this.style.Section.line.width), model.point.y - (this.style.Section.line.width * 1.5)],
-					[model.point.x, model.point.y - (this.style.Section.line.width * 1.5)],
-					[model.point.x, model.point.y + (this.style.Section.line.width * 1.5)]
-				];
-				this.createModel(points);
-			} else if (type === '03') { // 尽头分隔符
-				const points = [
-					[model.point.x + model.drict * (this.style.Section.line.width) * 1.2, model.point.y - (this.style.Section.line.width * 1.2)],
-					[model.point.x, model.point.y - (this.style.Section.line.width * 1.2)],
-					[model.point.x, model.point.y + (this.style.Section.line.width * 1.2)],
-					[model.point.x + model.drict * (this.style.Section.line.width) * 1.2, model.point.y + (this.style.Section.line.width * 1.2)]
-				];
-				const lineWidth = this.style.Section.separator.endWidth;
-				const stroke = this.style.Section.separator.endColor;
-				this.createModel(points, lineWidth, stroke);
-			} else if (type === '04') { // 侵限分隔符
-				this.createCircle();
-			}
-		}
-
-		if (model.traingle) {
-			this.origin = [model.point.x, model.point.y];
-			this.rotation = Math.PI * 2 - Math.atan2(model.traingle.absy, model.traingle.absx) * model.traingle.drictx * model.traingle.dricty;
-			this.dirty(); // 可以无需调用
-		}
-	}
-}
diff --git a/src/jmap/shape/Section/index.js b/src/jmap/shape/Section/index.js
deleted file mode 100644
index f1ec4a72d..000000000
--- a/src/jmap/shape/Section/index.js
+++ /dev/null
@@ -1,847 +0,0 @@
-import Group from 'zrender/src/container/Group';
-import ETextName from '../element/ETextName'; // 名称文字 (共有)
-import ERelease from './ERelease'; // 线段 (共有)
-import ELimitLines from './ELimitLines'; // 区段限速 (私有)
-import ELines from './ELines'; // 创建多线条 曲线 (私有)
-import ESeparator from './ESeparator'; // 分隔符 (私有)
-import EMouse from './EMouse';
-import { EAxle } from './EAxle'; // 创建计轴 (私有)
-import { EBackArrow, EBackArrowTriangle } from './EBackArrow'; // 折返进路箭头
-import ELimitName from './ELimitName'; // 成都三号线 限速名称
-import JTriangle from '../../utils/JTriangle';
-import Rect from 'zrender/src/graphic/shape/Rect';
-
-/** 区段*/
-export default class Section extends Group {
-    constructor(model, style) {
-        super();
-        this._code = model.code;
-        this._type = model._type;
-        this.zlevel = model.zlevel;
-        this.z = 5 + parseInt(model.layer || 0);
-        this.model = model;
-        this.style = style;
-        this.create();
-        this.createMouseEvent();
-        this.createMouse(); // 框选鼠标移入移事件
-        this.setState(model);
-    }
-
-    create() {
-        const model = this.model;
-        // 01:物理区段；02逻辑区段；03道岔区段
-        this.createSectionText(); 			// 创建区段文字
-        if (model.type === '01' && (
-            model.logicSectionNum.length <= 0 ||
-			model.logicSectionNum.length == 1 && model.logicSectionNum[0] == 0) ||
-			model.type === '02') {
-            this.createSection(); 			// 创建区段
-            this.creatRelease();			// 创建延时释放
-            this.createSeparator(); 		// 创建分隔符
-            this.createTurnBack(); 			// 创建成都三号线 折返箭头
-            if (model.type === '01') {
-                this.createAxles();			// 创建计轴
-            }
-        }
-    }
-
-    createMouseEvent() {
-        // 鼠标事件
-        if (this.style.Section.mouseOverStyle) {
-            this.mouseEvent = new EMouse(this, this.model.relSwitchCode);
-            this.add(this.mouseEvent);
-            this.on('mouseout', (e) => { this.mouseEvent.mouseout(e); });
-            this.on('mouseover', (e) => { this.mouseEvent.mouseover(e); });
-        }
-    }
-
-    /** 创建区段*/
-    createSection() {
-        const model = this.model;
-        const style = this.style;
-
-        // 创建区段
-        this.section = new ELines({
-            zlevel: this.zlevel,
-            z: this.z,
-            isSwitchSection: model.isSwitchSection,
-            isCurve: model.isCurve,
-            points: model.points,
-            style: style
-        });
-
-        this.add(this.section);
-    }
-
-    // 折返箭头
-    createTurnBack() {
-        const model = this.model;
-        const style = this.style;
-        if (model.isReentryTrack && style.Section.shuttleBack) {
-            const radius = 3;
-            model.drict = 1; // 箭头朝向 (是折返轨加一个方向选择) 目前在区段右边
-            const width = style.Section.line.width * 2;
-            const height = style.Section.line.width * 1;
-            const turnBackDistance = style.Section.shuttleBack.distance + radius * 4;
-
-            const points = model.points;
-            let x = -model.drict * width * 1.2;
-            let y = -turnBackDistance;
-
-            if (model.drict < 0) {
-                x += points[0].x;
-                y += points[0].y;
-            } else {
-                x += points[points.length - 1].x;
-                y += points[points.length - 1].y;
-            }
-
-            this.turnBack = new EBackArrow({
-                zlevel: this.zlevel,
-                z: this.z + 10,
-                shape: {
-                    drict: model.drict,
-                    width: width,
-                    height: height,
-                    points: {
-                        x: x,
-                        y: y
-                    }
-                },
-                style: {
-                    lineWidth: style.Section.separator.width,
-                    stroke: style.Section.separator.color,
-                    fill: 'rgba(0, 0, 0, 0)'
-                }
-            });
-            this.turnBackriangle = new EBackArrowTriangle({
-                zlevel: this.zlevel,
-                z: this.z + 10,
-                shape: {
-                    drict: model.drict,
-                    width: width,
-                    height: height,
-                    points: {
-                        x: x,
-                        y: y
-                    }
-                },
-                style: {
-                    lineWidth: style.Section.separator.width,
-                    stroke: style.Section.separator.color,
-                    fill: style.Section.separator.color
-                }
-            });
-            this.add(this.turnBack);
-            this.add(this.turnBackriangle);
-            this.turnBack.hide();
-            this.turnBackriangle.hide();
-        }
-    }
-
-    // 创建延时释放 (需要在创建)
-    creatRelease() {
-        const model = this.model;
-        const style = this.style;
-        const traingle = new JTriangle(model.points[0], model.points[model.points.length - 1]);
-        this.release = new ERelease({
-            zlevel: this.zlevel,
-            z: this.z,
-            shape: {
-                x1: model.points[0].x + traingle.getCos(traingle.absz / 3),
-                y1: model.points[0].y + traingle.getSin(traingle.absz / 3),
-                x2: model.points[0].x + traingle.getCos(traingle.absz / 3 * 2),
-                y2: model.points[0].y + traingle.getSin(traingle.absz / 3 * 2)
-            },
-            lineWidth: style.Section.line.width,
-            stroke: style.Section.line.spareColor
-        });
-
-        this.add(this.release);
-    }
-
-    // 创建限速线 (需要在创建)
-    creatSpeedLimit() {
-        const model = this.model;
-        const style = this.style;
-        const traingle = new JTriangle(model.points[0], model.points[model.points.length - 1]);
-        let x = traingle.drictx * (style.Section.speedLimit.distance) * traingle.getSinRate();
-        let y = traingle.dricty * (style.Section.speedLimit.distance) * traingle.getCosRate();
-        if (x == Infinity) { x = 0; }
-        if (y == Infinity) { y = 0; }
-        if (!this.speedLimitLeft && !this.speedLimitRight) {
-            this.speedLimitLeft = new ELimitLines({
-                zlevel: this.zlevel,
-                z: this.z,
-                position: [x, -y],
-                style: style,
-                switch: model.switch,
-                isSwitchSection: model.isSwitchSection,
-                relSwitchCode: model.relSwitchCode,
-                isCurve: model.isCurve, // 是否曲线
-                points: model.points
-            });
-            this.speedLimitRight = new ELimitLines({
-                zlevel: this.zlevel,
-                z: this.z,
-                position: [-x, y],
-                style: style,
-                switch: model.switch,
-                isSwitchSection: model.isSwitchSection,
-                relSwitchCode: model.relSwitchCode,
-                isCurve: model.isCurve, // 是否曲线
-                points: model.points
-            });
-            if (style.Section.speedLimit.nameShow) {
-                // 开头 起点位置
-                this.speedLimitNameLeft = new ELimitName({
-                    zlevel: this.zlevel,
-                    z: this.z + 10,
-                    drict: -1,
-                    x: model.points[0].x,
-                    y: model.points[0].y - 15,
-                    style: style
-                });
-                // 终点位置
-                this.speedLimitNameRight = new ELimitName({
-                    zlevel: this.zlevel,
-                    z: this.z + 10,
-                    drict: 1,
-                    x: model.points[model.points.length - 1].x,
-                    y: model.points[model.points.length - 1].y - 15,
-                    style: style
-                });
-                this.add(this.speedLimitNameLeft);
-                this.add(this.speedLimitNameRight);
-            }
-        }
-        this.add(this.speedLimitLeft);
-        this.add(this.speedLimitRight);
-    }
-
-    // 创建区段名称
-    createSectionText() {
-        const model = this.model;
-        const style = this.style;
-
-        if (model && style) {
-            // 计算区段坐标位置
-            const x = Math.min(model.points[0].x, model.points[model.points.length - 1].x) + Math.abs(model.points[model.points.length - 1].x - model.points[0].x) / 2;
-            const y = Math.min(model.points[0].y, model.points[model.points.length - 1].y) + Math.abs(model.points[model.points.length - 1].y - model.points[0].y) / 2;
-            const traingle = new JTriangle(model.points[0], model.points[model.points.length - 1]);
-            const drict = model.trainPosType != '01' ? 1 : -1;
-            if (model.type == '01' && style.Section.text.show && model.nameShow && !model.isSwitchSection) { // 物理区段名称
-                const opposite = style.Section.text.opposite ? -1 : 1;
-                const tempx = x + traingle.getSin(style.Section.text.distance);
-                const tempy = y + traingle.getCos(style.Section.text.distance) * (style.Section.text.position || opposite * drict);
-                this.name = new ETextName({
-                    zlevel: this.zlevel,
-                    z: this.z + 2,
-                    style: this.style,
-                    silent: false,
-                    x: tempx + model.namePosition.x,
-                    y: tempy + model.namePosition.y,
-                    fontWeight: style.Section.text.fontWeight,
-                    fontSize: style.Section.text.fontSize,
-                    fontFamily: style.fontFamily,
-                    text: model.name,
-                    textFill: style.Section.text.fontColor,
-                    textAlign: style.Section.text.textAlign,
-                    textPosition: style.Section.text.textPosition,
-                    textVerticalAlign: style.Section.text.textVerticalAlign
-                });
-                this.add(this.name);
-            } else if (model.type == '02' && style.Section.logicText.show && model.nameShow) { // 逻辑区段
-                const opposite = style.Section.logicText.opposite ? -1 : 1;
-                const tempx = x + traingle.getSin(style.Section.logicText.distance);
-                const tempy = y + traingle.getCos(style.Section.logicText.distance) * (style.Section.logicText.position || opposite * drict);
-                this.name = new ETextName({
-                    zlevel: this.zlevel,
-                    z: this.z + 2,
-                    style: this.style,
-                    silent: false,
-                    x: tempx + model.namePosition.x,
-                    y: tempy + model.namePosition.y,
-                    fontWeight: style.Section.logicText.fontWeight,
-                    fontSize: style.Section.logicText.fontSize,
-                    fontFamily: style.fontFamily,
-                    text: model.name,
-                    textFill: style.Section.logicText.fontColor,
-                    textAlign: style.Section.logicText.textAlign,
-                    textPosition: style.Section.logicText.textPosition,
-                    textVerticalAlign: style.Section.logicText.textVerticalAlign
-                });
-                this.add(this.name);
-            } else if (model.type == '03' && model.nameShow) { // 道岔区段 (实际道岔计轴区段)
-                this.name = new ETextName({
-                    zlevel: this.zlevel,
-                    z: this.z + 2,
-                    style: this.style,
-                    silent: false,
-                    x: x + model.namePosition.x,
-                    y: y + model.namePosition.y + style.Section.text.distance * drict,
-                    fontWeight: style.Section.text.fontWeight,
-                    fontSize: style.Section.text.fontSize,
-                    fontFamily: style.fontFamily,
-                    text: model.name,
-                    textFill: style.Section.text.fontColor,
-                    textAlign: style.Section.text.textAlign,
-                    textPosition: style.Section.text.textPosition,
-                    textVerticalAlign: style.Section.text.textVerticalAlign
-                });
-                this.add(this.name);
-            }
-
-            /** 站台轨名称*/
-            if (model.isStandTrack && model.standTrackNameShow && style.Section.standText.show) {
-                const opposite = style.Section.standText.opposite ? -1 : 1;
-                const tempx = x + traingle.getSin(style.Section.standText.distance);
-                const tempy = y + traingle.getCos(style.Section.standText.distance) * (style.Section.standText.position || opposite * drict);
-                this.standTrackText = new ETextName({
-                    zlevel: this.zlevel,
-                    z: this.z + 2,
-                    silent: false,
-                    x: tempx + model.standTrackNamePosition.x,
-                    y: tempy + model.standTrackNamePosition.y,
-                    fontWeight: style.Section.standText.fontWeight,
-                    fontSize: style.Section.standText.fontSize,
-                    fontFamily: style.fontFamily,
-                    text: model.standTrackName,
-                    textFill: style.Section.standText.fontColor,
-                    textAlign: style.Section.standText.textAlign,
-                    textPosition: style.Section.standText.textPosition,
-                    textVerticalAlign: style.Section.standText.textVerticalAlign
-                });
-                this.add(this.standTrackText);
-            }
-
-            /** 折返轨名称*/
-            if (model.isReentryTrack && model.reentryTrackNameShow && style.Section.reentryText.show) {
-                const opposite = style.Section.reentryText.opposite ? -1 : 1;
-                const tempx = x + traingle.getSin(style.Section.reentryText.distance);
-                const tempy = y + traingle.getCos(style.Section.reentryText.distance) * (style.Section.reentryText.position || opposite * drict);
-                this.reentryTrackText = new ETextName({
-                    zlevel: this.zlevel,
-                    z: this.z + 2,
-                    silent: false,
-                    x: tempx + model.reentryTrackNamePosition.x,
-                    y: tempy + model.reentryTrackNamePosition.y,
-                    fontWeight: style.Section.reentryText.fontWeight,
-                    fontSize: style.Section.reentryText.fontSize,
-                    fontFamily: style.fontFamily,
-                    text: model.reentryTrackName,
-                    textFill: style.Section.reentryText.fontColor,
-                    textAlign: style.Section.reentryText.textAlign,
-                    textPosition: style.Section.reentryText.textPosition,
-                    textVerticalAlign: style.Section.reentryText.textVerticalAlign
-                });
-                this.add(this.reentryTrackText);
-            }
-
-            /** 转换轨名称*/
-            if (model.isTransferTrack && model.transferTrackNameShow && style.Section.transferText.show) {
-                const opposite = style.Section.transferText.opposite ? -1 : 1;
-                const tempx = x + traingle.getSin(style.Section.transferText.distance);
-                const tempy = y + traingle.getCos(style.Section.transferText.distance) * (style.Section.transferText.position || opposite * drict);
-                this.transferTrackText = new ETextName({
-                    zlevel: this.zlevel,
-                    z: this.z + 2,
-                    silent: false,
-                    x: tempx + model.transferTrackNamePosition.x,
-                    y: tempy + model.transferTrackNamePosition.y,
-                    fontWeight: style.Section.transferText.fontWeight,
-                    fontSize: style.Section.transferText.fontSize,
-                    fontFamily: style.fontFamily,
-                    text: model.transferTrackName,
-                    textFill: style.Section.transferText.fontColor,
-                    textAlign: style.Section.transferText.textAlign,
-                    textPosition: style.Section.transferText.textPosition,
-                    textVerticalAlign: style.Section.transferText.textVerticalAlign
-                });
-                this.add(this.transferTrackText);
-            }
-
-            /** 目的码名称*/
-            if (model.destinationCode && model.destinationNameShow && style.Section.destinationText.show) {
-                const opposite = style.Section.destinationText.opposite ? -1 : 1;
-                const tempx = x + traingle.getSin(style.Section.destinationText.distance);
-                const tempy = y + traingle.getCos(style.Section.destinationText.distance) * (style.Section.destinationText.position || opposite * drict);
-                this.destinationText = new ETextName({
-                    zlevel: this.zlevel,
-                    z: this.z + 2,
-                    silent: false,
-                    x: tempx + model.destinationCodePoint.x,
-                    y: tempy + model.destinationCodePoint.y,
-                    fontWeight: style.Section.destinationText.fontWeight,
-                    fontSize: style.Section.destinationText.fontSize,
-                    fontFamily: style.fontFamily,
-                    text: model.destinationCode,
-                    textFill: style.Section.destinationText.fontColor,
-                    textAlign: style.Section.destinationText.textAlign,
-                    textPosition: style.Section.destinationText.textPosition,
-                    textVerticalAlign: style.Section.destinationText.textVerticalAlign
-                });
-                this.add(this.destinationText);
-            }
-        }
-    }
-
-    // 创建计轴 (需要在创建)
-    createAxles() {
-        const model = this.model;
-        const style = this.style;
-
-        /** 创建四个计轴*/
-        let traingle = null;
-        if (model && style && model.axleShow && model.points && model.points.length > 1) {
-            traingle = new JTriangle(model.points[0], model.points[1]);
-            this.lUpAxle = new EAxle({
-                zlevel: this.zlevel,
-                z: this.z + 5, // 层级大于道岔z 否则会压住显示完整
-                shape: {
-                    point: {
-                        x: model.points[0].x,
-                        y: model.points[0].y
-                    },
-                    drictx: 1,
-                    dricty: -1,
-                    traingle: traingle,
-                    style: style
-                },
-                style: {
-                    GBaseLineWidth: 1,
-                    stroke: style.Section.axle.color
-                }
-            });
-            this.lBottomAxle = new EAxle({
-                zlevel: this.zlevel,
-                z: this.z + 5, // 层级大于道岔z 否则会压住显示完整
-                shape: {
-                    point: {
-                        x: model.points[0].x,
-                        y: model.points[0].y
-                    },
-                    drictx: 1,
-                    dricty: 1,
-                    traingle: traingle,
-                    style: style
-                },
-                style: {
-                    GBaseLineWidth: 1,
-                    stroke: style.Section.axle.color
-                }
-            });
-
-            traingle = new JTriangle(model.points[model.points.length - 2], model.points[model.points.length - 1]);
-            this.rUpAxle = new EAxle({
-                zlevel: this.zlevel,
-                z: this.z + 5, // 层级大于道岔z 否则会压住显示完整
-                shape: {
-                    point: {
-                        x: model.points[model.points.length - 1].x,
-                        y: model.points[model.points.length - 1].y
-                    },
-                    drictx: -1,
-                    dricty: -1,
-                    traingle: traingle,
-                    style: style
-                },
-                style: {
-                    GBaseLineWidth: 1,
-                    stroke: style.Section.axle.color
-                }
-            });
-            this.rBottomAxle = new EAxle({
-                zlevel: this.zlevel,
-                z: this.z + 5, // 层级大于道岔z 否则会压住显示完整
-                shape: {
-                    point: {
-                        x: model.points[model.points.length - 1].x,
-                        y: model.points[model.points.length - 1].y
-                    },
-                    drictx: -1,
-                    dricty: 1,
-                    traingle: traingle,
-                    style: style
-                },
-                style: {
-                    GBaseLineWidth: 1,
-                    stroke: style.Section.axle.color
-                }
-            });
-
-            this.add(this.lUpAxle);
-            this.add(this.rUpAxle);
-            this.add(this.lBottomAxle);
-            this.add(this.rBottomAxle);
-        }
-    }
-
-    // 创建分隔符 (内层需要在创建)
-    createSeparator() {
-        const model = this.model;
-        const style = this.style;
-        let traingle = null;
-
-        if (model && style && model.points && model.points.length > 1) {
-            /** 创建左侧分隔符*/
-            traingle = new JTriangle(model.points[0], model.points[1]);
-            this.lPartition = new ESeparator({
-                style: style,
-                zlevel: this.zlevel,
-                traingle: traingle,
-                point: {
-                    x: model.points[0].x,
-                    y: model.points[0].y
-                },
-                sepType: model.sepTypeLeft,
-                drict: -1 // 方向
-            });
-
-            /** 创建右侧分隔符*/
-            traingle = new JTriangle(model.points[model.points.length - 2], model.points[model.points.length - 1]);
-            this.rPartition = new ESeparator({
-                style: style,
-                zlevel: this.zlevel,
-                traingle: traingle,
-                point: {
-                    x: model.points[model.points.length - 1].x,
-                    y: model.points[model.points.length - 1].y
-                },
-                sepType: model.sepTypeRight,
-                drict: 1 // 方向
-            });
-
-            /** 添加视图*/
-            this.add(this.lPartition);
-            this.add(this.rPartition);
-        }
-    }
-
-    /** 设置区段集合显隐*/
-    setInvisible() {
-        const invisible = this.model.type === '02' && this.model.logicSectionShow;
-        this.eachChild((child) => {
-            child.attr('invisible', invisible);
-        });
-    }
-
-    /** 设置区段恢复默认状态*/
-    recover() {
-        if (this.section) {
-            this.section.stopAnimation(true);
-            this.section.setStyle({
-                fill: this.style.backgroundColor,
-                stroke: this.style.Section.line.spareColor,
-                lineWidth: this.style.Section.line.width
-            });
-
-            if (this.release) {
-                this.release.hide();
-            }
-            if (this.speedLimitLeft && this.speedLimitRight) {
-                this.remove(this.speedLimitLeft);
-                this.remove(this.speedLimitRight);
-            }
-        }
-    }
-
-    /** 未定义状态 00*/
-    undefine() {
-        if (this.section) {
-            this.section.setStyle({
-                stroke: this.style.Section.line.undefinedColor,
-                lineWidth: this.style.Section.line.width
-            });
-        }
-    }
-
-    /** 空闲状态 01*/
-    spare() {
-        if (this.section) {
-            this.section.setStyle({
-                stroke: this.style.Section.line.spareColor,
-                lineWidth: this.style.Section.line.width
-            });
-        }
-    }
-
-    /** 通信车占用状态 02*/
-    communicationOccupied() {
-        if (this.section) {
-            this.section.setStyle({
-                stroke: this.style.Section.line.communicationOccupiedColor,
-                lineWidth: this.style.Section.line.width + this.style.Section.line.beyondWidth
-            });
-        }
-    }
-
-    /** 非通信车占用状态 03*/
-    unCommunicationOccupied() {
-        if (this.section) {
-            this.section.setStyle({
-                stroke: this.style.Section.line.unCommunicationOccupiedColor,
-                lineWidth: this.style.Section.line.width + this.style.Section.line.beyondWidth
-            });
-        }
-    }
-
-    /** 进路锁闭 04*/
-    routeLock() {
-        if (this.section) {
-            this.section.setStyle({
-                stroke: this.style.Section.line.routeLockColor,
-                lineWidth: this.style.Section.line.width + this.style.Section.line.beyondWidth
-            });
-        }
-    }
-
-    /** 封锁 06*/
-    block() {
-        if (this.section) {
-            this.section.setStyle({
-                stroke: this.style.Section.line.blockColor,
-                lineWidth: this.style.Section.line.width + this.style.Section.line.beyondWidth
-            });
-        }
-    }
-
-    /** 故障锁定状态 05*/
-    faultLock() {
-        if (this.section) {
-            this.section.setStyle({
-                stroke: this.style.Section.line.faultLockColor,
-                lineWidth: this.style.Section.line.width + this.style.Section.line.beyondWidth
-            });
-        }
-    }
-
-    /** atc切除状态 07*/
-    atcExcision() {
-        if (this.section) {
-            this.section.setStyle({
-                stroke: this.style.Section.line.atcExcisionColor,
-                lineWidth: this.style.Section.line.width + this.style.Section.line.beyondWidth
-            });
-        }
-    }
-
-    /** ats切除状态 08*/
-    atsExcision() {
-        if (this.section) {
-            this.atcExcision();
-            this.section.animateStyle(true, [
-                { time: 1000, styles: { stroke: this.style.backgroundColor } },
-                { time: 2000, styles: { stroke: this.style.Section.line.atsExcisionColor, lineWidth: this.style.Section.line.width + this.style.Section.line.beyondWidth } }
-            ]);
-        }
-    }
-
-    /** 保护区段锁闭 09*/
-    protectiveLock() {
-        if (this.section) {
-            this.section.setStyle({
-                stroke: this.style.Section.line.protectiveLockColor,
-                lineWidth: this.style.Section.line.width + this.style.Section.line.beyondWidth
-            });
-        }
-    }
-
-    /** 延时释放 10*/
-    async timeRelease() {
-        this.section.setStyle({
-            stroke: this.style.Section.line.routeLockColor,
-            lineWidth: this.style.Section.line.width + this.style.Section.line.beyondWidth
-        });
-
-        if (this.release) {
-            this.release.show();
-            this.release.setStyle({
-                stroke: this.style.Section.line.routeLockColor,
-                lineWidth: this.style.Section.line.width + this.style.Section.line.beyondWidth
-            });
-            this.release.animateStyle(true, [
-                { time: 1000, styles: { stroke: this.style.Section.line.routeLockColor } },
-                { time: 2000, styles: { stroke: this.style.Section.line.timeReleaseColor } }
-            ]);
-        }
-    }
-
-    /** 保护区段延时解锁 11*/
-    protectiveTimeRelease() {
-        this.section.setStyle({
-            stroke: this.style.Section.line.protectiveLockColor,
-            lineWidth: this.style.Section.line.width + this.style.Section.line.beyondWidth
-        });
-        this.release && this.release.show();
-        this.release && this.release.setStyle({
-            stroke: this.style.Section.line.protectiveLockColor,
-            lineWidth: this.style.Section.line.width + this.style.Section.line.beyondWidth
-        });
-        this.release && this.release.animateStyle(true, [
-            { time: 1000, styles: { stroke: this.style.Section.line.protectiveLockColor } },
-            { time: 2000, styles: { stroke: this.style.Section.line.protectiveTimeReleaseColor } }
-        ]);
-    }
-
-    /** 区段切除*/
-    sectionCutOff() {
-        const lineWidth = this.style.Section.line.width + (this.model.status != '01' ? this.style.Section.line.beyondWidth : 0);
-        if (this.section) {
-            this.section.animateStyle(true, [
-                { time: 0, styles: { lineWidth: lineWidth } },
-                { time: 1000, styles: { stroke: this.style.backgroundColor } },
-                { time: 2000, styles: { lineWidth: lineWidth } }
-            ]);
-        }
-    }
-
-    /** 设置限速*/
-    setSpeedUpperLimit() {
-        if (this.section) {
-            this.creatSpeedLimit();
-        }
-    }
-
-    /** 计轴预复位 12*/
-    axleReset() {
-        if (this.release) {
-            this.release.show();
-            this.release && this.release.setStyle({
-                stroke: this.style.Section.axle.resetColor,
-                fill: 'green'
-            });
-        }
-    }
-
-    /** 计轴失效 13*/
-    alxeFailure() {
-        if (this.section) {
-            this.section.setStyle({
-                stroke: this.style.Section.axle.Failure,
-                lineWidth: this.style.Section.line.width + this.style.Section.line.beyondWidth
-            });
-        }
-    }
-
-    /** 设置状态*/
-    setState(model) {
-        this.recover();
-        if (model.status == '01' || model.status == '00' || model.status == undefined) {
-            if (this.name && this.style.Section.active.routeColor) {
-                this.name.setStyle({textFill: this.style.Section.text.fontColor});
-            }
-        } else {
-            if (this.name && this.style.Section.active.routeColor) {
-                this.name.setStyle({textFill: 'green'});
-            }
-        }
-        switch (model.status) {
-        case '00': /** 未定义*/
-            this.undefine();
-            break;
-        case '01': /** 空闲*/
-            this.spare(); // 空闲状态下 名称白色 其他条件为绿色
-            break;
-        case '02': /** 通信车占用*/
-            this.communicationOccupied();
-            break;
-        case '03': /** 非通信车占用*/
-            this.unCommunicationOccupied();
-            break;
-        case '04': /** 进路锁闭*/
-            this.routeLock();
-            break;
-        case '05': /** 故障锁闭*/
-            this.faultLock();
-            break;
-        case '06': /** 封锁*/
-            this.block();
-            break;
-        case '07': /** ATC切除*/
-            this.atcExcision();
-            break;
-        case '08': /** ATS切除*/
-            this.atsExcision();
-            break;
-        case '09': /** 保护区段锁闭 */
-            this.protectiveLock();
-            break;
-        case '10': /** 延时释放 */
-            this.timeRelease();
-            break;
-        case '11': /** 保护区段延时解锁*/
-            this.protectiveTimeRelease();
-            break;
-        case '12': /** 计轴预复位*/
-            this.axleReset();
-            break;
-        case '13': /** ARB出清检测错误状态*/
-            break;
-        case '14': /** 计轴失效*/
-            this.alxeFailure();
-            break;
-        }
-
-        /** 区段切除*/
-        if (model.cutOff) {
-            this.sectionCutOff();
-        }
-        /** 是否限速*/
-        if (model.speedUpperLimit >= 0) {
-            this.setSpeedUpperLimit();
-        }
-    }
-
-    createMouse() {
-        const rect = this.getBoundingRect();
-        this.lineBorder = new Rect({
-            zlevel: this.zlevel,
-            z: this.z - 1,
-            shape: rect,
-            style: {
-                lineDash: [3, 3],
-                stroke: '#fff',
-                fill: this.style.transparentColor
-            }
-        });
-
-        this.add(this.lineBorder);
-        this.lineBorder.hide();
-    }
-
-    mouseout() {
-        this.lineBorder && this.lineBorder.show();
-    }
-
-    mouseover() {
-        this.lineBorder && this.lineBorder.hide();
-    }
-
-    /** 计算提示位置*/
-    getShapeTipPoint() {
-        let rect = this.getBoundingRect();
-        let distance = this.style.Section.line.width / 2;
-        if (this.section) {
-            rect = this.section.getBoundingRect();
-            if (this.model.type !== '02' && this.model.nameShow) {
-                if (this.model.trainPosType == '01') {
-                    distance = distance + this.style.Section.text.distance + this.style.Section.text.fontSize;
-                }
-            }
-        }
-
-        return {
-            x: rect.x + rect.width / 2,
-            y: rect.y + rect.height / 2.7 - distance
-        };
-    }
-
-    getBoundingRect() {
-        if (this.section) {
-            return this.section.getBoundingRect();
-        } else {
-            return super.getBoundingRect();
-        }
-    }
-}
diff --git a/src/jmap/shape/Signal/EMouse.js b/src/jmap/shape/Signal/EMouse.js
deleted file mode 100644
index 1b7ef9e6a..000000000
--- a/src/jmap/shape/Signal/EMouse.js
+++ /dev/null
@@ -1,63 +0,0 @@
-import Group from 'zrender/src/container/Group';
-import Rect from 'zrender/src/graphic/shape/Rect';
-
-export default class EMouse extends Group {
-	constructor(device) {
-		super();
-		this.device = device;
-		this.zlevel = device.zlevel;
-		this.style = device.style;
-		this.create();
-	}
-
-	create() {
-		this.lampRect = new Rect({
-			silent: true,
-			zlevel: this.zlevel,
-			z: 6,
-			shape: this.device.getBoundingRect(),
-			style: {
-				lineDash: this.style.Signal.mouseOverStyle.borderLineDash,
-				stroke: this.style.Signal.mouseOverStyle.borderLineColor,
-				fill: this.style.transparentColor
-			}
-		});
-
-		this.nameRect = new Rect({
-			silent: true,
-			zlevel: this.zlevel,
-			z: 5,
-			shape: this.device.sigName.getBoundingRect(),
-			style: {
-				lineDash: this.style.Signal.mouseOverStyle.borderLineDash,
-				stroke: this.style.Signal.mouseOverStyle.borderLineColor,
-				fill: this.style.Signal.mouseOverStyle.nameBackgroundColor
-			}
-		});
-
-		this.lampRect.hide();
-		this.nameRect.hide();
-		this.add(this.lampRect);
-		this.add(this.nameRect);
-	}
-
-	mouseover(e) {
-		this.nameRect.show();
-		this.lampRect.show();
-		this.device.lamps.forEach(elem => {
-			elem.setBorderColor(this.style.Signal.mouseOverStyle.lampBorderLineColor);
-		});
-		this.device.sigName && this.device.sigName.setColor(this.style.backgroundColor);
-	}
-
-	mouseout(e) {
-		if (!this.device.model.down) {
-			this.nameRect.hide();
-			this.lampRect.hide();
-			this.device.lamps.forEach(elem => {
-				elem.setBorderColor(this.style.Signal.lamp.borderColor);
-			});
-			this.device.setState(this.device.model);
-		}
-	}
-}
diff --git a/src/jmap/shape/Signal/ESigAuto.js b/src/jmap/shape/Signal/ESigAuto.js
deleted file mode 100644
index 6d80623d9..000000000
--- a/src/jmap/shape/Signal/ESigAuto.js
+++ /dev/null
@@ -1,77 +0,0 @@
-import Polygon from 'zrender/src/graphic/shape/Polygon';
-import Group from 'zrender/src/container/Group';
-import { arrow } from '../utils/ShapePoints';
-
-class ESigPass extends Group {
-	constructor(model) {
-		super();
-		this.model = model;
-		this.isNew = false;
-	}
-
-	create() {
-		if (!this.isNew) {
-			const model = this.model;
-			const style = this.model.style;
-			const rotation = model.drict != 1? 0 : Math.PI;
-
-			this.isNew = true;
-			this.arrow = new Polygon({
-				zlevel: model.zlevel,
-				z: model.z,
-				origin: [model.x, model.y],
-				rotation: rotation,
-				shape: {
-					points: arrow(model.x, model.y, style.Signal.auto.width, style.Signal.lamp.radiusR * 0.8)
-				},
-				style: {
-					stroke: model.stroke,
-					lineWidth: model.lineWidth,
-					fill: model.fill
-				}
-			});
-			this.add(this.arrow);
-		}
-	}
-
-	// 停止动画
-	animationRecover() {
-		this.create();
-		this.arrow.stopAnimation(false);
-	}
-
-	// 箭头颜色
-	setColor(color) {
-		this.create();
-		this.arrow.setStyle('fill', color);
-	}
-
-	// 箭头闪烁
-	arrowsAnimation() {
-		this.create();
-
-		const style = this.model.style;
-		const fill = this.arrow.style.fill;
-
-		this.arrow.animateStyle(true)
-			.when(1000, { fill: style.backgroundColor, stroke: style.backgroundColor })
-			.when(2000, { fill: fill, stroke: style.sidelineColor })
-			.when(3000, { fill: style.backgroundColor, stroke: style.backgroundColor })
-			.when(4000, { fill: fill, stroke: style.sidelineColor })
-			.start();
-	}
-
-	// 隐藏
-	hide() {
-		this.create();
-		this.arrow.hide();
-	}
-
-	// 显示
-	show() {
-		this.create();
-		this.arrow.show();
-	}
-}
-
-export default ESigPass;
diff --git a/src/jmap/shape/Signal/ESigButton.js b/src/jmap/shape/Signal/ESigButton.js
deleted file mode 100644
index 1d421edb1..000000000
--- a/src/jmap/shape/Signal/ESigButton.js
+++ /dev/null
@@ -1,113 +0,0 @@
-import Polyline from 'zrender/src/graphic/shape/Polyline';
-import Circle from 'zrender/src/graphic/shape/Circle';
-import Arc from 'zrender/src/graphic/shape/Arc';
-import Rect from 'zrender/src/graphic/shape/Rect';
-import Group from 'zrender/src/container/Group';
-
-class ESigButton extends Group {
-	constructor(model) {
-		super();
-		this.model = model;
-		this.isNew = false;
-	}
-
-	create() {
-		if (!this.isNew) {
-			const model = this.model;
-			const style = this.model.style;
-			const padding = 1;
-			const r = style.Signal.lamp.radiusR * 0.8;
-
-			this.isNew = true;
-			this.sigNormalButtom = new Rect({
-				zlevel: model.zlevel,
-				z: model.z,
-				_subType: 'SignalButton',
-				_val: '1',
-				shape: {
-					x: model.x - style.Signal.lamp.radiusR,
-					y: model.y - r + r * model.posit,
-					width: style.Signal.lamp.radiusR * 2,
-					height: style.Signal.lamp.radiusR * 2
-				},
-				style: {
-					lineWidth: 0.2,
-					stroke: style.Signal.button.borderDashColor,
-					fill: style.Signal.button.buttonColor
-				}
-			});
-
-			this.sigNormalButtomDown = new Polyline({
-				_subType: 'SignalButton',
-				_val: '1',
-				zlevel: model.zlevel,
-				z: model.z,
-				silent: true,
-				shape: { points: [
-					[model.x - padding + r, this.sigNormalButtom.shape.y + padding],
-					[model.x + padding - r, this.sigNormalButtom.shape.y + padding],
-					[model.x + padding - r, this.sigNormalButtom.shape.y + padding * 2 + r]
-				] },
-				style: {
-					lineWidth: 0.8,
-					stroke: style.backgroundColor
-				}
-			});
-
-			this.sigReentryButton = new Circle({
-				zlevel: model.zlevel,
-				z: model.z,
-				_subType: 'SignalButton',
-				_val: '2', // 折返按钮
-				shape: {
-					cx: model.x,
-					cy: model.y - 5 / 2 * r * model.posit,
-					r: style.Signal.lamp.radiusR
-				},
-				style: {
-					lineWidth: 0.2,
-					stroke: style.Signal.button.borderDashColor,
-					fill: style.Signal.button.buttonColor
-				}
-			});
-
-			this.sigReentryButtonDown = new Arc({
-				_subType: 'SignalButton',
-				_val: '2', // 折返按钮
-				zlevel: model.zlevel,
-				z: model.z,
-				silent: true,
-				shape: {
-					cx: this.sigReentryButton.shape.cx,
-					cy: this.sigReentryButton.shape.cy,
-					r: this.sigReentryButton.shape.r - padding,
-					startAngle: Math.PI * 8 / 5,
-					endAngle: Math.PI * 4 / 5,
-					clockwise: false
-				},
-				style: {
-					lineWidth: 0.8,
-					stroke: style.backgroundColor
-				}
-			});
-
-			this.add(this.sigNormalButtom);
-			this.add(this.sigReentryButton);
-			this.hide();
-		}
-	}
-
-	hide() {
-		this.create();
-		this.sigNormalButtom.hide();
-		this.sigReentryButton.hide();
-	}
-
-	show() {
-		this.create();
-		this.sigNormalButtom.show();
-		this.sigReentryButton.show();
-	}
-}
-
-export default ESigButton;
diff --git a/src/jmap/shape/Signal/ESigDelay.js b/src/jmap/shape/Signal/ESigDelay.js
deleted file mode 100644
index 00daeff35..000000000
--- a/src/jmap/shape/Signal/ESigDelay.js
+++ /dev/null
@@ -1,59 +0,0 @@
-import Group from 'zrender/src/container/Group';
-import Text from 'zrender/src/graphic/Text';
-
-class ESigDelay extends Group {
-	constructor(model) {
-		super();
-		this.model = model;
-		this.isNew = false;
-	}
-
-	create() {
-		if (!this.isNew) {
-			const model = this.model;
-
-			this.isNew = true;
-			this.name = new Text({
-				_subType: model._subType,
-				zlevel: model.zlevel,
-				z: model.z,
-				silent: model.silent || false,
-				style: {
-					x: model.x,
-					y: model.y,
-					fontWeight: model.fontWeight,
-					fontSize: model.fontSize,
-					fontFamily: model.fontFamily,
-					text: model.text,
-					textFill: model.textFill,
-					textAlign: model.textAlign,
-					textPosition: model.textPosition || 'inside',
-					textVerticalAlign: model.textVerticalAlign || null
-				}
-			});
-			this.add(this.name);
-		}
-	}
-
-	setStyle(model) {
-		this.create();
-		this.name.setStyle(model);
-	}
-
-	setColor(color) {
-		this.create();
-		this.name.setStyle('textFill', color);
-	}
-
-	hide() {
-		this.create();
-		this.name.hide();
-	}
-
-	show() {
-		this.create();
-		this.name.show();
-	}
-}
-
-export default ESigDelay;
diff --git a/src/jmap/shape/Signal/ESigLamp.js b/src/jmap/shape/Signal/ESigLamp.js
deleted file mode 100644
index df106cdda..000000000
--- a/src/jmap/shape/Signal/ESigLamp.js
+++ /dev/null
@@ -1,111 +0,0 @@
-import Line from 'zrender/src/graphic/shape/Line';
-import Arc from 'zrender/src/graphic/shape/Arc';
-import Group from 'zrender/src/container/Group';
-
-class ESigLamp extends Group {
-	constructor(model) {
-		super();
-		this.model = model;
-		this.create();
-	}
-
-	create() {
-		const model = this.model;
-		const style = this.model.style;
-
-		this.lamp = new Arc({
-			_subType: 'SignalLamp',
-			_val: '3',
-			name: model.index,
-			zlevel: model.zlevel,
-			z: model.z,
-			shape: {
-				cx: model.x,
-				cy: model.y,
-				r: style.Signal.lamp.radiusR
-			},
-			style: {
-				lineWidth: style.Signal.lamp.borderWidth,
-				fill: style.backgroundColor,
-				stroke: style.Signal.lamp.borderColor
-			}
-		});
-
-		this.lstop = new Line({
-			_subType: 'SignalLamp',
-			_val: '3',
-			zlevel: model.zlevel,
-			z: model.z,
-			origin: {
-				x: model.originX,
-				y: model.originY
-			},
-			shape: {
-				x1: model.x + (style.Signal.lamp.radiusR + 1) * Math.cos(Math.PI / 4),
-				y1: model.y + (style.Signal.lamp.radiusR + 1) * Math.sin(Math.PI / 4),
-				x2: model.x - (style.Signal.lamp.radiusR + 1) * Math.cos(Math.PI / 4),
-				y2: model.y - (style.Signal.lamp.radiusR + 1) * Math.sin(Math.PI / 4)
-			},
-			style: {
-				lineWidth: style.Signal.lamp.stopWidth,
-				stroke: style.backgroundColor
-			}
-		});
-
-		this.rstop = new Line({
-			_subType: 'SignalLamp',
-			_val: '3',
-			zlevel: model.zlevel,
-			z: model.z,
-			origin: {
-				x: model.originX,
-				y: model.originY
-			},
-			shape: {
-				x1: model.x + (style.Signal.lamp.radiusR + 1) * Math.cos(Math.PI / 4),
-				y1: model.y + (style.Signal.lamp.radiusR + 1) * (Math.sin(Math.PI / 4) - Math.sqrt(2)),
-				x2: model.x - (style.Signal.lamp.radiusR + 1) * Math.cos(Math.PI / 4),
-				y2: model.y - (style.Signal.lamp.radiusR + 1) * (Math.sin(Math.PI / 4) - Math.sqrt(2))
-			},
-			style: {
-				lineWidth: style.Signal.lamp.stopWidth,
-				stroke: style.backgroundColor
-			}
-		});
-		this.add(this.lamp);
-		this.add(this.lstop);
-		this.add(this.rstop);
-	}
-
-	setColor(color) {
-		if (this.model.style.Signal.lamp.borderVariable) {
-			this.lamp.setStyle({ fill: color, stroke: color });
-		} else {
-			this.lamp.setStyle({ fill: color });
-		}
-	}
-
-	setBorderColor(color) {
-		this.lamp.setStyle({stroke: color});
-	}
-
-	setStyle(data) {
-		this.lamp.setStyle(data);
-	}
-
-	setStop(has) {
-		if (has) {
-			this.lstop.show();
-			this.rstop.show();
-		} else {
-			this.lstop.hide();
-			this.rstop.hide();
-		}
-	}
-
-	getBoundingRect() {
-		return this.lamp.getBoundingRect();
-	}
-}
-
-export default ESigLamp;
diff --git a/src/jmap/shape/Signal/ESigName.js b/src/jmap/shape/Signal/ESigName.js
deleted file mode 100644
index 367bc23cb..000000000
--- a/src/jmap/shape/Signal/ESigName.js
+++ /dev/null
@@ -1,56 +0,0 @@
-import Group from 'zrender/src/container/Group';
-import Text from 'zrender/src/graphic/Text';
-
-class ESigName extends Group {
-    constructor(model) {
-        super();
-        this.model = model;
-        this.create();
-    }
-
-    create() {
-        const model = this.model;
-        this.name = new Text({
-            _subType: 'SignalLamp',
-            _val: '3',
-            zlevel: model.zlevel,
-            z: model.z,
-            silent: model.silent,
-            style: {
-                textBorderColor: 'red',
-                textBorderWidth: 0,
-                x: model.x,
-                y: model.y,
-                fontWeight: model.fontWeight,
-                fontSize: model.fontSize,
-                fontFamily: model.fontFamily,
-                text: model.text,
-                textFill: model.textFill,
-                textAlign: model.textAlign,
-                textPosition: model.textPosition || 'inside',
-                textVerticalAlign: model.textVerticalAlign || null
-            }
-        });
-        this.add(this.name);
-    }
-
-    setStyle(model) {
-        this.name.setStyle(model);
-    }
-
-    setColor(color) {
-        this.name.setStyle('textFill', color);
-    }
-
-    // 隐藏
-    hide() {
-        this.name.hide();
-    }
-
-    // 显示
-    show() {
-        this.name.show();
-    }
-}
-
-export default ESigName;
diff --git a/src/jmap/shape/Signal/ESigPost.js b/src/jmap/shape/Signal/ESigPost.js
deleted file mode 100644
index a93a764db..000000000
--- a/src/jmap/shape/Signal/ESigPost.js
+++ /dev/null
@@ -1,70 +0,0 @@
-import Polyline from 'zrender/src/graphic/shape/Polyline';
-import Group from 'zrender/src/container/Group';
-
-class ESigPost extends Group {
-	constructor(model) {
-		super();
-		this.model = model;
-		this.create();
-	}
-
-	create() {
-		const model = this.model;
-		const style = this.model.style;
-
-		this.ver = new Polyline({
-			_subType: 'SignalLamp',
-			_val: '3',
-			zlevel: model.zlevel,
-			z: model.z,
-			shape: {
-				points: [
-					[model.x, model.y + style.Signal.lamp.radiusR * 1.2],
-					[model.x, model.y - style.Signal.lamp.radiusR * 1.2]
-				]
-			},
-			style: {
-				lineWidth: style.Signal.post.standardWidth,
-				stroke: style.Signal.post.standardColor
-			}
-		});
-
-		this.hor = new Polyline({
-			zlevel: model.zlevel,
-			z: model.z,
-			shape: {
-				points: [
-					[model.x, model.y],
-					[model.x + model.drict * style.Signal.lamp.radiusR * 1.2, model.y]
-				]
-			},
-			style: {
-				lineWidth: style.Signal.post.standardWidth,
-				stroke: style.Signal.post.standardColor
-			}
-		});
-
-		this.add(this.ver);
-		this.add(this.hor);
-
-		model.type === '01' ? this.hor.hide() : this.hor.show();
-	}
-
-	getLampPosition(type) {
-		const model = this.model;
-		const style = this.model.style;
-		if (type === '01') {
-			return {
-				x: model.x + model.drict * style.Signal.lamp.radiusR * 3 / 2,
-				y: model.y
-			};
-		} else {
-			return {
-				x: this.hor.shape.points[1][0] + model.drict * style.Signal.lamp.radiusR,
-				y: this.hor.shape.points[1][1]
-			};
-		}
-	}
-}
-
-export default ESigPost;
diff --git a/src/jmap/shape/Signal/ESigRoute.js b/src/jmap/shape/Signal/ESigRoute.js
deleted file mode 100644
index ad6b13fc6..000000000
--- a/src/jmap/shape/Signal/ESigRoute.js
+++ /dev/null
@@ -1,48 +0,0 @@
-import Polygon from 'zrender/src/graphic/shape/Polygon';
-import Group from 'zrender/src/container/Group';
-import { triangular } from '../utils/ShapePoints';
-
-class ESigDrict extends Group {
-	constructor(model) {
-		super();
-		this.model = model;
-		this.isNew = false;
-	}
-
-	create() {
-		if (!this.isNew) {
-			const model = this.model;
-			const style = this.model.style;
-
-			this.isNew = true;
-			this.sigDrict = new Polygon({
-				zlevel: model.zlevel,
-				z: model.z,
-				shape: {
-					points: triangular(model.x, model.y, model.drict, style.Signal.lamp.radiusR)
-				},
-				style: {
-					stroke: style.backgroundColor,
-					lineWidth: 0.5,
-					fill: style.Signal.route.routeColor
-				}
-			});
-
-			this.add(this.sigDrict);
-		}
-	}
-
-	// 隐藏
-	hide() {
-		this.create();
-		this.sigDrict.hide();
-	}
-
-	// 显示
-	show() {
-		this.create();
-		this.sigDrict.show();
-	}
-}
-
-export default ESigDrict;
diff --git a/src/jmap/shape/Signal/index.js b/src/jmap/shape/Signal/index.js
deleted file mode 100644
index 8f06e76eb..000000000
--- a/src/jmap/shape/Signal/index.js
+++ /dev/null
@@ -1,518 +0,0 @@
-/*
-*	信号机
-*/
-
-import ESigPost from './ESigPost';
-import ESigLamp from './ESigLamp';
-import ESigAuto from './ESigAuto';
-import ESigRoute from './ESigRoute';
-import ESigButton from './ESigButton';
-import ESigDelay from './ESigDelay';
-import ESigName from './ESigName';
-import EMouse from './EMouse';
-import Group from 'zrender/src/container/Group';
-import BoundingRect from 'zrender/src/core/BoundingRect';
-
-class Signal extends Group {
-    constructor(model, style) {
-        super();
-        this._code = model.code;
-        this._type = model._type;
-        this.model = model;
-        this.style = style;
-        this.count = parseInt(model.lampPositionType);
-        this.lamps = new Array(this.count);
-        this.zlevel = model.zlevel;
-        this.z = 7;
-        this.create();
-        this.createMouseEvent();
-        this.transformRotation(this);
-        this.setState(model);
-    }
-
-    create() {
-        const model = this.model;
-        const style = this.style;
-        const drict = this.model.directionShowType == '01' ? -1 : 1;	// 朝向		左:右
-        const posit = this.model.positionType == '01' ? -1 : 1;		// 位置		上:下
-
-        // 信号机高柱矮柱
-        this.sigPost = new ESigPost({
-            zlevel: this.zlevel,
-            z: this.z,
-            style: style,
-            drict: drict,
-            type: model.lampPostType,
-            x: model.position.x,
-            y: model.position.y + posit * (style.Signal.distance + style.Section.line.width + style.Signal.lamp.radiusR)
-        });
-
-        // 信号灯
-        const endPoint = this.sigPost.getLampPosition(model.lampPostType);
-        this.lamps = [];
-        for (let i = 0; i < this.count; i++) {
-            const lamp = new ESigLamp({
-                zlevel: this.zlevel,
-                z: this.z,
-                style: style,
-                drict: drict,
-                x: endPoint.x + i * drict * style.Signal.lamp.radiusR * 2,
-                y: endPoint.y,
-                originX: model.position.x,
-                originY: model.position.y
-            });
-
-            this.lamps.push(lamp);
-        }
-
-        // 信号机名称
-        const sigNameX = model.position.x - drict * (style.Signal.post.standardWidth) + model.namePosition.x;
-        const sigNameY = model.position.y + posit * (style.Signal.distance + style.Section.line.width + style.Signal.lamp.radiusR * 2 + model.namePosition.y + style.Signal.text.distance);
-        const textAlign = style.Signal.text.isAlignCenter ? 'middle' : this.model.directionShowType == '01' ? 'right' : 'left';
-        const textVerticalAlign = posit == 1 ? 'top' : 'bottom';
-        this.sigName = new ESigName({
-            zlevel: this.zlevel,
-            z: this.z,
-            silent: false,
-            isNoRotation: style.Signal.text.isNoRotation,
-            style: style,
-            x: sigNameX,
-            y: sigNameY,
-            text: model.name,
-            fontWeight: style.Signal.text.fontWeight,
-            fontSize: style.Signal.text.fontSize,
-            fontFamily: style.fontFamily,
-            textFill: style.Signal.text.defaultColor,
-            textAlign: textAlign,
-            textVerticalAlign: textVerticalAlign
-        });
-
-        // 自动进路
-        const sigRouteH = style.Signal.route.direction ? this.count * style.Signal.lamp.radiusR * 2 : -style.Signal.lamp.radiusR * 2;
-        const sigRouteX = endPoint.x + (style.Signal.route.offset.x + sigRouteH) * drict;
-        const sigRouteY = endPoint.y + (style.Signal.route.offset.y);
-        this.sigRoute = new ESigRoute({
-            zlevel: this.zlevel,
-            z: this.z,
-            style: style,
-            x: sigRouteX,
-            y: sigRouteY,
-            drict: drict
-        });
-
-        // 自动通过
-        const sigAutoH = style.Signal.auto.direction ? this.count * style.Signal.lamp.radiusR * 2 : -style.Signal.lamp.radiusR * 2;
-        const sigAutoX = endPoint.x + (style.Signal.auto.offset.x + sigAutoH) * drict;
-        const sigAutoY = endPoint.y + (style.Signal.auto.offset.y);
-        this.sigAuto = new ESigAuto({
-            zlevel: this.zlevel,
-            z: this.z,
-            style: style,
-            count: this.count,
-            drict: drict,
-            x: sigAutoX,
-            y: sigAutoY,
-            width: style.Signal.auto.width,
-            fill: style.Signal.auto.autoRoute,
-            lineWidth: 0.6,
-            stroke: style.sidelineColor
-        });
-
-        // 延迟解锁
-        const sigDelayH = style.Signal.delay.direction ? this.count * style.Signal.lamp.radiusR * 2 : -style.Signal.lamp.radiusR * 2;
-        const sigDelayX = endPoint.x + (style.Signal.delay.offset.x + sigDelayH) * drict;
-        const sigDelayY = endPoint.y - (style.Signal.delay.offset.y) * posit;
-        this.sigDelay = new ESigDelay({
-            zlevel: this.zlevel,
-            z: this.z,
-            style: style,
-            x: sigDelayX,
-            y: sigDelayY,
-            fontWeight: style.Signal.delay.fontWeight,
-            fontSize: style.Signal.delay.fontSize,
-            fontFamily: style.fontFamily,
-            text: this.model.delayCount || '0',
-            textFill: style.Signal.delay.fontColor,
-            textAlign: drict > 0 ? 'right' : 'left',
-            textVerticalAlign: 'middle'
-        });
-
-        // 信号灯按钮
-        this.sigButton = new ESigButton({
-            zlevel: this.zlevel,
-            z: this.z,
-            style: style,
-            posit: posit,
-            show: model.buttonShow,
-            x: model.buttonPosition.x,
-            y: model.buttonPosition.y - posit * (style.Signal.button.distance + style.Signal.lamp.radiusR * 2)
-        });
-
-        this.add(this.sigPost);
-        this.lamps.forEach(lamp => { this.add(lamp); });
-        this.add(this.sigName);
-
-        this.style.Signal.text.show && model.nameShow ? this.sigName.show() : this.sigName.hide();
-        this.add(this.sigAuto);
-        this.add(this.sigRoute);
-        this.add(this.sigDelay);
-        // this.add(this.sigButton);
-    }
-
-    createMouseEvent() {
-        if (this.style.Signal.mouseOverStyle) {
-            this.mouseEvent = new EMouse(this);
-            this.add(this.mouseEvent);
-            this.on('mouseout', (e) => { this.mouseEvent.mouseout(e); });
-            this.on('mouseover', (e) => { this.mouseEvent.mouseover(e); });
-        }
-    }
-
-    // 整体旋转信号灯
-    transformRotation(device) {
-        if (this.model.rotate) {
-            device.eachChild(item => {
-                if (item instanceof Group) {
-                    this.transformRotation(item);
-                } else if (item && item.model && item.model.isNoRotation) {
-                    item.origin = [this.model.position.x, this.model.position.y];
-                    item.rotation = -Math.PI / 180 * Number(this.model.rotate);
-                    item.dirty();
-                }
-            });
-        }
-    }
-
-    // 关闭
-    close() {
-        if (this.count == 2 && this.model.lightType == '01') { // 双灯  物理点灯
-            if (this.lamps[0]) {
-                this.lamps[0].setStop(false);
-                this.lamps[0].setColor(this.style.Signal.lamp.redColor);
-            }
-            if (this.lamps[1]) {
-                this.lamps[1].setStop(false);
-                this.lamps[1].setColor(this.style.backgroundColor);
-            }
-        } else if (this.count == 2 && this.model.lightType == '02') { // 双灯 逻辑点灯
-            if (this.lamps[0]) {
-                this.lamps[0].setStop(true);
-                this.lamps[0].setColor(this.style.Signal.lamp.redColor);
-            }
-            if (this.lamps[1]) {
-                this.lamps[1].setStop(true);
-                this.lamps[1].setColor(this.style.backgroundColor);
-            }
-        } else if (this.count == 1 && this.model.lightType == '01') { // 单灯  物理点灯
-            if (this.lamps[0]) {
-                this.lamps[0].setStop(false);
-                if (this.model.useType == '05') {
-                    this.lamps[0].setColor(this.style.Signal.lamp.blueColor);
-                } else {
-                    this.lamps[0].setColor(this.style.Signal.lamp.redColor);
-                }
-            }
-        } else if (this.count == 1 && this.model.lightType == '02') { // 单灯 逻辑点灯
-            if (this.lamps[0]) {
-                this.lamps[0].setStop(true);
-                if (this.model.useType == '05') {
-                    this.lamps[0].setColor(this.style.Signal.lamp.blueColor);
-                } else {
-                    this.lamps[0].setColor(this.style.Signal.lamp.redColor);
-                }
-            }
-        } else if (this.count == 1) {
-            if (this.lamps[0]) {
-                if (this.model.useType == '05') {
-                    this.lamps[0].setColor(this.style.Signal.lamp.blueColor);
-                } else {
-                    this.lamps[0].setColor(this.style.Signal.lamp.redColor);
-                }
-            }
-        }
-    }
-
-    /* count 1单灯 2双灯 lightType 01物理点灯 02逻辑点灯*/
-    openPositive() {
-        if (this.count == 2 && this.model.lightType == '01') {
-            if (this.lamps[0]) {
-                this.lamps[0].setStop(false);
-                this.lamps[0].setColor(this.style.Signal.lamp.greenColor);
-            }
-            if (this.lamps[1]) {
-                this.lamps[1].setStop(false);
-                this.lamps[1].setColor(this.style.backgroundColor);
-            }
-        } else if (this.count == 2 && this.model.lightType == '02') {
-            if (this.lamps[0]) {
-                this.lamps[0].setStop(true);
-                this.lamps[0].setColor(this.style.Signal.lamp.greenColor);
-            }
-            if (this.lamps[1]) {
-                this.lamps[1].setStop(true);
-                this.lamps[1].setColor(this.style.backgroundColor);
-            }
-        } else if (this.count == 1 && this.model.lightType == '01') {
-            if (this.lamps[0]) {
-                this.lamps[0].setStop(false);
-                this.lamps[0].setColor(this.style.Signal.lamp.greenColor);
-            }
-        } else if (this.count == 1 && this.model.lightType == '02') {
-            if (this.lamps[0]) {
-                this.lamps[0].setStop(true);
-                this.lamps[0].setColor(this.style.Signal.lamp.greenColor);
-            }
-        }
-    }
-    /* count 1单灯 2双灯 lightType 01物理点灯 02逻辑点灯*/
-    openLateral() {
-        if (this.count == 2 && this.model.lightType == '01') {
-            if (this.lamps[0]) {
-                this.lamps[0].setStop(false);
-                this.lamps[0].setColor(this.style.backgroundColor);
-            }
-            if (this.lamps[1]) {
-                this.lamps[1].setStop(false);
-                this.lamps[1].setColor(this.style.Signal.lamp.yellowColor);
-            }
-        } else if (this.count == 2 && this.model.lightType == '02') {
-            if (this.lamps[0]) {
-                this.lamps[0].setStop(true);
-                this.lamps[0].setColor(this.style.backgroundColor);
-            }
-            if (this.lamps[1]) {
-                this.lamps[1].setStop(true);
-                this.lamps[1].setColor(this.style.Signal.lamp.yellowColor);
-            }
-        } else if (this.count == 1 && this.model.lightType == '01') {
-            if (this.lamps[0]) {
-                this.lamps[0].setStop(false);
-                // 出站信号机/阻隔信号机
-                if (['02', '06'].includes(this.model.useType)) {
-                    this.lamps[0].setColor(this.style.Signal.lamp.greenColor);
-                } else {
-                    this.lamps[0].setColor(this.style.Signal.lamp.whiteColor);
-                }
-            }
-        } else if (this.count == 1 && this.model.lightType == '02') {
-            if (this.lamps[0]) {
-                this.lamps[0].setStop(true);
-                this.lamps[0].setColor(this.style.Signal.lamp.greenColor);
-            }
-        }
-    }
-    // 列车进路
-    trainRoute() {
-        if (this.count == 1) {
-            /** 单灯 列兼调信号*/
-            this.lamps[0] && this.lamps[0].setColor(this.style.Signal.lamp.yellowColor);
-        }
-    }
-
-    // 调车进路
-    shuntRoute() {
-        if (this.count == 1) {
-            /** 单灯 列兼调信号*/
-            /** 单灯 阻挡兼调车信号*/
-            this.lamps[0] && this.lamps[0].setColor(this.style.Signal.lamp.whiteColor);
-        }
-    }
-
-    // 引导
-    guid() {
-        if (this.count == 2 && this.model.lightType == '01' && this.style.Signal.lamp.guidName != 'chengdu_03') { // 双灯 物理点灯 允许引导信号
-            if (this.lamps[0]) {
-                this.lamps[0].setStop(false);
-                this.lamps[0].setColor(this.style.Signal.lamp.redColor);
-            }
-            if (this.lamps[1]) {
-                this.lamps[1].setStop(false);
-                this.lamps[1].setColor(this.style.Signal.lamp.yellowColor);
-            }
-        } else if (this.count == 1 && this.model.lightType == '01' && this.style.Signal.lamp.guidName == 'chengdu_03') {
-            this.lamps[0].setStop(false);
-            this.lamps[0].setStyle({ fill: this.style.Signal.lamp.yellowColor, stroke: this.style.Signal.lamp.redColor, lineWidth: 2.5 });
-        }
-    }
-
-    // 封锁
-    block() {
-        if (this.count == 1) {
-            this.lamps[0].setColor(this.style.Signal.lamp.redColor);
-            // this.siglamp.setNameBorder(1)
-        }
-        this.sigName.setColor(this.style.Signal.text.blockColor);
-        if (this.style.Signal.text.nameBorderShow) {
-            this.sigName.setStyle({textBorderWidth: 1});
-            this.sigName.setColor('#fff');
-        }
-    }
-
-    // 功能封锁
-    functionBlock() {
-        if (this.count == 1) {
-            this.lamps[0].setColor(this.style.Signal.lamp.redColor);
-            // this.siglamp.setRectBlockByIndex(1, true);
-        }
-    }
-
-    // 信号保护区段监视状态显示
-    signalCheck() {
-        if (this.count == 1) {
-            this.lamps[0].setColor(this.style.Signal.lamp.redColor);
-            this.sigName.setColor(this.style.Signal.text.checkColor);
-        }
-    }
-
-    // 故障
-    fault() {
-        if (this.count == 2 && this.model.lightType == '01') { // 双灯 物理点灯
-            if (this.lamps[0]) {
-                this.lamps[0].setStop(false);
-                this.lamps[0].setColor(this.style.Signal.lamp.blueColor);
-            }
-            if (this.lamps[1]) {
-                this.lamps[1].setStop(false);
-                this.lamps[1].setColor(this.style.Signal.lamp.blueColor);
-            }
-        }
-    }
-
-    // 物理点灯
-    logicalLight() {
-        this.lamps.forEach(lamp => { lamp.setStop(false); });
-    }
-
-    // 逻辑点灯
-    physicsLight() {
-        this.lamps.forEach(lamp => { lamp.setStop(true); });
-    }
-
-    // 设置自动进路模式状态类型
-    setAutoRouteOpen() {
-        this.sigAuto.setColor(this.style.Signal.auto.autoRoute);
-        if (this.model.linkageAutoRouteShow) {
-            this.sigAuto.show();
-        } else {
-            this.sigAuto.hide();
-        }
-    }
-
-    // 信号机进路自动触发模式状态类型
-    setAutoTriggerOpen() {
-        this.sigAuto.setColor(this.style.Signal.auto.autoTrigger);
-        if (this.model.atsAutoTriggerShow) {
-            this.sigAuto.show();
-        } else {
-            this.sigAuto.hide();
-        }
-    }
-
-    // 设置自动信号模式状态类型
-    setAutoSignalOpen() {
-        this.sigRoute.show();
-    }
-
-    // 隐藏自动信号和自动进路
-    setAutoClose() {
-        this.sigAuto.hide();
-        this.sigAuto.setColor(this.style.backgroundColor);
-        this.sigRoute.hide();
-    }
-
-    // 自动信号和自动进路开始动画
-    setAutoFlicker() {
-        this.sigAuto.arrowsAnimation();
-    }
-
-    // 设置延时解锁
-    setDelayUnlock() {
-        this.sigDelay.show();
-    }
-
-    // 恢复状态
-    recover() {
-        this.sigName.setStyle({textBorderWidth: 0});
-        this.sigAuto.hide();
-        this.sigRoute.hide();
-        this.sigDelay.hide();
-        this.sigAuto.animationRecover();
-        this.sigName.setColor(this.style.Signal.text.defaultColor);
-        if (this.style.Signal.lamp.guidName == 'chengdu_03') {
-            this.lamps[0].setStyle({ lineWidth: this.style.Signal.lamp.borderWidth });
-        }
-    }
-
-    setState(model) {
-        this.recover();
-        /** 设置状态 (点灯类型)*/
-        switch (model.status) {
-        case '01': this.close(); break; 				// 关闭
-        case '02': this.openPositive(); break; 		// 开放正向
-        case '03': this.openLateral(); break; 			// 开放侧向
-        case '04': this.guid(); break; 				// 引导
-        case '05': this.block(); break; 				// 封锁
-        case '06': this.fault(); break; 				// 故障
-        case '07': this.block(); break; 				// 功能封锁
-        case '08': this.signalCheck(); break; 			// 信号保护区段检测
-        }
-
-        /** 进路性质类型*/
-        switch (model.natureType) {
-        case '01': this.trainRoute(); break;			// 列车进路
-        case '02': this.shuntRoute(); break;			// 调车进路
-        }
-
-        /** 设置点灯类型*/
-        switch (model.lightType) {
-        case '01': this.logicalLight(); break;			// 设置逻辑点灯
-        case '02': this.physicsLight(); break;			// 设置物理点灯
-        }
-
-        /**  设置自动类型*/
-        switch (model.autoType) {
-        case '01': this.setAutoClose(); break; 			// 隐藏 隐藏自动信号和自动进路
-        case '02': this.setAutoSignalOpen(); break; 	// 显示 设置自动信号模式状态类型
-        case '03': this.setAutoRouteOpen(); break; 		// 显示 设置自动进路模式状态类型
-        case '04': this.setAutoTriggerOpen(); break; 	// 显示 信号机进路自动触发模式状态类型
-        }
-
-        /** 延时解锁*/
-        switch (model.delayType) {
-        case '01': break; 	// 未延时解锁
-        case '02': this.setDelayUnlock(); break;		// 人工闭塞延时解锁
-        case '03': this.setDelayUnlock(); break;		// 自动闭塞延时解锁
-        }
-
-        /** 信号机进路办理，先停止动画，再判断当前颜色是否闪烁*/
-        if (model.routeSetting && (model.autoType == '03' || model.autoType == '04')) {
-            this.setAutoFlicker();
-        }
-    }
-
-    getBoundingRect() {
-        const rect = this.sigPost.getBoundingRect();
-        this.lamps.forEach(elem => {
-            rect.union(elem.getBoundingRect());
-        });
-        return rect;
-    }
-
-    getShapeTipPoint(opts) {
-        var rect = new BoundingRect(0, 0, 0, 0);
-        var drict = this.model.directionShowType == '01' ? -1 : 1;	// 朝向		左:右
-        var offsetY = this.model.positionType == '01' ? this.style.Signal.text.fontSize : 0;		// 位置		上:下
-        if (opts.val == '1' || opts.val == '2') {
-            rect = this.sigButton.getBoundingRect();
-        } else {
-            rect = this.sigPost.getBoundingRect();
-        }
-
-        return {
-            x: rect.x + drict * this.style.Signal.post.standardWidth,
-            y: rect.y - offsetY
-        };
-    }
-}
-
-export default Signal;
diff --git a/src/jmap/shape/Station/index.js b/src/jmap/shape/Station/index.js
deleted file mode 100644
index 68afa99e9..000000000
--- a/src/jmap/shape/Station/index.js
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
-*	车站
-*/
-import Group from 'zrender/src/container/Group';
-import ETextName from '../element/ETextName'; // 名称文字 (共有)
-
-export default class Station extends Group {
-    constructor(model, style) {
-        super();
-        this._code = model.code;
-        this._type = model._type;
-        this.zlevel = model.zlevel;
-        this.z = 40;
-        this.model = model;
-        this.style = style;
-        this.create();
-        this.setState(model);
-    }
-
-    create() {
-        const model = this.model;
-        const style = this.style;
-
-        if (model.visible) {
-            // 公里标名称是否显示
-            this.stationText = new ETextName({
-                zlevel: this.zlevel,
-                z: this.z,
-                position: [0, 0],
-                x: model.position.x,
-                y: model.position.y,
-                fontWeight: model.fontWeight,
-                fontSize: model.nameFont || 18,
-                fontFamily: style.fontFamily,
-                text: model.name,
-                textAlign: 'middle',
-                textVerticalAlign: 'top',
-                textFill: model.nameFontColor
-            });
-            this.add(this.stationText);
-            const path = window.location.href;
-            if (style.Station.kmPostShow || path.includes('/map/draw')) {
-                // 公里标是否显示
-                let direction = 1;
-                if (this.style.Station.kilometerPosition == 'up') {
-                    direction = -1;
-                }
-                this.mileageText = new ETextName({
-                    zlevel: this.zlevel,
-                    z: this.z,
-                    position: [0, 0],
-                    x: model.position.x,
-                    y: model.position.y + ((parseInt(model.nameFont) + 2) * direction),
-                    fontWeight: model.fontWeight,
-                    fontSize: model.kmPostFont || 18,
-                    fontFamily: style.fontFamily,
-                    text: model.kmPost,
-                    textAlign: 'middle',
-                    textVerticalAlign: 'top',
-                    textFill: model.kmPostFontColor
-                });
-                this.add(this.mileageText);
-                model.kmPostShow ? this.mileageText.show() : this.mileageText.hide();
-            }
-        }
-    }
-
-    // eslint-disable-next-line no-unused-vars
-    setState(model) {
-    }
-
-    getShapeTipPoint() {
-        return null;
-    }
-}
diff --git a/src/jmap/shape/StationControl/EArrow.js b/src/jmap/shape/StationControl/EArrow.js
deleted file mode 100644
index 7ed64d3fb..000000000
--- a/src/jmap/shape/StationControl/EArrow.js
+++ /dev/null
@@ -1,52 +0,0 @@
-import Polygon from 'zrender/src/graphic/shape/Polygon';
-import Group from 'zrender/src/container/Group';
-
-class ESigAuto extends Group {
-	constructor(model) {
-		super();
-		this.model = model;
-		this.create();
-	}
-
-	create() {
-		const model = this.model;
-
-		this.arrow = new Polygon({
-			zlevel: model.zlevel,
-			z: model.z,
-			shape: {
-				points: model.point
-			},
-			style: {
-				stroke: model.stroke,
-				lineWidth: model.lineWidth,
-				fill: model.fill
-			}
-		});
-		this.add(this.arrow);
-	}
-
-	// 停止动画
-	animationRecover() {
-		this.arrow.stopAnimation(false);
-	}
-
-	// 箭头颜色
-	setColor(color) {
-		this.arrow.setStyle('fill', color);
-	}
-
-	// 箭头闪烁
-	arrowsAnimation() {
-		const style = this.model.style;
-		const fill = this.arrow.style.Signal.fill;
-		this.arrow.animateStyle(true)
-			.when(1000, { fill: style.backgroundColor, stroke: style.backgroundColor })
-			.when(2000, { fill: fill, stroke: style.Signal.sidelineColor })
-			.when(3000, { fill: style.backgroundColor, stroke: style.backgroundColor })
-			.when(4000, { fill: fill, stroke: style.Signal.sidelineColor })
-			.start();
-	}
-}
-
-export default ESigAuto;
diff --git a/src/jmap/shape/StationControl/EMouse.js b/src/jmap/shape/StationControl/EMouse.js
deleted file mode 100644
index a26e61025..000000000
--- a/src/jmap/shape/StationControl/EMouse.js
+++ /dev/null
@@ -1,62 +0,0 @@
-import Group from 'zrender/src/container/Group';
-import Text from 'zrender/src/graphic/Text';
-
-export default class EMouse extends Group {
-    constructor(device) {
-        super();
-        this.device = device;
-        this.create();
-    }
-    create() {
-        this.text = new Text({
-            _subType: 'Text',
-            zlevel: this.device.zlevel,
-            z: this.device.z + 1,
-            position: [0, 0],
-            style: {
-                x: this.device.model.position.x - this.device.style.StationControl.lamp.distance / 2 + this.device.style.StationControl.lamp.offset.x,
-                y: this.device.model.position.y + this.device.style.StationControl.lamp.offset.y + this.device.style.StationControl.lamp.radiusR + this.device.style.StationControl.text.distance - 40,
-                fontWeight: this.device.style.StationControl.mouseOverStyle.fontWeight,
-                fontSize: this.device.style.StationControl.mouseOverStyle.fontSize,
-                fontFamily: this.device.style.StationControl.mouseOverStyle.fontFormat,
-                text: '',
-                textFill: this.device.style.StationControl.mouseOverStyle.fontColor,
-                textAlign: this.device.style.StationControl.mouseOverStyle.textAlign,
-                textVerticalAlign: this.device.style.StationControl.mouseOverStyle.textVerticalAlign
-            }
-        });
-
-        this.add(this.text);
-        this.text.hide();
-    }
-    setTextContext(text) {
-        if (text) {
-            this.text.setStyle('text', text);
-        }
-    }
-    mouseover(e) {
-        if (e.target) {
-            let name = '';
-            switch (e.target.parent._subType) {
-            case 'emergency':
-                name = '紧急站控';
-                break;
-            case 'center':
-                name = '中控';
-                break;
-            case 'substation':
-                name = '站控';
-                break;
-            }
-            // debugger;
-            this.setTextContext(name);
-            this.text.show();
-        }
-    }
-
-    mouseout(e) {
-        if (!this.device.model.down) {
-            this.text.hide();
-        }
-    }
-}
diff --git a/src/jmap/shape/StationControl/ESingleControl.js b/src/jmap/shape/StationControl/ESingleControl.js
deleted file mode 100644
index 0fc00029e..000000000
--- a/src/jmap/shape/StationControl/ESingleControl.js
+++ /dev/null
@@ -1,73 +0,0 @@
-import Arc from 'zrender/src/graphic/shape/Arc';
-import Group from 'zrender/src/container/Group';
-import Text from 'zrender/src/graphic/Text';
-
-/** 单个控制灯*/
-export default class ESingleControl extends Group {
-	constructor(model) {
-		super();
-		this.model = model;
-		this.zlevel = model.zlevel;
-		this._subType = model._subType;
-		this.z = 20;
-		this.onmouseover = model.mouseover;
-		this.onmouseout = model.mouseout;
-		this.create(model);
-	}
-
-	create(model) {
-		var _subType = 'ControlSignal';
-		var _val = '0';
-		if (model.pop) {
-			_subType = 'ControlButton';
-			_val = '1';
-		}
-		var _nameType = this._subType;
-		this.control = new Arc({
-			pop: model.pop,
-			_subType: _subType,
-			_nameType: _nameType,
-			_val: _val,
-			zlevel: this.zlevel,
-			z: this.z,
-			shape: {
-				cx: model.point.x,
-				cy: model.point.y,
-				r: model.style.StationControl.lamp.radiusR
-			},
-			style: {
-				lineWidth: 0.5,
-				fill: model.style.StationControl.lamp.grayColor,
-				stroke: model.style.StationControl.lamp.grayColor
-			}
-		});
-
-		this.text = new Text({
-			pop: model.pop,
-			_subType: _subType,
-			zlevel: this.zlevel,
-			z: this.z,
-			position: [0, 0],
-			style: {
-				x: model.point.x,
-				y: model.point.y + model.style.StationControl.lamp.radiusR + model.style.StationControl.text.distance,
-				fontWeight: model.style.StationControl.text.fontWeight,
-				fontSize: model.style.StationControl.text.fontSize,
-				fontFamily: model.style.StationControl.text.fontFormat,
-				text: model.context,
-				textFill: model.style.StationControl.text.fontColor,
-				textAlign: model.style.StationControl.text.textAlign,
-				textVerticalAlign: model.style.StationControl.text.textVerticalAlign
-			}
-		});
-
-		this.add(this.control);
-		this.add(this.text);
-	}
-
-	setColor(color) {
-		if (color) {
-			this.control.setStyle('fill', color);
-		}
-	}
-}
diff --git a/src/jmap/shape/StationControl/index.js b/src/jmap/shape/StationControl/index.js
deleted file mode 100644
index 953981194..000000000
--- a/src/jmap/shape/StationControl/index.js
+++ /dev/null
@@ -1,166 +0,0 @@
-/*
-*	控制模式
-*/
-import Group from 'zrender/src/container/Group';
-import ESingleControl from './ESingleControl'; // 单个信号灯 (私有)
-import EArrow from './EArrow';
-import { arrow } from '../utils/ShapePoints';
-import EMouse from './EMouse';
-
-/** 控制模式*/
-export default class StationControl extends Group {
-	constructor(model, style) {
-		super();
-		this.selected = false;
-		this._code = model.code;
-		this._type = model._type;
-		this.zlevel = model.zlevel;
-		this.z = 1;
-		this.model = model;
-		this.style = style;
-		this.create();
-		this.createMouseEvent();
-		this.setState(model);
-	}
-
-	create() {
-		const model = this.model;
-		// 紧急站控
-		if (this.style.StationControl.lamp.emergencyControlShow) {
-			this.emergencyControl = new ESingleControl({
-				_subType: 'emergency',
-				style: this.style,
-				zlevel: this.zlevel,
-				z: this.z,
-				point: {
-					x: model.position.x - this.style.StationControl.lamp.distance * 3 / 2 + this.style.StationControl.lamp.offset.x,
-					y: model.position.y + this.style.StationControl.lamp.offset.y
-				},
-				context: model.jjzkContent,
-				pop: false
-			});
-			this.add(this.emergencyControl);
-		}
-		// 中控按钮
-		if (this.style.StationControl.lamp.centerControlShow) {
-			this.centerControl = new ESingleControl({
-				_subType: 'center',
-				style: this.style,
-				zlevel: this.zlevel,
-				z: this.z,
-				point: {
-					x: model.position.x - this.style.StationControl.lamp.distance / 2 + this.style.StationControl.lamp.offset.x,
-					y: model.position.y + this.style.StationControl.lamp.offset.y
-				},
-				context: model.zokContent,
-				pop: false
-			});
-			this.add(this.centerControl);
-		}
-		// 站控按钮
-		if (this.style.StationControl.lamp.substationControlShow) {
-			this.substationControl = new ESingleControl({
-				_subType: 'substation',
-				style: this.style,
-				zlevel: this.zlevel,
-				z: this.z,
-				point: {
-					x: model.position.x + this.style.StationControl.lamp.distance / 2 + this.style.StationControl.lamp.offset.x,
-					y: model.position.y + this.style.StationControl.lamp.offset.y
-				},
-				context: model.zakContent,
-				pop: false
-			});
-			this.add(this.substationControl);
-		}
-		// 联锁控
-		if (this.style.StationControl.lamp.interconnectedControlShow) {
-			this.interconnectedControl = new ESingleControl({
-				_subType: 'interconnected',
-				style: this.style,
-				zlevel: this.zlevel,
-				z: this.z,
-				point: {
-					x: model.position.x + this.style.StationControl.lamp.distance * 3 / 2 + this.style.StationControl.lamp.offset.x,
-					y: model.position.y + this.style.StationControl.lamp.offset.y
-				},
-				context: model.lskContent || '联锁控',
-				pop: false
-			});
-			this.add(this.interconnectedControl);
-		}
-		// 箭头
-		if (this.style.StationControl.arrow.show) {
-			const point = arrow(this.model.position.x, this.model.position.y + this.style.StationControl.lamp.radiusR / 2, this.style.StationControl.lamp.distance / 6, this.style.StationControl.lamp.radiusR * 0.8);
-			this.arrowsControl = new EArrow({
-				zlevel: this.zlevel,
-				z: this.z,
-				style: this.style,
-				count: this.count,
-				drict: 1,
-				point: point,
-				x: model.position.x + this.style.StationControl.lamp.offset.x,
-				y: model.position.y + this.style.StationControl.lamp.radiusR / 2 + this.style.StationControl.lamp.offset.y,
-				fill: this.style.StationControl.lamp.grayColor,
-				lineWidth: 1,
-				stroke: this.style.sidelineColor
-			});
-			this.add(this.arrowsControl);
-		}
-	}
-
-	// 设置状态
-	setState(model) {
-		switch (model.status) {
-		case '00': // 无状态
-			this.emergencyControl && this.emergencyControl.setColor(this.style.StationControl.lamp.grayColor);
-			this.substationControl && this.substationControl.setColor(this.style.StationControl.lamp.grayColor);
-			this.centerControl && this.centerControl.setColor(this.style.StationControl.lamp.grayColor);
-			break;
-		case '01': // 中控
-			this.emergencyControl && this.emergencyControl.setColor(this.style.StationControl.lamp.grayColor);
-			this.substationControl && this.substationControl.setColor(this.style.StationControl.lamp.grayColor);
-			this.centerControl && this.centerControl.setColor(this.style.StationControl.lamp.greenColor);
-			break;
-		case '02': // 站控
-			this.emergencyControl && this.emergencyControl.setColor(this.style.StationControl.lamp.grayColor);
-			this.substationControl && this.substationControl.setColor(this.style.StationControl.lamp.yellowColor);
-			this.centerControl && this.centerControl.setColor(this.style.StationControl.lamp.grayColor);
-			break;
-		case '03': // 紧急站控
-			this.emergencyControl && this.emergencyControl.setColor(this.style.StationControl.lamp.redColor);
-			this.substationControl && this.substationControl.setColor(this.style.StationControl.lamp.grayColor);
-			this.centerControl && this.centerControl.setColor(this.style.StationControl.lamp.grayColor);
-			break;
-		}
-	}
-
-	/** 按钮是否按下*/
-	isPop(e) {
-		for (var i = 0; i < this.childCount(); i++) {
-			var rect = this.childAt(i).getBoundingRect();
-			if (rect.contain(e.offsetX, e.offsetY) && this.childAt(i).pop) {
-				return true;
-			}
-		}
-	}
-	createMouseEvent() {
-		if (this.style.ZcControl.mouseOverStyle) {
-			this.mouseEvent = new EMouse(this);
-			this.add(this.mouseEvent);
-			this.on('mouseout', (e) => { this.mouseEvent.mouseout(e); });
-			this.on('mouseover', (e) => { this.mouseEvent.mouseover(e); });
-		}
-	}
-	getShapeTipPoint() {
-		if (this.stationControl) {
-			var distance = 2;
-			var rect = this.stationControl.getBoundingRect();
-			return {
-				x: rect.x + rect.width / 2,
-				y: rect.y - distance
-			};
-		}
-		return null;
-	}
-}
diff --git a/src/jmap/shape/StationCounter/index.js b/src/jmap/shape/StationCounter/index.js
deleted file mode 100644
index 710a97585..000000000
--- a/src/jmap/shape/StationCounter/index.js
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
-*	计数器
-*/
-import Polyline from 'zrender/src/graphic/shape/Polyline';
-import Group from 'zrender/src/container/Group';
-import Text from 'zrender/src/graphic/Text';
-
-export default class StationCounter extends Group {
-	constructor(model, style) {
-		super();
-		this._code = model.code;
-		this._type = model._type;
-		this.model = model;
-		this.style = style;
-		this.zlevel = model.zlevel;
-		this.z = 30;
-		this.create();
-		this.setState(model);
-	}
-
-	create() {
-		const model = this.model;
-		const style = this.style;
-		this.counter = new Text({
-			zlevel: this.zlevel,
-			z: this.z,
-			position: [0, 0],
-			style: {
-				x: model.position.x,
-				y: model.position.y,
-				fontWeight: 'normal',
-				fontSize: style.textFontSize,
-				fontFamily: style.fontFamily,
-				text: model.val,
-				textFill: style.StationCounter.text.fontColor,
-				textAlign: 'middle',
-				textStrokeWidth: 1
-			}
-		});
-
-		this.rect = this.counter.getBoundingRect();
-
-		this.vPadding = 0;
-		this.lPadding = 2;
-		this.table = new Polyline({
-			zlevel: this.zlevel,
-			z: this.z,
-			shape: {
-				points: [
-					[this.rect.x - this.lPadding, this.rect.y - this.vPadding],
-					[this.rect.x + this.lPadding + this.rect.width, this.rect.y - this.vPadding],
-					[this.rect.x + this.lPadding + this.rect.width, this.rect.y + this.vPadding + this.rect.height],
-					[this.rect.x - this.lPadding, this.rect.y + this.vPadding + this.rect.height],
-					[this.rect.x - this.lPadding, this.rect.y - this.vPadding]]
-			},
-			style: {
-				stroke: style.StationCounter.text.borderColor
-			}
-		});
-
-		this.counterName = new Text({
-			zlevel: this.zlevel,
-			z: this.z,
-			position: [0, 0],
-			style: {
-				x: model.position.x,
-				y: model.position.y + this.rect.width + this.vPadding + style.textFontSize + style.StationCounter.text.distance,
-				fontWeight: 'bold',
-				fontSize: style.textFontSize,
-				fontFamily: style.fontFamily,
-				text: model.name,
-				textFill: style.StationCounter.text.fontColor,
-				textAlign: 'middle',
-				textVerticalAlign: 'top',
-				textStrokeWidth: 1
-			}
-		});
-		this.add(this.counterName);
-		this.add(this.table);
-		this.add(this.counter);
-	}
-
-	setState(model) {
-	}
-
-	getShapeTipPoint() {
-		return null;
-	}
-}
-
diff --git a/src/jmap/shape/StationDelayUnlock/index.js b/src/jmap/shape/StationDelayUnlock/index.js
deleted file mode 100644
index 2fe0f7b35..000000000
--- a/src/jmap/shape/StationDelayUnlock/index.js
+++ /dev/null
@@ -1,107 +0,0 @@
-/*
-*	延迟解锁
-*/
-import Rect from 'zrender/src/graphic/shape/Rect';
-import Text from 'zrender/src/graphic/Text';
-import Group from 'zrender/src/container/Group';
-
-export default class StationDelayUnlock extends Group {
-	constructor(model, style) {
-		super();
-		this._code = model.code;
-		this._type = model._type;
-		this.model = model;
-		this.style = style;
-		this.zlevel = model.zlevel;
-		this.z = 1;
-		this.create();
-		this.setState(model);
-	}
-
-	create() {
-		const model = this.model;
-		const style = this.style;
-		this.text = new Text({
-			zlevel: this.zlevel,
-			z: this.z,
-			position: [0, 0],
-			style: {
-				x: model.position.x,
-				y: model.position.y,
-				fontWeight: 'normal',
-				fontSize: model.textFont,
-				fontFamily: style.fontFamily,
-				text: model.deviceName + ' ',
-				textFill: style.StationDelayUnlock.text.fontColor,
-				textStrokeWidth: 1,
-				textAlign: 'left'
-			}
-		});
-
-		const fontSize = parseInt(model.textFont.split(' ')[0]) || 30;
-		this.time = new Text({
-			zlevel: this.zlevel,
-			z: this.z,
-			position: [0, 0],
-			style: {
-				x: model.position.x,
-				y: model.position.y + fontSize + style.StationDelayUnlock.text.distance,
-				fontWeight: 'normal',
-				fontSize: model.textFont,
-				fontFamily: style.fontFamily,
-				text: model.remainTime || '',
-				textFill: style.StationDelayUnlock.text.fontColor,
-				textStrokeWidth: 1,
-				textAlign: 'left'
-			}
-		});
-		this.add(this.text);
-		this.add(this.time);
-
-		this.lPadding = 3;
-		this.vPadding = 3;
-		this.rect = this.getBoundingRect();
-		if (this.rect.width < 35) this.rect.width = 35;
-		if (this.rect.height < 20) this.rect.height = 20;
-
-		this.table = new Rect({
-			zlevel: this.zlevel,
-			z: this.z - 1,
-			shape: {
-				x: model.position.x - this.lPadding,
-				y: model.position.y - this.vPadding,
-				width: this.rect.width + this.lPadding * 2,
-				height: this.rect.height + this.vPadding * 2
-			},
-			style: {
-				stroke: style.StationDelayUnlock.text.borderColor,
-				fill: style.backgroundColor
-			}
-		});
-		this.add(this.table);
-	}
-
-	/** 延时解锁关闭*/
-	delayClose() {
-		this.time.setStyle('text', '');
-		this.text.setStyle('text', '');
-		this.table.setStyle('stroke', this.style.backgroundColor);
-	}
-
-	/** 延时解锁计数*/
-	delayUnlock() {
-		this.table.setStyle('stroke', this.style.sidelineColor);
-		this.time.setStyle('text', '' + this.model.remainTime);
-	}
-
-	setState(model) {
-		switch (model.status) {
-		case '01': this.delayClose(); break; // 关闭
-		case '02': this.delayUnlock(); break; // 延迟解锁
-		}
-	}
-
-	getShapeTipPoint() {
-		return null;
-	}
-}
diff --git a/src/jmap/shape/StationStand/EDetain.js b/src/jmap/shape/StationStand/EDetain.js
deleted file mode 100644
index 3a118f726..000000000
--- a/src/jmap/shape/StationStand/EDetain.js
+++ /dev/null
@@ -1,53 +0,0 @@
-import Group from 'zrender/src/container/Group';
-import Text from 'zrender/src/graphic/Text';
-
-class EDetain extends Group {
-	constructor(model) {
-		super();
-		this.model = model;
-		this.isNew = false;
-	}
-
-	create() {
-		if (!this.isNew) {
-			const model = this.model;
-			const style = this.model.style;
-
-			this.isNew = true;
-			this.detain = new Text({
-				zlevel: model.zlevel,
-				z: model.z,
-				position: [0, 0],
-				style: {
-					x: model.x,
-					y: model.y,
-					text: style.StationStand.detainCar.text,
-					textAlign: model.textAlign,
-					textVerticalAlign: model.textVerticalAlign,
-					fontSize: `${style.StationStand.stand.headFontSize} px  ${style.fontFamily}`,
-					textFill: style.StationStand.detainCar.centerTrainColor,
-					textStroke: style.backgroundColor
-				}
-			});
-
-			this.add(this.detain);
-		}
-	}
-
-	setColor(color) {
-		this.create();
-		this.detain.setStyle('textFill', color);
-	}
-
-	hide() {
-		this.create();
-		this.detain.hide();
-	}
-
-	show() {
-		this.create();
-		this.detain.show();
-	}
-}
-
-export default EDetain;
diff --git a/src/jmap/shape/StationStand/EJump.js b/src/jmap/shape/StationStand/EJump.js
deleted file mode 100644
index aad405c95..000000000
--- a/src/jmap/shape/StationStand/EJump.js
+++ /dev/null
@@ -1,87 +0,0 @@
-import Group from 'zrender/src/container/Group';
-import Text from 'zrender/src/graphic/Text';
-import Arc from 'zrender/src/graphic/shape/Arc';
-
-class EJump extends Group {
-	constructor(model) {
-		super();
-		this.model = model;
-		this.isNew = false;
-		this.create();
-		this.setStatus(model.jumpStopStatus);
-	}
-
-	create() {
-		if (!this.isNew) {
-			const model = this.model;
-			const style = this.model.style;
-
-			this.isNew = true;
-			this.jump = new Text({
-				zlevel: model.zlevel,
-				z: model.z,
-				style: {
-					x: model.x,
-					y: model.y,
-					fontWeight: 'normal',
-					fontSize: style.StationStand.common.textFontSize,
-					fontFamily: style.fontFamily,
-					text: style.StationStand.jump.text,
-					textFill: style.StationStand.jump.textColor,
-					textAlign: model.textAlign,
-					textVerticalAlign: model.textVerticalAlign
-				}
-			});
-			this.jumpArc = new Arc({
-				zlevel: model.zlevel,
-				z: model.z,
-				shape: {
-					cx: model.cx,
-					cy: model.cy,
-					r: style.StationStand.jump.r
-				},
-				style: {
-					stroke: style.StationStand.jump.arcColor,
-					fill: style.StationStand.jump.fillColor
-				}
-			});
-			this.add(this.jumpArc);
-			this.add(this.jump);
-			this.jumpArc.hide();
-		}
-	}
-
-	setName(val) {
-		this.create();
-		this.jump.setStyle('text', val);
-	}
-	setStatus(val) {
-		switch (val) {
-		case '03':
-			this.jumpArc.show();
-			break;
-		case '02':
-			this.jumpArc.hide();
-			break;
-		case '01':
-			this.jumpArc.hide();
-			break;
-		}
-	}
-	setColor(color) {
-		this.create();
-		this.jump.setStyle('textFill', color);
-	}
-
-	hide() {
-		this.create();
-		this.jump.hide();
-	}
-
-	show() {
-		this.create();
-		this.jump.show();
-	}
-}
-
-export default EJump;
diff --git a/src/jmap/shape/StationStand/ELevel.js b/src/jmap/shape/StationStand/ELevel.js
deleted file mode 100644
index 4f5e8ae39..000000000
--- a/src/jmap/shape/StationStand/ELevel.js
+++ /dev/null
@@ -1,57 +0,0 @@
-import Group from 'zrender/src/container/Group';
-import Text from 'zrender/src/graphic/Text';
-
-class ELevel extends Group {
-	constructor(model) {
-		super();
-		this.model = model;
-		this.isNew = false;
-	}
-
-	create() {
-		if (!this.isNew) {
-			const model = this.model;
-			const style = this.model.style;
-
-			this.isNew = true;
-			this.level = new Text({
-				zlevel: model.zlevel,
-				z: model.z,
-				style: {
-					x: model.x,
-					y: model.y,
-					fontWeight: 'normal',
-					fontSize: style.StationStand.common.textFontSize,
-					fontFamily: style.fontFamily,
-					text: model.name,
-					textFill: style.StationStand.level.textColor,
-					textAlign: 'middle'
-				}
-			});
-
-			this.add(this.level);
-		}
-	}
-
-	setName(val) {
-		this.create();
-		this.level.setStyle('text', val);
-	}
-
-	setColor(color) {
-		this.create();
-		this.level.setStyle('textFill', color);
-	}
-
-	hide() {
-		this.create();
-		this.level.hide();
-	}
-
-	show() {
-		this.create();
-		this.level.show();
-	}
-}
-
-export default ELevel;
diff --git a/src/jmap/shape/StationStand/EMouse.js b/src/jmap/shape/StationStand/EMouse.js
deleted file mode 100644
index ecf66d1c9..000000000
--- a/src/jmap/shape/StationStand/EMouse.js
+++ /dev/null
@@ -1,38 +0,0 @@
-import Group from 'zrender/src/container/Group';
-import Rect from 'zrender/src/graphic/shape/Rect';
-
-export default class EMouse extends Group {
-	constructor(device) {
-		super();
-		this.device = device;
-		this.zlevel = device.zlevel;
-		this.style = device.style;
-		this.create();
-	}
-
-	create() {
-		this.border = new Rect({
-			silent: true,
-			zlevel: this.zlevel,
-			z: 0,
-			shape: this.device.getBoundingRect(),
-			style: {
-				lineDash: this.style.StationStand.mouseOverStyle.borderLineDash,
-				stroke: this.style.StationStand.mouseOverStyle.borderLineColor,
-				fill: this.style.transparentColor
-			}
-		});
-		this.border.hide();
-		this.add(this.border);
-	}
-
-	mouseover(e) {
-		this.border.show();
-	}
-
-	mouseout(e) {
-		if (!this.device.model.down) {
-			this.border.hide();
-		}
-	}
-}
diff --git a/src/jmap/shape/StationStand/EReentry.js b/src/jmap/shape/StationStand/EReentry.js
deleted file mode 100644
index 1c32388b9..000000000
--- a/src/jmap/shape/StationStand/EReentry.js
+++ /dev/null
@@ -1,49 +0,0 @@
-import Group from 'zrender/src/container/Group';
-import Polygon from 'zrender/src/graphic/shape/Polygon';
-import { flashlight } from '../utils/ShapePoints.js';
-
-class EReentry extends Group {
-	constructor(model) {
-		super();
-		this.model = model;
-		this.isNew = false;
-	}
-
-	create() {
-		if (!this.isNew) {
-			const model = this.model;
-
-			this.isNew = true;
-			this.reentry = new Polygon({
-				zlevel: model.zlevel,
-				z: model.z,
-				shape: {
-					points: flashlight(model.x, model.y, model.drict, 10, 5, 0, 0, 4)
-				},
-				style: {
-					lineWidth: model.lineWidth,
-					fill: model.fill
-				}
-			});
-
-			this.add(this.reentry);
-		}
-	}
-
-	setColor(color) {
-		this.create();
-		this.reentry.setStyle('textFill', color);
-	}
-
-	hide() {
-		this.create();
-		this.reentry.hide();
-	}
-
-	show() {
-		this.create();
-		this.reentry.show();
-	}
-}
-
-export default EReentry;
diff --git a/src/jmap/shape/StationStand/ESafeDoor.js b/src/jmap/shape/StationStand/ESafeDoor.js
deleted file mode 100644
index 7e51251f7..000000000
--- a/src/jmap/shape/StationStand/ESafeDoor.js
+++ /dev/null
@@ -1,80 +0,0 @@
-import Group from 'zrender/src/container/Group';
-import Rect from 'zrender/src/graphic/shape/Rect';
-
-class ESafeDoor extends Group {
-	constructor(model) {
-		super();
-		this.model = model;
-		this.create();
-	}
-
-	create() {
-		const model = this.model;
-		const style = this.model.style;
-		const padding = 0.1;
-
-		this.safeL = new Rect({
-			zlevel: model.zlevel,
-			z: model.z,
-			shape: {
-				x: model.x - model.width / 2 - padding,
-				y: model.y,
-				width: model.width / 4 + padding,
-				height: model.height
-			},
-			style: {
-				lineWidth: 0,
-				stroke: style.StationStand.safetyDoor.defaultColor,
-				fill: style.StationStand.safetyDoor.defaultColor
-			}
-		});
-
-		this.safeC = new Rect({
-			zlevel: model.zlevel,
-			z: model.z,
-			shape: {
-				x: model.x - model.width / 4 - padding,
-				y: model.y,
-				width: model.width / 2 + padding * 2,
-				height: model.height
-			},
-			style: {
-				lineWidth: 0,
-				stroke: style.StationStand.safetyDoor.defaultColor,
-				fill: style.StationStand.safetyDoor.defaultColor
-			}
-		});
-
-		this.safeR = new Rect({
-			zlevel: model.zlevel,
-			z: model.z,
-			shape: {
-				x: model.x + model.width / 4,
-				y: model.y,
-				width: model.width / 4 + padding,
-				height: model.height
-			},
-			style: {
-				lineWidth: 0,
-				stroke: style.StationStand.safetyDoor.defaultColor,
-				fill: style.StationStand.safetyDoor.defaultColor
-			}
-		});
-
-		this.add(this.safeL);
-		this.add(this.safeC);
-		this.add(this.safeR);
-	}
-
-	hasDoor(show) {
-		show ? this.safeC.hide() : this.safeC.show();
-	}
-
-	setColor(color) {
-		this.safeL.setStyle('fill', color);
-		this.safeC.setStyle('fill', color);
-		this.safeR.setStyle('fill', color);
-	}
-}
-
-export default ESafeDoor;
diff --git a/src/jmap/shape/StationStand/ESafeEmergent.js b/src/jmap/shape/StationStand/ESafeEmergent.js
deleted file mode 100644
index 350398f51..000000000
--- a/src/jmap/shape/StationStand/ESafeEmergent.js
+++ /dev/null
@@ -1,48 +0,0 @@
-import Group from 'zrender/src/container/Group';
-import Isogon from 'zrender/src/graphic/shape/Isogon';
-
-class ESafeEmergent extends Group {
-	constructor(model) {
-		super();
-		this.model = model;
-		this.isNew = false;
-	}
-
-	create() {
-		if (!this.isNew) {
-			const model = this.model;
-			const style = this.model.style;
-
-			this.isNew = true;
-			this.emergent = new Isogon({
-				zlevel: model.zlevel,
-				z: model.z,
-				shape: {
-					x: model.x,
-					y: model.y,
-					r: model.r,
-					n: model.n
-				},
-				style: {
-					lineWidth: 0,
-					stroke: style.StationStand.standEmergent.closeColor,
-					fill: style.StationStand.standEmergent.closeColor
-				}
-			});
-
-			this.add(this.emergent);
-		}
-	}
-
-	hide() {
-		this.create();
-		this.emergent.hide();
-	}
-
-	show() {
-		this.create();
-		this.emergent.show();
-	}
-}
-
-export default ESafeEmergent;
diff --git a/src/jmap/shape/StationStand/ESafeStand.js b/src/jmap/shape/StationStand/ESafeStand.js
deleted file mode 100644
index d9b6d7e91..000000000
--- a/src/jmap/shape/StationStand/ESafeStand.js
+++ /dev/null
@@ -1,39 +0,0 @@
-import Group from 'zrender/src/container/Group';
-import Rect from 'zrender/src/graphic/shape/Rect';
-
-class ESafeStand extends Group {
-	constructor(model) {
-		super();
-		this.model = model;
-		this.create();
-	}
-
-	create() {
-		const model = this.model;
-		const style = this.model.style;
-
-		this.stand = new Rect({
-			zlevel: model.zlevel,
-			z: model.z,
-			shape: {
-				x: model.x,
-				y: model.y,
-				width: model.width,
-				height: model.height
-			},
-			style: {
-				lineWidth: 0,
-				stroke: style.sidelineColor,
-				fill: style.StationStand.stand.spareColor
-			}
-		});
-
-		this.add(this.stand);
-	}
-
-	setColor(color) {
-		this.stand.setStyle('fill', color);
-	}
-}
-
-export default ESafeStand;
diff --git a/src/jmap/shape/StationStand/ETime.js b/src/jmap/shape/StationStand/ETime.js
deleted file mode 100644
index 436f01981..000000000
--- a/src/jmap/shape/StationStand/ETime.js
+++ /dev/null
@@ -1,57 +0,0 @@
-import Group from 'zrender/src/container/Group';
-import Text from 'zrender/src/graphic/Text';
-
-class ETime extends Group {
-	constructor(model) {
-		super();
-		this.model = model;
-		this.isNew = false;
-	}
-
-	create() {
-		if (!this.isNew) {
-			const model = this.model;
-			const style = this.model.style;
-
-			this.isNew = true;
-			this.time = new Text({
-				zlevel: model.zlevel,
-				z: model.z,
-				style: {
-					x: model.x,
-					y: model.y,
-					fontWeight: 'normal',
-					fontSize: style.StationStand.common.textFontSize,
-					fontFamily: style.fontFamily,
-					text: model.name,
-					textFill: style.StationStand.stopTime.textColor,
-					textAlign: 'middle'
-				}
-			});
-
-			this.add(this.time);
-		}
-	}
-
-	setName(val) {
-		this.create();
-		this.time.setStyle('text', val);
-	}
-
-	setColor(color) {
-		this.create();
-		this.time.setStyle('textFill', color);
-	}
-
-	hide() {
-		this.create();
-		this.time.hide();
-	}
-
-	show() {
-		this.create();
-		this.time.show();
-	}
-}
-
-export default ETime;
diff --git a/src/jmap/shape/StationStand/index.js b/src/jmap/shape/StationStand/index.js
deleted file mode 100644
index f9afaa17d..000000000
--- a/src/jmap/shape/StationStand/index.js
+++ /dev/null
@@ -1,417 +0,0 @@
-/**/
-import Group from 'zrender/src/container/Group';
-import ETime from './ETime';
-import ELevel from './ELevel';
-import EReentry from './EReentry';
-import EDetain from './EDetain';
-import ESafeDoor from './ESafeDoor';
-import ESafeStand from './ESafeStand';
-import ESafeEmergent from './ESafeEmergent';
-import EMouse from './EMouse';
-import EJump from './EJump';
-
-class StationStand extends Group {
-    constructor(model, style) {
-        super();
-        this._code = model.code;
-        this._type = model._type;
-        this.model = model;
-        this.style = style;
-        this.zlevel = model.zlevel;
-        this.z = 1;
-        this.doors = new Group();
-        this.create();
-        this.createMouseEvent();
-        this.setVisible(model.visible);
-        this.setState(model);
-    }
-    create() {
-        const model = this.model;
-        const style = this.style;
-        const drict = model.doorLocationType == '01' ? 1 : -1;
-
-        /** 列车站台*/
-        const standH = drict > 0 ? style.StationStand.safetyDoor.height : model.height;
-        const standX = model.position.x - model.width / 2;
-        const standY = model.position.y + drict * (style.StationStand.safetyDoor.distance + standH);
-        this.safeStand = new ESafeStand({
-            zlevel: this.zlevel,
-            z: this.z,
-            style: style,
-            x: standX,
-            y: standY,
-            width: model.width,
-            height: model.height
-        });
-        this.add(this.safeStand);
-
-        if (model.direction != '03') {
-            /** 屏蔽门*/
-            this.safeDoor = new ESafeDoor({
-                zlevel: this.zlevel,
-                z: this.z,
-                style: style,
-                x: model.position.x,
-                y: model.position.y,
-                width: model.width,
-                height: style.StationStand.safetyDoor.height,
-                show: model.hasDoor
-            });
-
-            /** 站台紧急关闭*/
-            const emergentH = drict > 0 ? style.StationStand.standEmergent.mergentR + style.StationStand.safetyDoor.height : style.StationStand.standEmergent.mergentR;
-            const emergentX = model.position.x + drict * (style.StationStand.standEmergent.offset.x);
-            const emergentY = model.position.y + drict * (style.StationStand.standEmergent.offset.y + emergentH);
-            this.emergent = new ESafeEmergent({
-                zlevel: this.zlevel,
-                z: this.z + 1,
-                style: style,
-                x: emergentX,
-                y: emergentY,
-                r: style.StationStand.standEmergent.mergentR,
-                n: 4
-            });
-
-            /** 站台折返策略*/
-            const reentryD = style.StationStand.reentry.position ? model.height + 6 : -style.StationStand.safetyDoor.distance - style.StationStand.safetyDoor.height;
-            const reentryH = drict > 0 ? style.StationStand.standEmergent.mergentR : style.StationStand.standEmergent.mergentR + style.StationStand.safetyDoor.distance + reentryD;
-            const reentryX = model.position.x - (style.StationStand.reentry.position || drict) * (style.StationStand.reentry.offset.x - model.width / 2);
-            const reentryY = model.position.y + (style.StationStand.reentry.position || drict) * (style.StationStand.reentry.offset.y) + drict * reentryH;
-            this.reentry = new EReentry({
-                zlevel: this.zlevel,
-                z: this.z + 1,
-                style: style,
-                drict: drict,
-                x: reentryX,
-                y: reentryY,
-                lineWidth: 0,
-                fill: style.StationStand.reentry.noHumanColor
-            });
-
-            const distance = style.StationStand.safetyDoor.height * 2 - style.StationStand.stand.headFontSize / 2 - 2;
-
-            /** 站台扣车*/
-            const detainD = style.StationStand.detainCar.position ? model.height - distance : -style.StationStand.safetyDoor.height;
-            const detainH = drict > 0 ? style.StationStand.standEmergent.mergentR : style.StationStand.standEmergent.mergentR + style.StationStand.safetyDoor.distance + detainD;
-            const detainX = model.position.x - (style.StationStand.detainCar.position || drict) * (style.StationStand.detainCar.offset.x - model.width / 2);
-            const detainY = model.position.y + (style.StationStand.detainCar.position || drict) * (style.StationStand.detainCar.offset.y) + drict * detainH;
-            this.detain = new EDetain({
-                zlevel: this.zlevel,
-                z: this.z,
-                style: style,
-                x: detainX,
-                y: detainY,
-                textAlign: 'middle',
-                textVerticalAlign: 'top'
-            });
-
-            /** 停站时间*/
-            const timeD = style.StationStand.stopTime.position ? model.height - distance : -style.StationStand.safetyDoor.height;
-            const timeH = drict > 0 ? style.StationStand.standEmergent.mergentR : style.StationStand.standEmergent.mergentR + style.StationStand.safetyDoor.distance + timeD;
-            const timeX = model.position.x - (style.StationStand.stopTime.position || drict) * (style.StationStand.stopTime.offset.x - model.width / 2);
-            const timeY = model.position.y + (style.StationStand.stopTime.position || drict) * (style.StationStand.stopTime.offset.y) + drict * timeH;
-            this.time = new ETime({
-                zlevel: this.zlevel,
-                z: this.z + 1,
-                style: style,
-                x: timeX,
-                y: timeY,
-                name: model.parkingTime || '30'
-            });
-
-            /** 运行等级*/
-            const levelD = style.StationStand.level.position ? model.height - distance : -style.StationStand.safetyDoor.height;
-            const levelH = drict > 0 ? style.StationStand.standEmergent.mergentR : style.StationStand.standEmergent.mergentR + style.StationStand.safetyDoor.distance + levelD;
-            const levelX = model.position.x - (style.StationStand.level.position || drict) * (style.StationStand.level.offset.x - model.width / 2);
-            const levelY = model.position.y + (style.StationStand.level.position || drict) * (style.StationStand.level.offset.y) + drict * levelH;
-            this.level = new ELevel({
-                zlevel: this.zlevel,
-                z: this.z + 1,
-                style: style,
-                x: levelX,
-                y: levelY,
-                name: model.intervalRunTime || '5'
-            });
-
-            /** 列车停跳 */
-            if (style.StationStand.common.haveJumpShow) {
-                const jumpD = style.StationStand.jump.position ? model.height - distance : -style.StationStand.safetyDoor.height;
-                const jumpH = drict > 0 ? style.StationStand.standEmergent.mergentR : style.StationStand.standEmergent.mergentR + style.StationStand.safetyDoor.distance + jumpD;
-                const jumpX = model.position.x - (style.StationStand.jump.position || drict) * (style.StationStand.jump.offset.x - model.width / 2);
-                const jumpY = model.position.y + (style.StationStand.jump.position || drict) * (style.StationStand.jump.offset.y) + drict * jumpH;
-                const jumpCX = model.position.x - (style.StationStand.jump.position || drict) * (style.StationStand.jump.offset.x - model.width / 2);
-                const jumpCY = model.position.y + (style.StationStand.jump.position || drict) * (style.StationStand.jump.offset.y - style.StationStand.common.textFontSize / 2) + drict * jumpH;
-                this.jump = new EJump({
-                    zlevel: this.zlevel,
-                    z: this.z + 1,
-                    style: style,
-                    x: jumpX,
-                    y: jumpY,
-                    cx: jumpCX,
-                    cy: jumpCY,
-                    textAlign: 'middle',
-                    textVerticalAlign: 'top',
-                    jumpStopStatus: model.jumpStopStatus
-                });
-                this.add(this.jump);
-            }
-
-            this.add(this.safeDoor);
-            this.add(this.emergent);
-            this.add(this.detain);
-            this.add(this.reentry);
-            this.add(this.time);
-            this.add(this.level);
-        }
-    }
-
-    createMouseEvent() {
-        if (this.style.StationStand.mouseOverStyle) {
-            this.mouseEvent = new EMouse(this);
-            this.add(this.mouseEvent);
-            this.on('mouseout', (e) => { this.mouseEvent.mouseout(e); });
-            this.on('mouseover', (e) => { this.mouseEvent.mouseover(e); });
-        }
-    }
-
-    setVisible(visible) {
-        if (visible) {
-            this.eachChild(elem => { elem.show(); });
-        } else {
-            this.eachChild(elem => { elem.hide(); });
-        }
-    }
-
-    /** 恢复初始状态*/
-    recover() {
-        this.time && this.time.hide();
-        this.level && this.level.hide();
-        this.detain && this.detain.hide();
-        this.reentry && this.reentry.hide();
-        this.emergent && this.emergent.hide();
-        this.jump && this.jump.hide();
-        if (this.model.visible) { this.safeDoor && this.safeDoor.hasDoor(false); }
-        this.safeDoor && this.safeDoor.setColor(this.style.StationStand.safetyDoor.defaultColor);
-    }
-
-    /** 空闲*/
-    spare() {
-        this.safeStand && this.safeStand.setColor(this.style.StationStand.stand.spareColor);
-    }
-
-    /** 列车停站*/
-    stop() {
-        this.safeStand && this.safeStand.setColor(this.style.StationStand.stand.stopColor);
-    }
-
-    /** 指定列车跳站*/
-    designatedJumpStop() {
-        this.safeStand && this.safeStand.setColor(this.style.StationStand.stand.designatedJumpStopColor);
-        this.jump && this.jump.show();
-        this.jump && this.jump.setStatus(this.model.jumpStopStatus);
-    }
-
-    /** 站台紧急关闭*/
-    emergentClose() {
-        this.safeStand && this.safeStand.setColor(this.style.StationStand.stand.spareColor);
-        this.emergent && this.emergent.show();
-    }
-
-    /** 未设置跳停*/
-    unJumpStop() {
-        this.jump && this.jump.hide();
-        this.jump && this.jump.setStatus(this.model.jumpStopStatus);
-    }
-
-    /** 站台跳停*/
-    jumpStop() {
-        this.safeStand && this.safeStand.setColor(this.style.StationStand.stand.jumpStopColor);
-        this.jump && this.jump.show();
-        this.jump && this.jump.setStatus(this.model.jumpStopStatus);
-    }
-
-    /** 未设置扣车*/
-    unDetainTrain() {
-        this.detain && this.detain.hide();
-    }
-
-    /** 车站扣车*/
-    standDetainTrain() {
-        this.detain && this.detain.show();
-        this.detain && this.detain.setColor(this.style.StationStand.detainCar.detainTrainTextColor);
-    }
-
-    /** 中心扣车*/
-    centerDetainTrain() {
-        this.detain && this.detain.show();
-        this.detain && this.detain.setColor(this.style.StationStand.detainCar.centerTrainColor);
-    }
-
-    /** 中心+车站扣车*/
-    standAndCenterDetainTrain() {
-        this.detain && this.detain.show();
-        this.detain && this.detain.setColor(this.style.StationStand.detainCar.andCenterTrainColor);
-    }
-
-    /** 人工设置停战时间*/
-    setManuallyArmisticeTime(val) {
-        this.time && this.time.show();
-        this.time && this.time.setName(val);
-    }
-
-    /** 人工设置运行等级*/
-    setManuallyOperationLevel(val) {
-        this.level && this.level.show();
-        this.level && this.level.setName(val);
-    }
-
-    /** 开门*/
-    openDoor() {
-        this.safeDoor && this.safeDoor.hasDoor(true);
-    }
-
-    /** 关门*/
-    closeDoor() {
-        this.safeDoor && this.safeDoor.hasDoor(false);
-    }
-
-    /** 屏蔽门正常*/
-    doorNormal() {
-        this.safeDoor && this.safeDoor.setColor(this.style.StationStand.safetyDoor.defaultColor);
-    }
-
-    /** 屏蔽门故障*/
-    doorFault() {
-        this.safeDoor && this.safeDoor.setColor(this.style.StationStand.safetyDoor.splitDoorColor);
-    }
-
-    /** 屏蔽门切除*/
-    doorSplit() {
-        this.safeDoor && this.safeDoor.setColor(this.style.StationStand.safetyDoor.splitDoorColor);
-    }
-
-    /** 无折返(默认)*/
-    noReentry() {
-        this.reentry && this.reentry.hide();
-    }
-
-    /** 无人折返*/
-    noHumanReentry() {
-        this.reentry && this.reentry.show();
-        this.reentry && this.reentry.setColor(this.style.StationStand.reentry.noHumanColor);
-    }
-    /** 自动换端*/
-    autoChangeEnds() {
-        this.reentry && this.reentry.show();
-        this.reentry && this.reentry.setColor(this.style.StationStand.reentry.autoChangeEndsColor);
-    }
-
-    setState(model) {
-        this.recover();
-        switch (model.status) {
-        case '01':					/** 空闲*/
-            this.spare();
-            break;
-        case '02':					/** 列车停站*/
-            this.stop();
-            break;
-        case '03':					/** 站台紧急关闭*/
-            this.emergentClose();
-            break;
-        }
-
-        if (Number(model.parkingTime) >= 0) {
-            this.setManuallyArmisticeTime(model.parkingTime);
-        }
-
-        if (Number(model.intervalRunTime) > 0) {
-            this.setManuallyOperationLevel(model.intervalRunTime);
-        }
-
-        /** 设置跳停*/
-        if (model.status == '01') {
-            switch (model.jumpStopStatus) {
-            case '01':				/** 未设置跳停*/
-                this.unJumpStop();
-                break;
-            case '02':				/** 指定站台跳停*/
-                this.designatedJumpStop();
-                break;
-            case '03':				/** 站台全部跳停*/
-                this.jumpStop();
-                break;
-            }
-        }
-
-        /** 设置扣车*/
-        switch (model.holdStatus) {
-        case '01':					/** 未设置扣车*/
-            this.unDetainTrain();
-            break;
-        case '02':					/** 车站扣车*/
-            this.standDetainTrain();
-            break;
-        case '03':					/** 中心扣车*/
-            this.centerDetainTrain();
-            break;
-        case '04':					/** 中心+车站扣车*/
-            this.standAndCenterDetainTrain();
-            break;
-        }
-
-        /** 设置屏蔽门开关*/
-        switch (model.screenDoorOpenStatus) {
-        case '01':
-            this.closeDoor();		/** 关门*/
-            break;
-        case '02':
-            this.openDoor(); 		/** 开门*/
-            break;
-        }
-
-        /** 设置屏蔽门状态*/
-        switch (model.screenDoorStatus) {
-        case '01':
-            this.doorNormal();		/** 正常*/
-            break;
-        case '02':
-            this.doorFault();		/** 故障*/
-            break;
-        case '03':
-            this.doorSplit();		/** 切除*/
-        }
-
-        /** 设置折返策略*/
-        switch (model.reentryStrategy) {
-        case '04':					/** 默认*/
-        case '01':
-            this.noReentry();		/** 无折返策略*/
-            break;
-        case '02':
-            this.noHumanReentry(); 	/** 无人折返*/
-            break;
-        case '03':
-            this.autoChangeEnds();	/** 自动换端*/
-            break;
-        }
-    }
-
-    getBoundingRect() {
-        const rect = this.safeStand.getBoundingRect();
-        this.safeDoor && rect.union(this.safeDoor.getBoundingRect());
-
-        return rect;
-    }
-
-    getShapeTipPoint() {
-        const rect = this.getBoundingRect();
-        if (rect) {
-            return {
-                x: rect.x + rect.width / 2,
-                y: rect.y
-            };
-        }
-        return null;
-    }
-}
-export default StationStand;
diff --git a/src/jmap/shape/Switch/ELockRect.js b/src/jmap/shape/Switch/ELockRect.js
deleted file mode 100644
index 1ee66d84f..000000000
--- a/src/jmap/shape/Switch/ELockRect.js
+++ /dev/null
@@ -1,21 +0,0 @@
-import Rect from 'zrender/src/graphic/shape/Rect';
-
-/** 名称元素*/
-export default function ELockRect(model) {
-	const TextName = new Rect({
-		zlevel: model.zlevel,
-		z: model.z + 2,
-		shape: {
-			x: model.x,
-			y: model.y,
-			width: model.width,
-			height: model.width
-		},
-		style: {
-			lineWidth: model.lineWidth,
-			stroke: model.stroke,
-			fill: model.fill
-		}
-	});
-	return TextName;
-}
diff --git a/src/jmap/shape/Switch/EMouse.js b/src/jmap/shape/Switch/EMouse.js
deleted file mode 100644
index 0645e4f5d..000000000
--- a/src/jmap/shape/Switch/EMouse.js
+++ /dev/null
@@ -1,128 +0,0 @@
-import Group from 'zrender/src/container/Group';
-import Rect from 'zrender/src/graphic/shape/Rect';
-import store from '@/store/index_APP_TARGET';
-class EMouse extends Group {
-	constructor(device) {
-		super();
-		this.device = device;
-		this.create();
-		this.craeteSwitchBorder();
-	}
-	create() {
-		if (this.device.name) {
-			// 创建锁闭框
-			const rect = this.device.name.getNameText().getBoundingRect();
-			let textWidth = rect.width * 0.8;
-			if (this.device.triangle.drictx !== 1) {
-				// rect.x += rect.width;
-				textWidth = -textWidth;
-			}
-
-			this.textRect = new Rect({
-				zlevel: this.device.zlevel,
-				z: this.device.z,
-				silent: true,
-				shape: {
-					x: rect.x,
-					y: rect.y,
-					width: textWidth,
-					height: rect.height
-				},
-				style: {
-					lineWidth: 1,
-					lineDash: [3, 3],
-					stroke: this.device.style.Switch.mouseOverStyle.borderColor,
-					fill: this.device.style.Switch.mouseOverStyle.borderBackgroundColor
-				}
-			});
-			this.add(this.textRect);
-			this.textRect.hide();
-		}
-	}
-
-	// 创建道岔边框
-	craeteSwitchBorder() {
-		const sectionA = this.getInstanceByCode(this.device.model.sectionACode);
-		const sectionB = this.getInstanceByCode(this.device.model.sectionBCode);
-		const sectionC = this.getInstanceByCode(this.device.model.sectionCCode);
-		const rect = this.device.getBoundingRect();
-
-		sectionA && rect.union(sectionA.getBoundingRect());
-		sectionB && rect.union(sectionB.getBoundingRect());
-		sectionC && rect.union(sectionC.getBoundingRect());
-
-		this.switchBorder = new Rect({
-			zlevel: this.device.model.zlevel,
-			z: this.device.z,
-			silent: true,
-			shape: Object.assign({ r: 4 }, rect),
-			style: {
-				lineDash: [3, 3],
-				stroke: this.device.style.Switch.mouseOverStyle.borderColor,
-				fill: this.device.style.transparentColor
-			}
-		});
-
-		this.add(this.switchBorder);
-		this.switchBorder.hide();
-	}
-
-	getInstanceByCode(code) {
-		return (store.getters['map/getDeviceByCode'](code) || {}).instance;
-	}
-
-	mouseout(e) {
-		if (!this.device.model.down) {
-			this.switchBorder && this.switchBorder.hide();
-			this.device.setTextStyle({
-				textFill: this.device.style.backgroundColor
-			});
-			this.textRect && this.textRect.hide();
-			this.device.setState(this.device.model);
-
-			const section = store.getters['map/getDeviceByCode'](this.device.model.sectionACode) || {};
-			const parentSection = store.getters['map/getDeviceByCode'](section.parentCode) || {};
-			const instance = this.getInstanceByCode(parentSection.trainWindowCode);
-			if (instance && instance.mouseEvent && instance.mouseEvent.mouseLeave) {
-				instance.mouseEvent.mouseLeave(e);
-			}
-		}
-	}
-
-	mouseover(e) {
-		this.switchBorder && this.switchBorder.show();
-		this.device.setLossAction(false);
-		this.device.setSwitchCoreColor(this.device.style.Switch.mouseOverStyle.borderBackgroundColor);
-		this.device.setTextStyle({
-			textFill: '#000'
-		});
-		this.textRect && this.textRect.show();
-
-		const section = store.getters['map/getDeviceByCode'](this.device.model.sectionACode) || {};
-		const parentSection = store.getters['map/getDeviceByCode'](section.parentCode) || {};
-		const instance = this.getInstanceByCode(parentSection.trainWindowCode);
-		if (instance && instance.mouseEvent && instance.mouseEvent.mouseEnter) {
-			instance.mouseEvent.mouseEnter(e);
-		}
-	}
-
-	mouseEnter(e) {
-		this.switchBorder && this.switchBorder.show();
-		this.device.setLossAction(false);
-		this.device.setSwitchCoreColor(this.device.style.Switch.mouseOverStyle.borderBackgroundColor);
-		this.device.setTextStyle({
-			textFill: '#000'
-		});
-		this.textRect && this.textRect.show();
-	}
-
-	mouseLeave(e) {
-		this.switchBorder && this.switchBorder.hide();
-		this.device.setTextStyle({
-			textFill: this.device.style.backgroundColor
-		});
-		this.textRect && this.textRect.hide();
-		this.device.setState(this.device.model);
-	}
-}
-export default EMouse;
diff --git a/src/jmap/shape/Switch/ESwCore.js b/src/jmap/shape/Switch/ESwCore.js
deleted file mode 100644
index 7c7f86e2a..000000000
--- a/src/jmap/shape/Switch/ESwCore.js
+++ /dev/null
@@ -1,77 +0,0 @@
-import Group from 'zrender/src/container/Group';
-import Line from 'zrender/src/graphic/shape/Line';
-
-class ESwCore extends Group {
-	constructor(model) {
-		super();
-		this.model = model;
-		this.create();
-	}
-
-	create() {
-		const model = this.model;
-		const style = this.model.style;
-		this.skewLine = new Line({
-			zlevel: model.zlevel,
-			z: model.z,
-			silent: true,
-			shape: {
-				x1: model.intersectionX,
-				y1: model.intersectionY,
-				x2: model.intersectionX + model.triangle.drictx * model.triangle.getCotRate() * model.coverLength,
-				y2: model.intersectionY + model.triangle.dricty * model.coverLength
-			},
-			style: {
-				lineWidth: model.lineWidth,
-				stroke: style.backgroundColor
-			}
-		});
-
-		this.line = new Line({
-			zlevel: model.zlevel,
-			z: model.z,
-			silent: true,
-			shape: {
-				x1: model.intersectionX - model.triangle.getCotRate() * model.coverLength,
-				y1: model.intersectionY,
-				x2: model.intersectionX + model.triangle.getCotRate() * model.coverLength,
-				y2: model.intersectionY
-			},
-			style: {
-				lineWidth: model.lineWidth,
-				stroke: style.backgroundColor
-			}
-		});
-
-		this.add(this.line);
-		this.add(this.skewLine);
-	}
-
-	hide() {
-		this.line.hide();
-		this.skewLine.hide();
-	}
-
-	show() {
-		this.line.show();
-		this.skewLine.show();
-	}
-
-	setColor(color) {
-		this.line.setStyle('stroke', color);
-		this.skewLine.setStyle('stroke', color);
-	}
-
-	stopAnimation(flag) {
-		this.line.stopAnimation(flag);
-		this.skewLine.stopAnimation(flag);
-	}
-
-	animateStyle(cb) {
-		this.eachChild((child) => {
-			cb(child);
-		});
-	}
-}
-
-export default ESwCore;
diff --git a/src/jmap/shape/Switch/ESwLnversion.js b/src/jmap/shape/Switch/ESwLnversion.js
deleted file mode 100644
index 8cbc78f9c..000000000
--- a/src/jmap/shape/Switch/ESwLnversion.js
+++ /dev/null
@@ -1,69 +0,0 @@
-import Group from 'zrender/src/container/Group';
-import Polygon from 'zrender/src/graphic/shape/Polygon';
-
-class ESwLnversion extends Group {
-	constructor(model) {
-		super();
-		this.model = model;
-		this.create();
-	}
-
-	create() {
-		const model = this.model;
-		const style = this.model.style;
-		this.relocShelter = new Polygon({
-			zlevel: model.zlevel,
-			z: model.z,
-			shape: {
-				points: model.shelterPoints
-			},
-			style: {
-				fill: style.backgroundColor
-			},
-			cursor: model.cursor,
-			onmouseover: model.onmouseover,
-			onmouseout: model.onmouseout
-		});
-		const rpx = Math.abs(model.triangle.getCos(model.halfWidth)) + 0.2;
-		this.relocShelter.position = [-model.triangle.drictx * rpx, -model.triangle.dricty * 0.2];
-
-		this.section = new Polygon({
-			zlevel: model.zlevel,
-			z: model.z + 1,
-			shape: {
-				points: model.sectionPoints
-			},
-			style: {
-				fill: style.Section.line.spareColor
-			},
-			cursor: model.cursor,
-			onmouseover: model.onmouseover,
-			onmouseout: model.onmouseout
-		});
-
-		this.hide();
-		this.add(this.relocShelter);
-		this.add(this.section);
-	}
-
-	hide() {
-		this.relocShelter.hide();
-		this.section.hide();
-	}
-
-	show() {
-		this.relocShelter.show();
-		this.section.show();
-	}
-
-	stopAnimation(flag) {
-		this.section.stopAnimation(flag);
-	}
-
-	getSection() {
-		return this.section;
-	}
-
-}
-
-export default ESwLnversion;
diff --git a/src/jmap/shape/Switch/ESwLocal.js b/src/jmap/shape/Switch/ESwLocal.js
deleted file mode 100644
index 9541d68cd..000000000
--- a/src/jmap/shape/Switch/ESwLocal.js
+++ /dev/null
@@ -1,44 +0,0 @@
-import Group from 'zrender/src/container/Group';
-import Polygon from 'zrender/src/graphic/shape/Polygon';
-
-class ESwLocal extends Group {
-	constructor(model) {
-		super();
-		this.model = model;
-		this.create();
-	}
-
-	create() {
-		const model = this.model;
-		const style = this.model.style;
-
-		this.locShelter = new Polygon({
-			zlevel: model.zlevel,
-			z: model.z,
-			shape: {
-				points: model.shelterPoints
-			},
-			style: {
-				fill: style.backgroundColor
-			},
-			cursor: model.cursor,
-			onmouseover: model.onmouseover,
-			onmouseout: model.onmouseout
-		});
-
-		const lpx = Math.abs(model.triangle.getCos(1));
-		this.locShelter.position = [model.triangle.drictx * lpx, -model.triangle.dricty * 0.2];
-		this.locShelter.show();
-		this.add(this.locShelter);
-	}
-
-	hide() {
-		this.locShelter.hide();
-	}
-
-	show() {
-		this.locShelter.show();
-	}
-}
-
-export default ESwLocal;
diff --git a/src/jmap/shape/Switch/ESwName.js b/src/jmap/shape/Switch/ESwName.js
deleted file mode 100644
index 8471024c7..000000000
--- a/src/jmap/shape/Switch/ESwName.js
+++ /dev/null
@@ -1,98 +0,0 @@
-import LangStorage from '@/utils/lang';
-import Group from 'zrender/src/container/Group';
-import Text from 'zrender/src/graphic/Text';
-import Rect from 'zrender/src/graphic/shape/Rect';
-
-class ESwName extends Group {
-    constructor(model) {
-        super();
-        this.model = model;
-        this.create();
-    }
-
-    create() {
-        const model = this.model;
-        const style = this.model.style;
-
-        this.nameText = new Text({
-            zlevel: model.zlevel,
-            z: model.z + 6,
-            style: {
-                x: model.nameTextX,
-                y: model.nameTextY,
-                fontWeight: style.Switch.text.fontWeight,
-                fontSize: style.Switch.text.fontSize,
-                fontFamily: style.fontFamily,
-                text: model.name,
-                textAlign: model.triangle.drictx === 1 ? 'left' : 'right',
-                textVerticalAlign: 'middle',
-                textFill: style.Switch.text.fontColor
-            }
-        });
-
-        const rect = this.nameText.getBoundingRect();
-        let textWidth = rect.width * 0.8;
-        if (model.triangle.drictx !== 1) {
-            rect.x += rect.width;
-            textWidth = -textWidth;
-        }
-
-        this.textRect = new Rect({
-            zlevel: model.zlevel,
-            z: model.z + 10,
-            silent: true,
-            shape: {
-                x: rect.x,
-                y: rect.y,
-                width: textWidth,
-                height: rect.height
-            },
-            style: {
-                lineWidth: 0,
-                // lineDash: [3, 3],
-                stroke: style.Switch.text.borderColor,
-                fill: style.transparentColor
-            }
-        });
-
-        const data = LangStorage.getLang() == 'en' ? 'Turnout section' : '道岔区段名称';
-
-        this.arrowText = new Text({
-            zlevel: model.zlevel,
-            z: model.z + 20,
-            style: {
-                x: model.arrowTextX,
-                y: model.arrowTextY,
-                fontSize: style.arrowFontSize,
-                fontWeight: style.Switch.text.fontWeight,
-                fontFamily: style.fontFamily,
-                text: `${data}: ${model.sectionName}`,
-                textFill: '#000',
-                textAlign: 'left',
-                textPadding: 3,
-                textBackgroundColor: style.tipBackgroundColor
-            }
-        });
-
-        this.add(this.textRect);
-        this.add(this.nameText);
-        this.add(this.arrowText);
-
-        this.arrowText.hide();
-        model.nameShow ? this.nameText.show() : this.nameText.hide();
-    }
-
-    getArrowText() {
-        return this.arrowText;
-    }
-
-    getNameText() {
-        return this.nameText;
-    }
-
-    getTextRect() {
-        return this.textRect;
-    }
-}
-
-export default ESwName;
diff --git a/src/jmap/shape/Switch/index.js b/src/jmap/shape/Switch/index.js
deleted file mode 100644
index 81ca5bba9..000000000
--- a/src/jmap/shape/Switch/index.js
+++ /dev/null
@@ -1,426 +0,0 @@
-/*
-*	道岔
-*/
-import Line from 'zrender/src/graphic/shape/Line';
-import Group from 'zrender/src/container/Group';
-import JTriangle from '../../utils/JTriangle';
-import ESwName from './ESwName.js';
-import ESwCore from './ESwCore.js';
-import ESwLocal from './ESwLocal.js';
-import ESwLnversion from './ESwLnversion';
-import ELockRect from './ELockRect';
-import EMouse from './EMouse';
-
-export default class Switch extends Group {
-    constructor(model, style) {
-        super();
-        this._code = model.code;
-        this._type = model._type;
-        this.model = model;
-        this.style = style;
-        this.zlevel = model.zlevel;
-        this.z = 6;
-        this.triangle = new JTriangle(model.intersection, model.skew);
-        this.create();
-        this.createLockRect(); // 创建单锁矩形框显示
-        this.createMouseEvent();
-        this.setState(model);
-    }
-
-    createMouseEvent() {
-        // 鼠标事件
-        if (this.style.Switch.mouseOverStyle) {
-            this.mouseEvent = new EMouse(this);
-            this.add(this.mouseEvent);
-            this.on('mouseout', (e) => { this.mouseEvent.mouseout(e); });
-            this.on('mouseover', (e) => { this.mouseEvent.mouseover(e); });
-        }
-    }
-
-    create() {
-        const model = this.model;
-        const style = this.style;
-
-        let halfWidth = style.Section.line.width / 2;
-        const switchWidth = style.Section.line.width + style.Section.line.beyondWidth * 2 + 0.8;
-        const swPadding = style.Switch.core.length;
-        const directx = this.triangle.drictx;
-        const directy = this.triangle.dricty;
-        const direct = -this.triangle.drictx * this.triangle.dricty;
-        const coverLength = switchWidth * 1.5;
-
-        this.swCore = new ESwCore({
-            zlevel: this.zlevel,
-            z: this.z,
-            style: style,
-            intersectionX: model.intersection.x,
-            intersectionY: model.intersection.y,
-            coverLength: coverLength,
-            lineWidth: switchWidth,
-            triangle: this.triangle
-        });
-
-        halfWidth += 0.3;
-        const point1 = [model.intersection.x - directx * halfWidth, model.intersection.y + directy * halfWidth];
-        const point2 = [point1[0] + directx * switchWidth / this.triangle.getSinRate(), point1[1]];
-        const point3 = [point2[0] + directx * this.triangle.getCotRate() * swPadding, point2[1] + directy * swPadding];
-        const point4 = [point3[0] + direct * this.triangle.getSin(switchWidth), point3[1] - direct * this.triangle.getCos(switchWidth)];
-        this.locShelter = new ESwLocal({ // 定位
-            zlevel: this.zlevel,
-            z: this.z,
-            style: style,
-            shelterPoints: [point1, point2, point3, point4],
-            cursor: 'pointer',
-            triangle: this.triangle,
-            onmouseover: () => { this.name.getArrowText().show(); },
-            onmouseout: () => { this.name.getArrowText().hide(); }
-        });
-
-        const slen = switchWidth / this.triangle.getSinRate();
-        const rpoint1 = [model.intersection.x + directx * halfWidth, model.intersection.y - directy * halfWidth];
-        const rpoint2 = [rpoint1[0] + directx * (swPadding + switchWidth * this.triangle.getCotRate()), rpoint1[1]];
-        const rpoint3 = [rpoint2[0], rpoint2[1] + directy * switchWidth];
-        const rpoint4 = [rpoint1[0] + this.triangle.getCos(slen), rpoint1[1] + this.triangle.getSin(slen)];
-
-        const switchWidth1 = style.Section.line.width / 2 + 0.1;
-        const width1 = switchWidth1 * this.triangle.getSinRate();
-        const height1 = switchWidth1 * this.triangle.getCosRate();
-        const width2 = (height1 + switchWidth1) / this.triangle.getTanRate();
-        const width3 = (style.Section.line.width / this.triangle.getSinRate()) - width2 - width1;
-        const spoint1 = [model.intersection.x + directx * width3, model.intersection.y - directy * switchWidth1];
-        const spoint2 = [spoint1[0] - directx * (width2 + width1) - directx * width3, spoint1[1]];
-        const spoint3 = [model.intersection.x - directx * width3, model.intersection.y + directy * switchWidth1];
-        const spoint4 = [spoint1[0] + directx * (width2 + width1) - directx * width3, spoint3[1]];
-
-        this.relocShelter = new ESwLnversion({ // 反位
-            zlevel: this.zlevel,
-            z: this.z,
-            style: style,
-            shelterPoints: [rpoint1, rpoint2, rpoint3, rpoint4],
-            sectionPoints: [spoint1, spoint2, spoint3, spoint4],
-            cursor: 'pointer',
-            halfWidth: halfWidth,
-            triangle: this.triangle,
-            onmouseover: () => { this.name.getArrowText().show(); },
-            onmouseout: () => { this.name.getArrowText().hide(); }
-        });
-
-        this.releaseBackground = new Line({ // 区段上遮盖段
-            zlevel: this.zlevel,
-            z: this.z,
-            shape: {
-                x1: model.intersection.x - (coverLength * this.triangle.getCotRate()),
-                y1: model.intersection.y,
-                x2: model.intersection.x + (coverLength * this.triangle.getCotRate()),
-                y2: model.intersection.y
-            },
-            style: {
-                lineWidth: style.Section.line.width + style.Section.line.beyondWidth + 1,
-                stroke: style.backgroundColor
-            }
-        });
-
-        const arrowTextX = model.intersection.x + 10;
-        const arrowTextY = model.intersection.y + 15;
-        const nameTextX = model.namePosition.x + model.intersection.x + directx * (style.Section.line.width * 3 + style.Switch.text.offset.x) * this.triangle.getCotRate();
-        const nameTextY = model.namePosition.y + model.intersection.y + style.Switch.text.offset.y * (style.Switch.text.position || directy);
-
-        this.name = new ESwName({
-            zlevel: this.zlevel,
-            z: this.z,
-            style: style,
-            arrowTextX: arrowTextX,
-            arrowTextY: arrowTextY,
-            nameTextX: nameTextX,
-            nameTextY: nameTextY,
-            sectionName: model.sectionName,
-            name: model.name,
-            nameShow: style.Switch.text.show,
-            triangle: this.triangle
-        });
-
-        this.add(this.swCore); // 岔芯link
-        this.add(this.locShelter);
-        this.add(this.relocShelter);
-        this.add(this.releaseBackground);
-        this.add(this.name);
-        style.Switch.text.show && model.nameShow ? this.name.show() : this.name.hide();
-    }
-
-    createLockRect() {
-        const offsetX = this.model.locateType == '01' ? 3 : 0;
-        this.lockRect = new ELockRect({ // 锁定矩形
-            zlevel: this.zlevel,
-            z: this.z + 6,
-            x: this.model.intersection.x - this.style.Switch.monolock.rectWidth / 2 + offsetX,
-            y: this.model.intersection.y - this.style.Switch.monolock.rectWidth / 2,
-            width: this.style.Switch.monolock.rectWidth,
-            lineWidth: 1.8,
-            stroke: this.style.Switch.monolock.rectBorderColor,
-            fill: this.style.transparentColor
-        });
-        this.add(this.lockRect);
-        this.lockRect.hide();
-    }
-
-    /** 名称动画*/
-    nameTextAnimation() {
-        this.name.getNameText().animateStyle(true)
-            .when(0, { textFill: this.style.backgroundColor })
-            .when(1000, { textFill: this.style.Switch.text.lossColor })
-            .when(2000, { textFill: this.style.backgroundColor })
-            .start();
-
-        this.name.getTextRect().animateStyle(true)
-            .when(0, { textFill: this.style.backgroundColor })
-            .when(1000, { textFill: this.style.Switch.text.borderColor })
-            .when(2000, { textFill: this.style.backgroundColor })
-            .start();
-    }
-
-    /** 设置岔芯是否隐藏*/
-    setSwitchCoreInvisible(invisible) {
-        if (invisible) {
-            this.swCore.hide();
-        } else {
-            this.swCore.show();
-        }
-    }
-
-    /** 设置岔芯颜色*/
-    setSwitchCoreColor(color) {
-        this.swCore && this.swCore.setColor(color);
-    }
-
-    /** 设置道岔文字颜色*/
-    setTextColor(color) {
-        this.name.getNameText().setStyle({textFill: color});
-    }
-
-    /** 设置道岔背景颜色*/
-    setTextStyle(style) {
-        this.name.getNameText().setStyle(style);
-    }
-
-    /** 设置道岔文字边框颜色  (道岔封锁) */
-    setHasTextBorder(width) {
-        this.name.getTextRect().setStyle({lineWidth: width});
-    }
-
-    /** 恢复状态*/
-    recover() {
-        this.lockRect.hide();
-        this.setSwitchCoreColor(this.style.backgroundColor);
-        this.name.getNameText().stopAnimation(false);
-        this.swCore.stopAnimation(false);
-        this.relocShelter.stopAnimation(false);
-        this.relocShelter.hide();
-        this.releaseBackground.hide();
-        this.setHasTextBorder(0);
-    }
-
-    /** 定位*/
-    setLocationAction() {
-        this.recover();
-        this.setSwitchCoreInvisible(true);
-        this.locShelter.show();
-        this.relocShelter.hide();
-        this.setTextColor(this.style.Switch.text.locateColor);
-    }
-
-    /** 反位*/
-    setInversionAction() {
-        this.recover();
-        this.setSwitchCoreInvisible(true);
-        this.setTextColor(this.style.Switch.text.inversionColor);
-        this.locShelter.hide();
-        this.relocShelter.show();
-        this.setSectionState(this.relocShelter.getSection(), 'fill', this.model);
-    }
-
-    /** 失去*/
-    setLossAction(nameFlicker) {
-        this.recover();
-        this.locShelter.hide();
-        this.relocShelter.hide();
-        this.setSwitchCoreInvisible(false);
-        this.setTextColor(this.style.Switch.text.lossColor);
-        nameFlicker && this.nameTextAnimation();
-    }
-
-    /** 挤叉*/
-    setForkAction() {
-        this.setLossAction(true);
-        this.swCore.animateStyle(item => {
-            item.animateStyle(true)
-                .when(0, { stroke: this.style.backgroundColor })
-                .when(1000, { stroke: 'red' })
-                .when(2000, { stroke: this.style.backgroundColor })
-                .start();
-        });
-    }
-
-    /** 空闲*/
-    spare() {
-    }
-
-    /** 单锁*/
-    setMonolock() {
-        if (this.style.Switch.monolock.rectShow) { // 判断单锁矩形是否显示
-            this.lockRect.show();
-        }
-        switch (this.model.locateType) {
-        case '01': // 定位
-            this.setTextColor(this.style.Switch.monolock.locationColor); // 设置道岔名称颜色
-            break;
-        case '02': // 反位
-            this.setTextColor(this.style.Switch.monolock.inversionColor); // 设置道岔名称颜色
-            break;
-        }
-    }
-
-    /** 封锁 */
-    block() {
-        if (this.style.Switch.block.nameBorderShow) {
-            this.setHasTextBorder(1);
-        } else if (this.style.Switch.block.contentRectShow) {
-            this.lockRect.show();
-            this.lockRect.setStyle({stroke: this.style.Switch.block.contentRectColor});
-        }
-    }
-
-    /** 延时释放*/
-    timeRelease() {
-        this.setSwitchCoreInvisible(true);
-        this.releaseBackground.show();
-    }
-
-    /** 设置道岔切除*/
-    setSwitchCutOff() {
-        this.setSwitchCoreInvisible(true);
-        switch (this.model.locateType) {
-        case '01':
-            this.releaseBackground.hide();
-            break;
-        case '02':
-            this.relocShelter && this.relocShelter.getSection().animateStyle(true)
-                .when(1000, { fill: this.style.backgroundColor })
-                .start();
-            break;
-        }
-    }
-
-    sectionCutOff(section) {
-        const lineWidth = this.style.Section.line.width + (this.model.sectionAstatus != '01' ? this.style.Section.line.beyondWidth : 0);
-        if (section) {
-            section.animateStyle(true, [
-                { time: 0, styles: { lineWidth: lineWidth } },
-                { time: 1000, styles: { stroke: this.style.backgroundColor } },
-                { time: 2000, styles: { lineWidth: lineWidth } }
-            ]);
-        }
-    }
-
-    setSectionState(section, style, state) {
-        if (section && !section.animators.length) {
-            switch (state.sectionAstatus) {
-            case '00': break;
-            case '01': 	/** 空闲*/
-                section.setStyle(style, this.style.Section.line.spareColor);
-                break;
-            case '02': 	/** 通信车占用*/
-                section.setStyle(style, this.style.Section.line.communicationOccupiedColor);
-                break;
-            case '03': 	/** 非通信车占用*/
-                section.setStyle(style, this.style.Section.line.unCommunicationOccupiedColor);
-                break;
-            case '04': 	/** 进路锁闭*/
-                section.setStyle(style, this.style.Section.line.routeLockColor);
-                break;
-            case '05': 	/** 故障锁闭*/
-                section.setStyle(style, this.style.Section.line.faultLockColor);
-                break;
-            case '06': 	/** 封锁*/
-                section.setStyle(style, this.style.Section.line.blockColor);
-                break;
-            case '07': 	/** ATC切除*/
-                section.setStyle(style, this.style.Section.line.atcExcisionColor);
-                break;
-            case '08': 	/** ATS切除*/
-                section.setStyle(style, this.style.Section.line.atsExcisionColor);
-                section.animateStyle(true)
-                    .when(1000, { fill: this.style.backgroundColor })
-                    .when(2000, { fill: this.style.Section.line.atsExcisionColor })
-                    .start();
-                break;
-            case '09':	/** 进路延续保护 */
-                section.setStyle(style, this.style.Section.line.protectiveLockColor);
-                break;
-            }
-
-            if (state.cutOff) {
-                this.sectionCutOff(section);
-            }
-        }
-
-    }
-
-    setLocateType(model) {
-        switch (model.locateType) {
-        case '01':
-            this.setLocationAction(); 	/** 定位*/
-            break;
-        case '02':
-            this.setInversionAction(); 	/** 反位*/
-            break;
-        case '03':
-            this.setLossAction(true); 	/** 失去*/
-            break;
-        case '04':
-            this.setForkAction(); 		/** 挤岔*/
-            break;
-        default:
-            this.setLocationAction();
-        }
-    }
-
-    setState(model) {
-        this.setLocateType(model);
-
-        switch (model.status) {
-        case '01':
-            this.spare(); 				/** 空闲*/
-            break;
-        case '10':
-            this.setMonolock(); 		/** 单锁*/
-            break;
-        case '13':
-            this.timeRelease(); 		/** 延时释放*/
-            break;
-        case '14':
-            this.block(); 				/** 封锁*/
-            break;
-        }
-
-        /** 区段切除*/
-        if (model.cutOff) {
-            this.setSwitchCutOff();
-        }
-    }
-
-    getBoundingRect() {
-        return this.name.getBoundingRect();
-    }
-
-    getShapeTipPoint() {
-        const text = this.name.getNameText();
-        if (text) {
-            const rect = text.getBoundingRect();
-            return {
-                x: rect.x + rect.width / 2,
-                y: rect.y
-            };
-        }
-        return null;
-    }
-}
diff --git a/src/jmap/shape/Text/index.js b/src/jmap/shape/Text/index.js
deleted file mode 100644
index 08b27ddf3..000000000
--- a/src/jmap/shape/Text/index.js
+++ /dev/null
@@ -1,44 +0,0 @@
-import Text from 'zrender/src/graphic/Text';
-import Group from 'zrender/src/container/Group';
-
-export default class Text2 extends Group {
-	constructor(model, style) {
-		super();
-		this._code = model.code;
-		this._type = model._type;
-		this.name = model.code;
-		this.zlevel = model.zlevel;
-		this.model = model;
-		this.style = style;
-		this.z = 6;
-		this.create();
-		this.setState(model);
-	}
-
-	create() {
-		var model = this.model;
-		var [direction, content] = model.content.split('::');
-		if (direction == 'V') {
-			content = content.split('').join('\n');
-		} else if (direction != 'H') {
-			content = model.content;
-		}
-
-		this.text = new Text({
-			zlevel: this.zlevel,
-			z: this.z,
-			style: {
-				x: model.position.x,
-				y: model.position.y,
-				text: content,
-				textFont: model.font,
-				textFill: model.fontColor,
-				textAlign: 'middle'
-			}
-		});
-		this.add(this.text);
-	}
-
-	setState(model) {
-	}
-}
diff --git a/src/jmap/shape/Train/EMouse.js b/src/jmap/shape/Train/EMouse.js
deleted file mode 100644
index b4d8d7211..000000000
--- a/src/jmap/shape/Train/EMouse.js
+++ /dev/null
@@ -1,66 +0,0 @@
-import Group from 'zrender/src/container/Group';
-import Text from 'zrender/src/graphic/Text';
-import LangStorage from '@/utils/lang';
-
-class EMouse extends Group {
-    constructor(device) {
-        super();
-        this.device = device;
-        this.create();
-    }
-    create() {
-        let destinationText = '';
-        switch (this.device.model.destinationStatus) {
-        case '01': destinationText = LangStorage.getLang() == 'en' ? 'on time' : '准点'; break;
-        case '02': destinationText = LangStorage.getLang() == 'en' ? 'early' : '早点'; break;
-        case '03': destinationText = LangStorage.getLang() == 'en' ? 'early seriously' : '严重早点'; break;
-        case '04': destinationText = LangStorage.getLang() == 'en' ? 'late' : '晚点'; break;
-        case '05': destinationText = LangStorage.getLang() == 'en' ? 'late seriously ' : '严重晚点'; break;
-        default: destinationText = LangStorage.getLang() == 'en' ? 'unknown' : '未知'; break;
-        }
-        let trainType = '';
-        switch (this.device.model.type) {
-        case '01': trainType = LangStorage.getLang() == 'en' ? 'Plan the car' : '计划车'; break;
-        case '02': trainType = LangStorage.getLang() == 'en' ? 'Head size car' : '头码车'; break;
-        case '03': trainType = LangStorage.getLang() == 'en' ? 'Artificial car' : '人工车'; break;
-        default: trainType = LangStorage.getLang() == 'en' ? 'unknown' : '未知'; break;
-        }
-        let text = '';
-        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.targetCode ? this.device.model.targetCode : ''}\n Train No.: ${this.device.model.groupNumber}\n Early or late: ${destinationText}\n Direction: ${this.device.model.directionType == '02' ? 'up' : 'down'}\n Crew No.: \n Start Station: \n Terminal Station: \n Occupied Track: ${this.device.model.sectionModel ? this.device.model.sectionModel.name : ''}\n Current Station: \n Train-ground communication: normal \n Operation Speed level: 4 \n Detained: ${this.device.model.runControlStatus == '01' ? 'Normal' : this.device.model.runControlStatus == '03' ? 'Skip to continue moving' : 'Detained'}\n Stationary: ${this.device.model.runStatus == '02' ? 'No' : 'Yes'}\n Blocked: No \n Speed: ${this.device.model.speed || 0} km/h \n Authorized Distance: ${this.device.model.maLen || 0} m`;
-        } else {
-            text = `列车类型: ${trainType} \n表\0\0\0\0号: ${this.device.model.serviceNumber}\n车\0次\0号: ${this.device.model.tripNumber}\n目的地号: ${this.device.model.targetCode ? this.device.model.targetCode : ''}\n车\0组\0号: ${this.device.model.groupNumber}\n早\0晚\0点: ${destinationText}\n运行方向: ${this.device.model.directionType == '02' ? '上行' : '下行'}\n乘务组号: \n起点站名: \n终点站名: \n占用轨道: ${this.device.model.sectionModel ? this.device.model.sectionModel.name : ''}\n所在车站: \n车地通信: 正常\n运行等级: 4\n扣车状态: ${this.device.model.runControlStatus == '01' ? '正常' : this.device.model.runControlStatus == '03' ? '跳停' : '扣车'}\n停稳状态: ${this.device.model.runStatus == '02' ? '未停稳' : '停稳'}\n阻塞状态: 无\n列车速度: ${this.device.model.speed || 0} km/h\n列车移动授权距离: ${this.device.model.maLen || 0} m`;
-        }
-        // 文字描述
-        this.arrowText = new Text({
-            zlevel: this.device.model.zlevel,
-            z: this.device.model.z + 10,
-            style: {
-                x: this.device.model.point.x + 50,
-                y: this.device.model.point.y + 25,
-                text: text,
-                textFill: '#000',
-                textAlign: 'letf',
-                textFont: 10 + 'px consolas',
-                textPadding: 3,
-                textBackgroundColor: this.device.model.style.tipBackgroundColor
-            }
-        });
-        this.add(this.arrowText);
-        this.arrowText.hide();
-    }
-
-    mouseover() {
-        this.device.deviceModel.down = true;
-        this.arrowText.show();
-    }
-
-    mouseout() {
-        if (this.device.deviceModel.down) {
-            this.arrowText.hide();
-            this.device.deviceModel.down = false;
-        }
-    }
-
-}
-export default EMouse;
diff --git a/src/jmap/shape/Train/TrainBody.js b/src/jmap/shape/Train/TrainBody.js
deleted file mode 100644
index 559d56f6a..000000000
--- a/src/jmap/shape/Train/TrainBody.js
+++ /dev/null
@@ -1,240 +0,0 @@
-import Group from 'zrender/src/container/Group';
-import TrainBodyBox from './TrainBodyBox';
-import '../StationStand/EDetain';
-import ETextName from '../element/ETextName'; // 名称文字 (共有)
-import EMouse from './EMouse';
-import store from '@/store/index_APP_TARGET';
-
-/** 车身*/
-export default class TrainBody extends Group {
-    constructor(model) {
-        super();
-        this.model = model;
-        this.deviceModel = model.model;
-        this.nameFormat = model.nameFormat;
-        this.create();
-        this.createMouse(); 			// 鼠标事件
-    }
-
-    createMouse() {
-        this.mouseEvent = new EMouse(this);
-        this.add(this.mouseEvent);
-        if (this.deviceModel.down) {
-            store.dispatch('map/setTrainDetails', this.deviceModel);
-            this.mouseEvent.mouseover();
-        }
-
-        this.on('mouseover', () => {
-            store.dispatch('map/setTrainDetails', this.deviceModel);
-            this.mouseEvent.mouseover();
-        });
-        this.on('mouseout', () => {
-            store.dispatch('map/setTrainDetails', null);
-            this.mouseEvent.mouseout();
-        });
-    }
-
-    create() {
-        const model = this.model;
-        const style = this.model.style;
-        this.trainBodyBox = new TrainBodyBox({
-            zlevel: model.zlevel,
-            z: model.z,
-            point: model.point,
-            style: style
-        });
-
-        const beginX = (model.point.x + style.Train.trainBody.lrPadding);
-        const beginY = (model.point.y - style.Train.hsda.trainHSDATextFontSize - style.Train.hsda.upPaddingHSDA);
-        const margin = (style.Train.common.trainWidth - style.Train.hsda.lrPaddingHSDA * 2) / 4;
-
-        this.textH = style.Train.common.haveTextHSDA ? new ETextName({
-            zlevel: model.zlevel,
-            z: model.z,
-            x: parseInt(beginX + margin * 0),
-            y: parseInt(beginY),
-            text: style.Train.hsda.textHContent,
-            textFill: style.trainYellowColor,
-            fontSize: style.Train.hsda.trainHSDATextFontSize,
-            fontFamily: style.Train.common.fontFamily,
-            textAlign: 'middle',
-            textVerticalAlign: 'top'
-        }) : '';
-        this.textS = style.Train.common.haveTextHSDA ? new ETextName({
-            zlevel: model.zlevel,
-            z: model.z,
-            x: parseInt(beginX + margin * 1),
-            y: parseInt(beginY),
-            text: style.Train.hsda.textSContent,
-            textFill: style.trainBlueColor,
-            fontSize: style.Train.hsda.trainHSDATextFontSize,
-            fontFamily: style.Train.common.fontFamily,
-            textAlign: 'middle',
-            textVerticalAlign: 'top'
-        }) : '';
-        this.textD = style.Train.common.haveTextHSDA ? new ETextName({
-            zlevel: model.zlevel,
-            z: model.z,
-            x: parseInt(beginX + margin * 2),
-            y: parseInt(beginY),
-            text: style.Train.hsda.textDContent,
-            textFill: style.trainGreenColor,
-            fontSize: style.Train.hsda.trainHSDATextFontSize,
-            fontFamily: style.Train.common.fontFamily,
-            textAlign: 'middle',
-            textVerticalAlign: 'top'
-        }) : '';
-        this.textA = style.Train.common.haveTextHSDA ? new ETextName({
-            zlevel: model.zlevel,
-            z: model.z,
-            x: parseInt(beginX + margin * 3),
-            y: parseInt(beginY),
-            text: style.Train.hsda.textAContent,
-            textFill: style.trainRedColor,
-            fontSize: style.Train.hsda.trainHSDATextFontSize,
-            fontFamily: style.Train.common.fontFamily,
-            textAlign: 'middle',
-            textVerticalAlign: 'top'
-        }) : '';
-        const serviceNumber = style.Train.trainServer.serviceNumberPrefix + (model.serviceNumber || style.Train.trainServer.defaultServiceNumber) + '';//	服务号(表号)
-        const tripNumber = style.Train.trainTarget.tripNumberPrefix + (style.Train.trainTarget.defaultDirectionCode
-            ? (model.directionCode || style.Train.trainTarget.defaultDirectionCode) + (model.tripNumber || style.Train.trainTarget.defaultTripNumber)
-            : model.tripNumber || style.Train.trainTarget.defaultTripNumber) + ''; //  车次号
-        const targetCode = style.Train.trainNumber.targetCodePrefix + (model.targetCode || style.Train.trainNumber.defaultTargetCode) + ''; //  目的地码
-        const groupNumber = style.Train.trainTargetNumber.groupNumberPrefix + (model.groupNumber || style.Train.trainTargetNumber.defaultGroupNumber) + ''; //  车组号
-        this.textTrainServer = new ETextName({
-            zlevel: model.zlevel,
-            z: model.z + 1,
-            x: parseInt(model.point.x + style.Train.trainServer.trainServerOffset.x),
-            y: parseInt(model.point.y + style.Train.trainServer.trainServerOffset.y),
-            text: serviceNumber.substring(serviceNumber.length - style.Train.trainServer.serviceNumberPrefix.length),
-            textFill: style.trainTextColor,
-            fontSize: model.fontSize,
-            fontFamily: style.Train.common.fontFamily,
-            textAlign: 'left',
-            textVerticalAlign: 'top'
-        });
-        this.textTrainTarget = new ETextName({
-            zlevel: this.model.zlevel,
-            z: this.model.z + 1,
-            x: parseInt(model.point.x + model.style.Train.trainTarget.trainTargetOffset.x),
-            y: parseInt(model.point.y + model.style.Train.trainTarget.trainTargetOffset.y),
-            text: tripNumber.substring(tripNumber.length - style.Train.trainTarget.tripNumberPrefix.length),
-            textFill: style.trainTextColor,
-            fontSize: model.fontSize,
-            fontFamily: style.Train.common.fontFamily,
-            textAlign: style.Train.trainTarget.trainTargetTextAlign,
-            textVerticalAlign: 'top'
-        });
-        this.textTrainNumber = new ETextName({
-            zlevel: model.zlevel,
-            z: model.z + 1,
-            x: parseInt(model.point.x + style.Train.trainNumber.trainNumberOffset.x),
-            y: parseInt(model.point.y + style.Train.trainNumber.trainNumberOffset.y),
-            text: targetCode.substring(targetCode.length - 3),
-            textFill: style.trainTextColor,
-            textStroke: style.trainTextColor,
-            fontWeight: 400,
-            textStrokeWidth: 0,
-            fontSize: model.fontSize,
-            fontFamily: style.Train.common.fontFamily,
-            textAlign: 'left',
-            textVerticalAlign: 'top'
-        });
-        this.textTrainTargetNumber = new ETextName({
-            zlevel: model.zlevel,
-            z: model.z + 1,
-            x: parseInt(model.point.x - style.Train.trainBody.lrPadding),
-            y: parseInt(model.point.y + style.Train.trainBody.upPadding),
-            text: groupNumber.substring(groupNumber.length - 3),
-            textFill: style.trainTextColor,
-            textStroke: style.trainTextColor,
-            textStrokeWidth: 0,
-            fontSize: model.fontSize,
-            fontFamily: style.Train.common.fontFamily,
-            textAlign: 'left',
-            textVerticalAlign: 'top'
-        });
-        this.formatChangePosition(model, style);
-        this.add(this.trainBodyBox);
-        if (style.Train.common.haveTextHSDA) {
-            this.add(this.textH);
-            this.add(this.textS);
-            this.add(this.textD);
-            this.add(this.textA);
-        }
-    }
-
-    removeTrainDetail() {
-        this.mouseEvent.mouseout();
-        store.dispatch('map/setTrainDetails', null);
-        this.deviceModel.down = false;
-    }
-    setTrainColor(color) {
-        this.trainBodyBox && this.trainBodyBox.setStyle('fill', color);
-    }
-    setTextTrainServerColor(color) {
-        this.textTrainServer && this.textTrainServer.setStyle('textFill', color);
-        this.textTrainServer && this.textTrainServer.setStyle('textStroke', color);
-    }
-    setTextTrainTargetColor(color) {
-        this.textTrainTarget && this.textTrainTarget.setStyle('textFill', color);
-        this.textTrainTarget && this.textTrainTarget.setStyle('textStroke', color);
-    }
-    setTextTrainNumberColor(color) {
-        this.textTrainNumber && this.textTrainNumber.setStyle('textFill', color);
-        this.textTrainNumber && this.textTrainNumber.setStyle('textStroke', color);
-    }
-    setTextTrainTargetNumberColor(color) {
-        this.textTrainTargetNumber && this.textTrainTargetNumber.setStyle('textFill', color);
-        this.textTrainTargetNumber && this.textTrainTargetNumber.setStyle('textStroke', color);
-    }
-    setHShow(isShow) {
-        if (this.textH) {
-            isShow ? this.textH.show() : this.textH.hide();
-        }
-    }
-    setSShow(isShow) {
-        if (this.textS) {
-            isShow ? this.textS.show() : this.textS.hide();
-        }
-    }
-    setDShow(isShow) {
-        if (this.textD) {
-            isShow ? this.textD.show() : this.textD.hide();
-        }
-    }
-    setAShow(isShow) {
-        if (this.textA) {
-            isShow ? this.textA.show() : this.textA.hide();
-        }
-    }
-    setBodyBoxShape(key, color) {
-        this.trainBodyBox && this.trainBodyBox.setColor(key, color);
-    }
-    formatChangePosition(model, style) {
-        if (this.nameFormat) {
-            const arr = this.nameFormat.split(':');
-            let widthText = 0;
-            arr.forEach(ele => {
-                if (ele == 'targetCode') {
-                    this.textTrainNumber.setStyle('x', parseInt(model.point.x + widthText + style.Train.common.textOffset) );
-                    widthText += this.textTrainNumber.getBoundingRect().width;
-                    this.add(this.textTrainNumber);
-                } else if (ele == 'serviceNumber') {
-                    this.textTrainServer.setStyle('x', parseInt(model.point.x + widthText + style.Train.common.textOffset));
-                    widthText += this.textTrainServer.getBoundingRect().width;
-                    this.add(this.textTrainServer);
-                } else if (ele == 'tripNumber') {
-                    this.textTrainTarget.setStyle('x', parseInt(model.point.x + widthText + style.Train.common.textOffset));
-                    widthText += this.textTrainTarget.getBoundingRect().width;
-                    this.add(this.textTrainTarget);
-                } else if (ele == 'groupNumber') {
-                    this.textTrainTargetNumber.setStyle('x', parseInt(model.point.x + widthText + style.Train.common.textOffset));
-                    widthText += this.textTrainTargetNumber.getBoundingRect().width;
-                    this.add(this.textTrainTargetNumber);
-                }
-            });
-        }
-    }
-}
diff --git a/src/jmap/shape/Train/TrainBodyBox.js b/src/jmap/shape/Train/TrainBodyBox.js
deleted file mode 100644
index d3e442232..000000000
--- a/src/jmap/shape/Train/TrainBodyBox.js
+++ /dev/null
@@ -1,33 +0,0 @@
-import Group from 'zrender/src/container/Group';
-import Rect from 'zrender/src/graphic/shape/Rect';
-
-export default class TrainBodyBox extends Group {
-	constructor(model) {
-		super();
-		this.model = model;
-		this.create();
-	}
-	create() {
-		const model = this.model;
-		this.trainBodyBox = new Rect({
-			zlevel: model.zlevel,
-			z: model.z,
-			shape: {
-				x: model.point.x,
-				y: model.point.y,
-				width: model.style.Train.common.trainWidth,
-				height: model.style.Train.common.trainHeight
-			},
-			style: {
-				lineWidth: model.style.Train.trainBody.trainBodyLineWidth,
-				stroke: model.style.trainSidelineColor,
-				fill: model.style.Train.trainBody.trainBodyFillColor
-			},
-			cursor: 'pointer'
-		});
-		this.add(this.trainBodyBox);
-	}
-	setColor(key, color) {
-		this.trainBodyBox.setStyle(key, color);
-	}
-}
diff --git a/src/jmap/shape/Train/TrainHead.js b/src/jmap/shape/Train/TrainHead.js
deleted file mode 100644
index feea74c7c..000000000
--- a/src/jmap/shape/Train/TrainHead.js
+++ /dev/null
@@ -1,61 +0,0 @@
-import Group from 'zrender/src/container/Group';
-import Rect from 'zrender/src/graphic/shape/Rect';
-import Polygon from 'zrender/src/graphic/shape/Polygon';
-
-/** 车头*/
-export default class TrainHead extends Group {
-	constructor(model) {
-		super();
-		this.model = model;
-		this.create();
-	}
-	create() {
-		const model = this.model;
-		const style = this.model.style;
-		const baseMargin = (model.drect === -1 ? 1 : 0);
-		this.line = new Rect({
-			zlevel: model.zlevel,
-			z: model.z,
-			shape: {
-				x: model.point.x - baseMargin * (style.Train.trainHead.trainConntWidth),
-				y: model.point.y,
-				width: style.Train.trainHead.trainConntWidth * model.scale,
-				height: style.Train.trainHead.trainHeadRectHeight
-			},
-			style: {
-				lineWidth: 0.1,
-				stroke: style.trainSidelineColor,
-				fill: style.Train.trainHead.trainHeadFillColor
-			}
-		});
-		this.arrow = new Polygon({
-			zlevel: model.zlevel,
-			z: model.z,
-			shape: {
-				points: [
-					[model.point.x + model.drect * (style.Train.trainHead.trainHeadTriangleFirst.x), model.point.y + style.Train.trainHead.trainHeadTriangleFirst.y],
-					[model.point.x + model.drect * (style.Train.trainHead.trainHeadTriangleSecond.x), model.point.y + style.Train.trainHead.trainHeadTriangleSecond.y],
-					[model.point.x + model.drect * (style.Train.trainHead.trainHeadTriangleThird.x), model.point.y + style.Train.trainHead.trainHeadTriangleThird.y]
-				]
-			},
-			style: {
-				lineWidth: 0.1,
-				stroke: style.trainSidelineColor,
-				fill: style.Train.trainHead.trainHeadFillColor
-			}
-		});
-
-		this.add(this.line);
-		this.add(this.arrow);
-	}
-	setColor(color) {
-		this.line && this.line.setStyle('fill', color);
-		this.arrow && this.arrow.setStyle('fill', color);
-	}
-	setLineShow(isShow) {
-		isShow ? this.line.show() : this.line.hide();
-	}
-	setArrowShow(isShow) {
-		isShow ? this.arrow.show() : this.arrow.hide();
-	}
-}
diff --git a/src/jmap/shape/Train/index.js b/src/jmap/shape/Train/index.js
deleted file mode 100644
index 2c526caa9..000000000
--- a/src/jmap/shape/Train/index.js
+++ /dev/null
@@ -1,409 +0,0 @@
-import Group from 'zrender/src/container/Group';
-import TrainHead from './TrainHead';
-import TrainBody from './TrainBody';
-import BoundingRect from 'zrender/src/core/BoundingRect';
-import Rect from 'zrender/src/graphic/shape/Rect';
-
-/** 列车 */
-export default class Train extends Group {
-    constructor(model, style) {
-        super();
-        this._code = model.code;
-        this._type = model._type;
-        this.zlevel = model.zlevel;
-        this.model = model;
-        this.style = style;
-        this.z = 40;
-        this.size = 0;
-        this.section = null;
-        this.fontSize = style.Train.common.useSelfText ? style.Train.common.nameFontSize || style.Train.common.trainTextFontSize : model.nameFontSize || style.Train.common.nameFontSize || style.Train.common.trainTextFontSize;
-        this.newScale = this.fontSize / style.Train.common.trainTextFontSize;
-        this.nameFormat = style.Train.common.useSelfFormat ? style.Train.trainBody.trainNameFormat : model.nameFormat || style.Train.trainBody.trainNameFormat;
-        if ( style.Train.trainBody.specialTrainType.length > 0) {
-            style.Train.trainBody.specialTrainType.some((item) =>{
-                if (model.type === item.type) {
-                    this.nameFormat = item.nameFormat;
-                    model.serviceNumber = item.serviceNumber ? item.serviceNumber : model.serviceNumber;
-                    return true;
-                }
-            });
-        }
-        this.create();
-        this.setState(model);
-    }
-
-    _computed() {
-        const model = this.model;
-        const style = this.style;
-        if (model.trainWindowModel) {
-            this.point = {
-                x: model.trainWindowModel.point.x,
-                y: model.trainWindowModel.point.y
-            };
-            switch (model.directionType) {
-            case '01':	// 未知方向
-                this.point.x = this.point.x + model.trainWindowModel.width / 2 + Math.abs((style.Train.common.trainWidth - model.trainWindowModel.width) / 2);
-                break;
-            case '02':	// 从左向右
-                this.point.x = this.point.x + model.trainWindowModel.width / 2 - style.Train.trainHead.trainConntWidth * this.newScale - style.Train.common.trainWidth;
-                break;
-            case '03':	// 从右向左
-                this.point.x = this.point.x - model.trainWindowModel.width / 2 + style.Train.trainHead.trainConntWidth * this.newScale;
-                break;
-            }
-        } else {
-            this.point = model.position;
-            this.traingle = null;
-        }
-    }
-    create() {
-        this._computed();
-        this.isChangeTrainWidth(this.model, this.style);
-        const model = this.model;
-        const style = this.style;
-        if (this.point) {
-            this.trainB = new TrainBody({
-                zlevel: this.zlevel,
-                z: this.z,
-                style: style,
-                point: this.point,
-                destinationStatus: model.destinationStatus,
-                serviceNumber: model.serviceNumber,
-                tripNumber: model.tripNumber,
-                targetCode: model.targetCode,
-                groupNumber: model.groupNumber,
-                directionType: model.directionType,
-                directionCode: model.directionCode,
-                sectionModel: model.sectionModel,
-                runControlStatus: model.runControlStatus,
-                runStatus: model.runStatus,
-                fontSize: this.fontSize,
-                nameFormat: this.nameFormat,
-                type: model.type,
-                speed: model.speed,
-                maLen: model.maLen,
-                model: model
-            });
-            this.trainL = new TrainHead({
-                style: style,
-                zlevel: this.zlevel,
-                z: this.z,
-                point: {
-                    x: this.point.x - style.Train.common.trainHeadDistance,
-                    y: this.point.y
-                },
-                drect: -1,
-                scale: this.newScale
-            });
-
-            this.trainR = new TrainHead({
-                style: style,
-                zlevel: this.zlevel,
-                z: this.z,
-                point: {
-                    x: this.point.x + style.Train.common.trainWidth + style.Train.common.trainHeadDistance,
-                    y: this.point.y
-                },
-                drect: 1,
-                scale: this.newScale
-            });
-
-            this.add(this.trainB);
-            this.add(this.trainL);
-            this.add(this.trainR);
-        }
-        if (style.Train.common.haveTrainBorder) {
-            this.createTrainBorder();
-        }
-    }
-
-    // 获取设备提示坐标
-    getShapeTipPoint() {
-    }
-
-    // 恢复颜色状态
-    recover() {
-        this.trainB && this.trainB.setHShow(false);
-        this.trainB && this.trainB.setSShow(false);
-        this.trainB && this.trainB.setDShow(false);
-        this.trainB && this.trainB.setAShow(false);
-
-        this.trainL && this.trainL.setLineShow(false);
-        this.trainR && this.trainR.setLineShow(false);
-        this.trainL && this.trainL.setArrowShow(false);
-        this.trainR && this.trainR.setArrowShow(false);
-    }
-
-    // 设置服务号状态类型
-    setServerNoType(type) {
-        if (this.style.Train.trainStatusStyle.serverNoType.length > 0) {
-            const flag = this.style.Train.trainStatusStyle.serverNoType.some((item) =>{
-                if (type === item.type) {
-                    this.trainB && this.trainB.setTextTrainServerColor(item.showColor);
-                    return true;
-                }
-            });
-            if (this.style.Train.trainStatusStyle.defaultServerNoColor && !flag) {
-                this.trainB && this.trainB.setTextTrainServerColor(this.style.Train.trainStatusStyle.defaultServerNoColor);
-            }
-        }
-    }
-
-    // 设置目的地状态
-    setDestinationStatus(status) {
-        if (this.style.Train.trainStatusStyle.destinationStatus.length > 0) {
-            const flag = this.style.Train.trainStatusStyle.destinationStatus.some((item) =>{
-                if (status === item.status) {
-                    switch (this.style.Train.trainStatusStyle.destinationStatusSetText) {
-                    case 'trainTarget':
-                        this.trainB && this.trainB.setTextTrainTargetColor(item.showColor);
-                        break;
-                    case 'trainServer':
-                        this.trainB && this.trainB.setTextTrainServerColor(item.showColor);
-                        break;
-                    case 'trainWindowBorder':
-                        this.trainB && this.trainB.setBodyBoxShape('stroke', item.showColor);
-                        break;
-                    default:
-                        this.trainB && this.trainB.setTextTrainTargetColor(item.showColor);
-                    }
-                    return true;
-                }
-            });
-            if (this.style.Train.trainStatusStyle.defaultDestinationColor && !flag) {
-                switch (this.style.Train.trainStatusStyle.destinationStatusSetText) {
-                case 'trainTarget':
-                    this.trainB && this.trainB.setTextTrainTargetColor(this.style.Train.trainStatusStyle.defaultDestinationColor);
-                    break;
-                case 'trainServer':
-                    this.trainB && this.trainB.setTextTrainServerColor(this.style.Train.trainStatusStyle.defaultDestinationColor);
-                    break;
-                case 'trainWindowBorder':
-                    this.trainB && this.trainB.setBodyBoxShape('stroke', this.style.Train.trainStatusStyle.defaultDestinationColor);
-                    break;
-                default:
-                    this.trainB && this.trainB.setTextTrainTargetColor(this.style.Train.trainStatusStyle.defaultDestinationColor);
-                }
-            }
-        }
-    }
-
-    // 设置运行方向状态类型
-    setDirectionType(type, flag) {
-        if (this.style.Train.trainStatusStyle.directionType.length > 0) {
-            this.style.Train.trainStatusStyle.directionType.forEach((item) => {
-                if (type === item.type) {
-                    let lineLShow = item.lineLShow;
-                    let arrowLShow = item.arrowLShow;
-                    let lineRShow = item.lineRShow;
-                    let arrowRShow = item.arrowRShow;
-                    if (flag) {
-                        lineLShow = !item.lineLShow;
-                        arrowLShow = !item.arrowLShow;
-                        lineRShow = !item.lineRShow;
-                        arrowRShow = !item.arrowRShow;
-                    }
-                    this.trainL && this.trainL.setLineShow(lineLShow);
-                    this.trainL && this.trainL.setArrowShow(arrowLShow);
-                    this.trainR && this.trainR.setLineShow(lineRShow);
-                    this.trainR && this.trainR.setArrowShow(arrowRShow);
-                    return true;
-                }
-            });
-        }
-    }
-    // 设置列车停止方向类型
-    setDirectionStopType(type) {
-        if (this.style.Train.trainStatusStyle.directionStopType.length > 0) {
-            this.style.Train.trainStatusStyle.directionStopType.forEach((item) => {
-                if (type === item.type) {
-                    this.trainL && this.trainL.setLineShow(item.lineLShow);
-                    this.trainR && this.trainR.setLineShow(item.lineRShow);
-                    return true;
-                }
-            });
-        }
-    }
-    // 设置运行状态
-    setRunStatus(status, flag) {
-        switch (status) {
-        case '01':	// 停止
-            this.setDirectionStopType(this.model.directionType); // 设置运行方向状态类型
-            break;
-        case '02': // 运行
-            this.setDirectionType(this.model.directionType, flag);	// 设置运行方向状态类型
-            break;
-        }
-
-    }
-    // 设置运行模式
-    setRunMode(status) {
-        if (this.style.Train.trainStatusStyle.runModeStatus.length > 0) {
-            this.style.Train.trainStatusStyle.runModeStatus.some((item) => {
-                if (status === item.status) {
-                    this.trainL && this.trainL.setColor(item.trainLColor);
-                    this.trainR && this.trainR.setColor(item.trainRColor);
-                    return true;
-                }
-            });
-        }
-    }
-    // 设置运行控制状态类型
-    setRunControlStatus(status) {
-        if (this.style.Train.trainStatusStyle.runControlStatus.length > 0) {
-            this.style.Train.trainStatusStyle.runControlStatus.some((item) => {
-                if (status === item.status) {
-                    this.trainB && this.trainB.setHShow(item.hShow);
-                    this.trainB && this.trainB.setSShow(item.sShow);
-                    return true;
-                }
-            });
-        }
-    }
-    // 设置车门状态类型
-    setDoorStatus(status) {
-        if (this.style.Train.trainStatusStyle.doorStatus.length > 0) {
-            this.style.Train.trainStatusStyle.doorStatus.some((item) => {
-                if (status === item.status) {
-                    this.trainB && this.trainB.setDShow(item.dShow);
-                    return true;
-                }
-            });
-        }
-    }
-    // 设置通信状态类型
-    setCommunicationStatus() {
-        if (this.style.Train.trainStatusStyle.communicationStatus.length > 0) {
-            this.style.Train.trainStatusStyle.communicationStatus.some((item) => {
-                if (status === item.status) {
-                    this.trainB && this.trainB.setTrainColor(item.trainColor);
-                    return true;
-                }
-            });
-        }
-    }
-    // 设置报警状态
-    setAlarmStatus(status) {
-        if (this.style.Train.trainStatusStyle.alarmStatus.length > 0) {
-            this.style.Train.trainStatusStyle.alarmStatus.some((item) => {
-                if (status === item.status) {
-                    this.trainB && this.trainB.setAShow(item.aShow);
-                    return true;
-                }
-            });
-        }
-    }
-    setTrainTypeStatus(type) {
-        if (this.style.Train.trainStatusStyle.trainTypeStatus) {
-            this.style.Train.trainStatusStyle.trainTypeStatus.some((item) => {
-                if ( type === item.type) {
-                    item.serviceNumberColor && this.trainB && this.trainB.setTextTrainServerColor(item.serviceNumberColor);
-                    item.trainNumberColor && this.trainB && this.trainB.setTextTrainNumberColor(item.trainNumberColor);
-                    item.trainTargetColor && this.trainB && this.trainB.setTextTrainTargetColor(item.trainTargetColor);
-                    item.groupNumberColor && this.trainB && this.trainB.setTextTrainTargetNumberColor(item.groupNumberColor);
-                }
-            });
-        }
-    }
-    // 设置状态
-    setState(model) {
-        this.model = model;
-        // let points = [];
-        const flag = false;
-        // if (this.model.sectionModel && this.model.sectionModel.points) {
-        //     points = this.model.sectionModel.points;
-        //     if (points.length) {
-        //         const pointFlag = points[0].x - points[points.length - 1].x;
-        //         if (pointFlag > 0) {
-        //             flag = true; // 方向去反
-        //         }
-        //     }
-        // }
-        if (model) {
-            this.recover();
-            this.setServerNoType(model.serverNoType); 				// 设置服务号状态类型
-            this.setDestinationStatus(model.destinationStatus);		// 设置目的地状态
-            this.setRunStatus(model.runStatus, flag); // 设置运行状态
-            this.setRunMode(model.runMode); 						// 设置运行模式
-            this.setRunControlStatus(model.runControlStatus); 		// 设置运行控制状态类型
-            this.setDoorStatus(model.doorStatus); 					// 设置车门状态类型
-            this.setCommunicationStatus(model.communicationStatus); // 设置通信状态类型
-            this.setAlarmStatus(model.alarmStatus); 				// 设置报警状态
-            this.setTrainTypeStatus(model.type); // 根据列车类型设置列车识别号样式
-        }
-    }
-    // 是否根据车身上车组号、服务号、车次号、目的地码显示情况改变列车长度
-    isChangeTrainWidth(model, style) {
-        if (!style.Train.trainBody.changeTrainWidth) { return; }
-        if (this.nameFormat) {
-            const arr = this.nameFormat.split(':');
-            arr.forEach(ele => {
-                switch (ele) {
-                case 'targetCode': {
-                    this.size += (style.Train.trainNumber.targetCodePrefix || '').length;
-                    break;
-                }
-                case 'serviceNumber': {
-                    this.size += (style.Train.trainServer.serviceNumberPrefix || '').length;
-                    break;
-                }
-                case 'tripNumber': {
-                    this.size += (style.Train.trainTarget.tripNumberPrefix || '').length;
-                    break;
-                }
-                case 'groupNumber': {
-                    this.size += (style.Train.trainTargetNumber.groupNumberPrefix || '').length;
-                    break;
-                }
-                }
-            });
-        } else {
-            this.size = 9;
-        }
-        this.style.Train.common.trainWidth = this.size * this.fontSize * this.style.Train.common.aspectRatio + this.style.Train.common.trainWidthMoreText;
-    }
-    removeTrainDetail() {
-        this.trainB && this.trainB.removeTrainDetail();
-    }
-
-    getBoundingRect() {
-        const list = [this.trainB, this.trainL, this.trainR];
-        let rect = null;
-
-        list.forEach(elem => {
-            if (elem) {
-                const tempRect = elem.getBoundingRect();
-                if (tempRect.x && tempRect.y && tempRect.width && tempRect.height) {
-                    if (rect) {
-                        rect.union(tempRect);
-                    } else {
-                        rect = tempRect;
-                    }
-                }
-            }
-        });
-
-        return rect || new BoundingRect(0, 0, 0, 0);
-    }
-    createTrainBorder() {
-        const rect = Object.assign({}, this.getBoundingRect());
-        rect.x -= this.style.Train.common.trainWidth / 2;
-        rect.y -= 5;
-        rect.width += this.style.Train.common.trainWidth;
-        rect.height += 10;
-
-        this.trainBorder = new Rect({
-            zlevel: this.zlevel,
-            z: this.z,
-            silent: true,
-            shape: rect,
-            style: {
-                lineDash: [3, 3],
-                stroke: this.style.borderColor,
-                fill: this.style.transparentColor
-            }
-        });
-
-        this.add(this.trainBorder);
-    }
-}
diff --git a/src/jmap/shape/TrainWindow/EMouse.js b/src/jmap/shape/TrainWindow/EMouse.js
deleted file mode 100644
index d059089c0..000000000
--- a/src/jmap/shape/TrainWindow/EMouse.js
+++ /dev/null
@@ -1,37 +0,0 @@
-export default class EMouse {
-	constructor(device) {
-		this.device = device;
-	}
-
-	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);
-			}
-		}
-	}
-
-	mouseout(e) {
-		if (this.device.prdType) {
-			this.device.setVisible(false || this.device.model.trainWindowShow);
-			const instance = this.device.getInstanceByCode(this.device.model.sectionCode);
-			if (instance && instance.mouseEvent && instance.mouseEvent.mouseout) {
-				instance.mouseEvent.mouseLeave(e);
-			}
-		}
-	}
-
-	mouseEnter(e) {
-		if (this.device.prdType) {
-			this.device.setVisible(true);
-		}
-	}
-
-	mouseLeave(e) {
-		if (this.device.prdType ) {
-			this.device.setVisible(false);
-		}
-	}
-}
diff --git a/src/jmap/shape/TrainWindow/index.js b/src/jmap/shape/TrainWindow/index.js
deleted file mode 100644
index 3403d39df..000000000
--- a/src/jmap/shape/TrainWindow/index.js
+++ /dev/null
@@ -1,83 +0,0 @@
-/* 车次窗*/
-import Polygon from 'zrender/src/graphic/shape/Polygon';
-import Group from 'zrender/src/container/Group';
-import EMouse from './EMouse';
-import store from '@/store/index_APP_TARGET';
-
-class TrainWindow extends Group {
-    constructor(model, style) {
-        super();
-        this._code = model.code;
-        this._type = model._type;
-        this.zlevel = model.zlevel;
-        this.model = model;
-        this.style = style;
-        this.z = 9;
-        this.prdType = store.state.training.prdType;
-        this.create(model);
-        this.createMouseEvent();
-        this.setState(model);
-    }
-    create(model) {
-        if (this.prdType !== '01') {
-            this.createTrainWindow();
-        }
-    }
-
-    createMouseEvent() {
-        this.mouseEvent = new EMouse(this);
-        this.on('mouseout', (e) => { this.mouseEvent.mouseout(e); });
-        this.on('mouseover', (e) => { this.mouseEvent.mouseover(e); });
-    }
-
-    /** 创建车次窗*/
-    createTrainWindow() {
-        const model = this.model;
-        const point = model.point || model.position;
-        this.trainRect = new Polygon({
-            _subType: 'TrainWindow',
-            zlevel: this.zlevel,
-            z: this.z - 1,
-            shape: {
-                smooth: this.style.TrainWindow.trainWindowSmooth,
-                points: [
-                    [point.x - model.width / 2, point.y],
-                    [point.x + model.width / 2, point.y],
-                    [point.x + model.width / 2, point.y + model.height],
-                    [point.x - model.width / 2, point.y + model.height]
-                ]
-            },
-            style: {
-                lineDash: this.style.TrainWindow.lineDash,
-                lineWidth: this.style.TrainWindow.lineWidth,
-                stroke: this.style.TrainWindow.lineColor,
-                fill: this.style.transparentColor
-            }
-        });
-        this.add(this.trainRect);
-    }
-
-    isPop(e) {
-        for (var i = 0; i < this.childCount(); i++) {
-            var rect = this.childAt(i).getBoundingRect();
-            if (rect.contain(e.offsetX, e.offsetY) && this.childAt(i).pop) {
-                return true;
-            }
-        }
-    }
-
-    setState(model) {
-        this.setVisible(model.trainWindowShow);
-    }
-
-    setVisible(show) {
-        this.trainRect && this.trainRect.setStyle('lineWidth', show ? 1 : 0);
-
-    }
-
-    getInstanceByCode(code) {
-        return (store.getters['map/getDeviceByCode'](code) || {}).instance;
-    }
-}
-
-export default TrainWindow;
diff --git a/src/jmap/shape/ZcControl/EMouse.js b/src/jmap/shape/ZcControl/EMouse.js
deleted file mode 100644
index 0855053f9..000000000
--- a/src/jmap/shape/ZcControl/EMouse.js
+++ /dev/null
@@ -1,54 +0,0 @@
-import Group from 'zrender/src/container/Group';
-import Text from 'zrender/src/graphic/Text';
-
-export default class EMouse extends Group {
-	constructor(device) {
-		super();
-		this.device = device;
-		this.create();
-	}
-	create() {
-		this.text = new Text({
-			_subType: 'Text',
-			zlevel: this.device.zlevel,
-			z: this.device.z+1,
-			position: [0, 0],
-			style: {
-				x: this.device.model.position.x,
-				y: this.device.model.position.y + this.device.style.ZcControl.lamp.radiusR + this.device.style.ZcControl.text.distance-30,
-				fontWeight: this.device.style.ZcControl.mouseOverStyle.fontWeight,
-				fontSize: this.device.style.ZcControl.mouseOverStyle.fontSize,
-				fontFamily: this.device.style.ZcControl.mouseOverStyle.fontFormat,
-				text: this.device.model.name,
-				textFill: this.device.style.ZcControl.mouseOverStyle.fontColor,
-				textAlign: this.device.style.ZcControl.mouseOverStyle.textAlign,
-				textVerticalAlign: this.device.style.ZcControl.mouseOverStyle.textVerticalAlign
-			}
-		});
-		this.add(this.text);
-		this.text.hide();
-	}
-	mouseover(e) {
-		if (e.target && e.target._subType == 'Text') {
-			this.text.show();
-		} else {
-			this.device.control.setControlColor(this.device.style.ZcControl.mouseOverStyle.arcColor);
-			this.device.control.setTextColor(this.device.style.ZcControl.mouseOverStyle.textColor);
-			this.device.control.setTextBorder(true);
-			this.device.control.setArcBorder(true);
-		}
-	}
-
-	mouseout(e) {
-		if (!this.device.model.down) {
-			if (e.target && e.target._subType == 'Text') {
-				this.text.hide();
-			} else {
-				this.device.control.setControlColor(this.device.style.ZcControl.lamp.controlColor);
-				this.device.control.setTextColor('#FFFFFF');
-				this.device.control.setTextBorder(false);
-				this.device.control.setArcBorder(false);
-			}
-		}
-	}
-}
diff --git a/src/jmap/shape/ZcControl/index.js b/src/jmap/shape/ZcControl/index.js
deleted file mode 100644
index 425016973..000000000
--- a/src/jmap/shape/ZcControl/index.js
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
-*	ZC区域控制模式
-*/
-import Group from 'zrender/src/container/Group';
-import EControl from '../element/EControl';
-import EMouse from './EMouse';
-
-export default class ZcControl extends Group {
-	constructor(model, style) {
-		super();
-		this.z = 20;
-		this._code = model.code;
-		this._type = model._type;
-		this.zlevel = model.zlevel;
-		this.model = model;
-		this.style = style;
-		this.create(model);
-		this.createMouseEvent();
-		this.setState(model);
-
-	}
-
-	create(model) {
-		this.control = new EControl({
-			zlevel: this.zlevel,
-			z: this.z,
-			arc: {
-				shape: {
-					cx: model.position.x,
-					cy: model.position.y,
-					r: this.style.ZcControl.lamp.radiusR
-				},
-				lineWidth: 0,
-				fill: this.style.ZcControl.lamp.controlColor,
-				mouseover: this.mouseoverArc,
-				mouseout: this.mouseoutArc
-			},
-			text: {
-				position: [0, 0],
-				x: model.position.x,
-				y: model.position.y + this.style.ZcControl.lamp.radiusR + this.style.ZcControl.text.distance,
-				fontWeight: this.style.ZcControl.text.fontWeight,
-				fontSize: this.style.ZcControl.text.fontSize,
-				fontFamily: this.style.fontFamily,
-				text: model.name,
-				textFill: '#fff',
-				textAlign: 'middle',
-				textVerticalAlign: 'top',
-				mouseover: this.mouseoverText,
-				mouseout: this.mouseoutText
-			},
-			style: this.style
-		});
-
-		this.add(this.control);
-	}
-
-	// 设置状态
-	setState(model) {
-	}
-	createMouseEvent() {
-		if (this.style.ZcControl.mouseOverStyle) {
-			this.mouseEvent = new EMouse(this);
-			this.add(this.mouseEvent);
-			this.on('mouseout', (e) => { this.mouseEvent.mouseout(e); });
-			this.on('mouseover', (e) => { this.mouseEvent.mouseover(e); });
-		}
-	}
-	getShapeTipPoint() {
-		if (this.control) {
-			var distance = 2;
-			var rect = this.control.getBoundingRect();
-			return {
-				x: rect.x + rect.width / 2,
-				y: rect.y - distance
-			};
-		}
-		return null;
-	}
-}
diff --git a/src/jmap/shape/checkBox/checkBox.js b/src/jmap/shape/checkBox/checkBox.js
deleted file mode 100644
index 55ad94de6..000000000
--- a/src/jmap/shape/checkBox/checkBox.js
+++ /dev/null
@@ -1,46 +0,0 @@
-import Group from 'zrender/src/container/Group';
-import Rect from 'zrender/src/graphic/shape/Rect';
-
-export default class checkBox extends Group {
-    constructor(model, style) {
-        super();
-        this.model = model;
-        this._type = model._type;
-        this._code = model.code;
-        this.zlevel = model.zlevel;
-        this.z = model.z;
-        this.create();
-    }
-
-    create() {
-        const model = this.model;
-        this.grouper = new Group({
-            id: model.code,
-            position: [model.point.x, model.point.y]
-        });
-        this.box = new Rect({
-            zlevel: model.zlevel,
-            z: model.z,
-            draggable: false,
-            shape: {
-                x: 0,
-                y: 0,
-                width: this.model.width,
-                height: this.model.height
-            },
-            style: {
-                fill: 'rgb(135,206,250,0.2)'
-            }
-        });
-        this.grouper.add(this.box);
-        this.add(this.grouper);
-    }
-    setModel(dx, dy) {
-        this.model.point.x += dx;
-        this.model.point.y += dy;
-    }
-    setSize(width, height) {
-        this.model.width = width;
-        this.model.height = height;
-    }
-}
diff --git a/src/jmap/shape/element/EControl.js b/src/jmap/shape/element/EControl.js
deleted file mode 100644
index 650411dff..000000000
--- a/src/jmap/shape/element/EControl.js
+++ /dev/null
@@ -1,106 +0,0 @@
-import Group from 'zrender/src/container/Group';
-import Arc from 'zrender/src/graphic/shape/Arc';
-import Text from 'zrender/src/graphic/Text';
-import { createBoundingRect } from '../../utils/parser';
-import Rect from 'zrender/src/graphic/shape/Rect';
-
-/** lc zc limit 单灯元素*/
-export default class EControl extends Group {
-	constructor(model) {
-		super();
-		this.model = model;
-		this.zlevel = model.zlevel;
-		this.z = model.z;
-		this.style = model.style;
-		this.textStyle = model.text;
-		this.arcStyle = model.arc;
-		this.create();
-	}
-
-	create() {
-		this.control = new Arc({
-			_subType: 'Control',
-			zlevel: this.zlevel,
-			z: this.z,
-			shape: this.arcStyle.shape,
-			style: {
-				lineWidth: this.arcStyle.lineWidth,
-				fill: this.arcStyle.fill
-			},
-			onmouseover: this.arcStyle.mouseover,
-			onmouseout: this.arcStyle.mouseout
-		});
-
-		this.text = new Text({
-			_subType: 'Text',
-			zlevel: this.zlevel,
-			z: this.z,
-			position: this.textStyle.position,
-			style: {
-				x: this.textStyle.x,
-				y: this.textStyle.y,
-				fontWeight: this.textStyle.fontWeight,
-				fontSize: this.textStyle.fontSize,
-				fontFamily: this.textStyle.fontFamily,
-				text: this.textStyle.text,
-				textFill: this.textStyle.textFill,
-				textAlign: this.textStyle.textAlign,
-				textVerticalAlign: this.textStyle.textVerticalAlign
-			},
-			onmouseover: this.textStyle.mouseover,
-			onmouseout: this.textStyle.mouseout
-		});
-		const arcRect = this.getArcBoundingRect();
-		const textRect = this.getTextBoundingRect();
-		this.arcBorder = new Rect({
-			zlevel: this.zlevel,
-			z: this.z,
-			silent: true,
-			shape: arcRect,
-			style: {
-				lineDash: this.style.arcBorderStyle.lineDash,
-				stroke: this.style.arcBorderStyle.stroke,
-				fill: this.style.arcBorderStyle.fill
-			}
-		});
-		this.textBorder = new Rect({
-			zlevel: this.zlevel,
-			z: this.z-1,
-			silent: true,
-			shape: textRect,
-			style: {
-				lineDash: this.style.textBorderStyle.lineDash,
-				stroke: this.style.textBorderStyle.stroke,
-				fill: this.style.textBorderStyle.fill
-			}
-		});
-		this.add(this.control);
-		this.add(this.text);
-		this.add(this.textBorder);
-		this.add(this.arcBorder);
-		this.textBorder.hide();
-		this.arcBorder.hide();
-	}
-	setTextBorder(flag) {
-		flag?this.textBorder.show():this.textBorder.hide();
-	}
-	setArcBorder(flag) {
-		flag?this.arcBorder.show():this.arcBorder.hide();
-	}
-	getTextBoundingRect() {
-		return createBoundingRect(this.text);
-	}
-	getArcBoundingRect() {
-		return createBoundingRect(this.control);
-	}
-	setControlColor(color) {
-		if (color) {
-			this.control.setStyle('fill', color);
-		}
-	}
-	setTextColor(color) {
-		if (color) {
-			this.text.setStyle('textFill', color);
-		}
-	}
-}
diff --git a/src/jmap/shape/element/ETextName.js b/src/jmap/shape/element/ETextName.js
deleted file mode 100644
index 50bcb9fdc..000000000
--- a/src/jmap/shape/element/ETextName.js
+++ /dev/null
@@ -1,71 +0,0 @@
-// import Group from 'zrender/src/container/Group';
-import Text from 'zrender/src/graphic/Text';
-
-/** 名称元素*/
-export default function ETextName(model) {
-	const TextName = new Text({
-		_subType: 'Text',
-		zlevel: model.zlevel,
-		z: model.z,
-		silent: model.silent || false,
-		style: {
-			x: model.x,
-			y: model.y,
-			fontWeight: model.fontWeight,
-			fontSize: model.fontSize,
-			fontFamily: model.fontFamily,
-			text: model.text,
-			textStrokeWidth: model.textStrokeWidth,
-			textFill: model.textFill,
-			textAlign: model.textAlign,
-			textPosition: model.textPosition || 'inside',
-			textVerticalAlign: model.textVerticalAlign || null
-		}
-	});
-	return TextName;
-}
-// export default class ETextName extends Group {
-// 	constructor(model) {
-// 		super();
-// 		this.model = model;
-// 		this.zlevel = model.zlevel;
-// 		this.z = model.z;
-// 		this.create();
-// 	}
-
-// 	create() {
-// 		this.TextName = new Text({
-// 			_subType: this.model._subType,
-// 			zlevel: this.zlevel,
-// 			z: this.z,
-// 			silent: this.model.silent || false,
-// 			style: {
-// 				x: this.model.x,
-// 				y: this.model.y,
-// 				text: this.model.text,
-// 				textFont: this.model.textFont,
-// 				textFill: this.model.textFill,
-// 				textAlign: this.model.textAlign,
-// 				textPosition: this.model.textPosition || 'inside',
-// 				textVerticalAlign: this.model.textVerticalAlign || null
-// 			}
-// 		});
-// 		this.add(this.TextName);
-// 	}
-
-// 	setStyle(model) {
-// 		this.TextName.setStyle(model);
-// 	}
-
-// 	setColor(color) {
-// 		this.TextName.setStyle('textFill', color);
-// 	}
-
-// 	hide() {
-// 		this.TextName.hide();
-// 	}
-
-// 	show() {
-// 		this.TextName.show();
-// 	}
-// }
diff --git a/src/jmap/shape/factory.js b/src/jmap/shape/factory.js
deleted file mode 100644
index a19e73986..000000000
--- a/src/jmap/shape/factory.js
+++ /dev/null
@@ -1,53 +0,0 @@
-import deviceType from '../constant/deviceType';
-import Link from './Link/index.js';
-import Section from './Section/index.js';
-import Signal from './Signal/index.js';
-import Station from './Station/index.js';
-import StationControl from './StationControl/index.js';
-import ImageControl from './ImageControl/index.js';
-import LcControl from './LcControl/index.js';
-import LimitControl from './LimitControl/index.js';
-import Switch from './Switch/index.js';
-import ZcControl from './ZcControl/index.js';
-import ButtonControl from './ButtonControl/index.js';
-import StationCounter from './StationCounter/index.js';
-import StationDelayUnlock from './StationDelayUnlock/index.js';
-import StationStand from './StationStand/index.js';
-import TrainWindow from './TrainWindow/index.js';
-import Train from './Train/index.js';
-import Line from './Line/index.js';
-import Text2 from './Text/index.js';
-import CheckBox from './checkBox/checkBox.js';
-
-/** 图库*/
-const mapShape = {};
-mapShape[deviceType.Link] = Link;
-mapShape[deviceType.Section] = Section;
-mapShape[deviceType.Signal] = Signal;
-mapShape[deviceType.Station] = Station;
-mapShape[deviceType.StationControl] = StationControl;
-mapShape[deviceType.ImageControl] = ImageControl;
-mapShape[deviceType.LcControl] = LcControl;
-mapShape[deviceType.LimitControl] = LimitControl;
-mapShape[deviceType.Switch] = Switch;
-mapShape[deviceType.ZcControl] = ZcControl;
-mapShape[deviceType.ButtonControl] = ButtonControl;
-mapShape[deviceType.StationCounter] = StationCounter;
-mapShape[deviceType.StationDelayUnlock] = StationDelayUnlock;
-mapShape[deviceType.StationStand] = StationStand;
-mapShape[deviceType.TrainWindow] = TrainWindow;
-mapShape[deviceType.Train] = Train;
-mapShape[deviceType.Line] = Line;
-mapShape[deviceType.Text] = Text2;
-mapShape[deviceType.CheckBox] = CheckBox;
-
-function shapefactory(device, jmap) {
-    const type = device._type;
-    const shape = mapShape[type];
-    if (shape instanceof Function) {
-        // eslint-disable-next-line
-		return new shape(device, jmap.style);
-    }
-}
-
-export default shapefactory;
diff --git a/src/jmap/shape/utils/ShapePoints.js b/src/jmap/shape/utils/ShapePoints.js
deleted file mode 100644
index ffba459d6..000000000
--- a/src/jmap/shape/utils/ShapePoints.js
+++ /dev/null
@@ -1,102 +0,0 @@
-import Path from 'zrender/src/graphic/Path';
-
-/** 指向箭头坐标*/
-export function arrow(modelX, modelY, length, radius) {
-	return [
-		[modelX - length, modelY],
-		[modelX - length + radius / 1.5, modelY - radius / 1.2],
-		[modelX - length + radius / 1.5, modelY - radius / 3],
-		[modelX + length, modelY - radius / 3],
-		[modelX + length, modelY + radius / 3],
-		[modelX - length + radius / 1.5, modelY + radius / 3],
-		[modelX - length + radius / 1.5, modelY + radius / 1.2]
-	];
-}
-
-/** 指向三角形坐标*/
-export function triangular(modelX, modelY, drict, radius) {
-	return [
-		[modelX, modelY],
-		[modelX - drict * (radius + 2), modelY - radius],
-		[modelX - drict * (radius + 2), modelY + radius]
-	];
-}
-
-/** 屏蔽门手电筒*/
-export function flashlight(modelX, modelY, drict, width, height, offsetx, offsety, beyond) {
-	return [
-		[modelX + drict * (offsetx), modelY + drict * offsety - (height + beyond) / 2],
-		[modelX + drict * (offsetx + beyond), modelY + drict * offsety - height / 2],
-		[modelX + drict * (offsetx + beyond + width), modelY + drict * offsety - height / 2],
-		[modelX + drict * (offsetx + beyond + width), modelY + drict * offsety + height / 2],
-		[modelX + drict * (offsetx + beyond), modelY + drict * offsety + height / 2],
-		[modelX + drict * (offsetx), modelY + drict * offsety + (height + beyond) / 2]
-	];
-}
-
-/** 区段限速体带方向*/
-export function limitArrows(modelX, modelY, drict, radius) {
-	return [
-		[modelX + drict * radius, modelY - radius],
-		[modelX + drict * radius, modelY + radius],
-		[modelX - drict * radius, modelY + radius],
-		[modelX - drict * radius * 1.8, modelY],
-		[modelX - drict * radius, modelY - radius]
-	];
-}
-
-/** 区段折返标记*/
-export function turnbackArrows(modelX, modelY, drict, width, height) {
-	return [
-		[modelX - drict * (width - 1), modelY + height],
-		[modelX + drict * width / 2, modelY + height],
-		[modelX + drict * width / 2, modelY - height],
-		[modelX - drict * (width - 3), modelY - height]
-	];
-}
-
-export const Ugraph = Path.extend({
-	type: 'ugraph',
-
-	shape: {
-		points: null,
-		counterclockwise: true
-	},
-
-	style: {
-		stroke: '#000',
-		fill: null
-	},
-
-	buildPath: function (ctx, shape) {
-		var points = shape.points;
-		var r = Math.abs(points[1][1] - points[2][1]) / 2;
-		var x = Math.abs(points[1][0] + points[2][0]) / 2;
-		var y = Math.abs(points[1][1] + points[2][1]) / 2;
-		ctx.moveTo(points[0][0], points[0][1]);
-		ctx.lineTo(points[1][0], points[1][1]);
-
-		shape.counterclockwise && ctx.arc(x, y, r, Math.PI / 2, Math.PI * 3 / 2, false);
-		shape.counterclockwise || ctx.arc(x, y, r, Math.PI / 2, -Math.PI / 2, true);
-
-		ctx.moveTo(points[2][0], points[2][1]);
-		ctx.lineTo(points[3][0], points[3][1]);
-
-		ctx.closePath();
-
-		points = shape.points;
-		r = Math.abs(points[1][1] - points[2][1]) / 2;
-		x = Math.abs(points[1][0] + points[2][0]) / 2;
-		y = Math.abs(points[1][1] + points[2][1]) / 2;
-		ctx.moveTo(points[0][0], points[0][1]);
-		ctx.lineTo(points[1][0], points[1][1]);
-
-		shape.counterclockwise && ctx.arc(x, y, r, Math.PI / 2, Math.PI * 3 / 2, false);
-		shape.counterclockwise || ctx.arc(x, y, r, Math.PI / 2, -Math.PI / 2, true);
-
-		ctx.moveTo(points[2][0], points[2][1]);
-		ctx.lineTo(points[3][0], points[3][1]);
-
-		ctx.closePath();
-	}
-});
diff --git a/src/jmap/theme/factory.js b/src/jmap/theme/factory.js
deleted file mode 100644
index 717cd04d8..000000000
--- a/src/jmap/theme/factory.js
+++ /dev/null
@@ -1,34 +0,0 @@
-class Theme {
-    constructor(code) {
-        this._code = '02';
-        this._mapMenu = {
-            // '01': 'chengdu_04',
-            '02': 'fuzhou_01',
-            // '03': 'beijing_01',
-            // '04': 'chengdu_03',
-            '05': 'fuzhou_01' // 国际版运行图皮肤 指向05 福州线路
-        };
-    }
-
-    // 加载菜单组件
-    loadMenuComponent(code) {
-        return Object.assign({}, require(`./${this._mapMenu[code || this._code]}/menus/index`).default);
-    }
-
-    // 加载运行图计划表组件
-    loadPlanComponent(code) {
-        return Object.assign({}, require(`./${this._mapMenu[code || this._code]}/planSchedule/index`).default);
-    }
-
-    // 加载运行图解析和转化函数
-    loadPlanConvert(code) {
-        return require(`./${this._mapMenu[code || this._code]}/planConvert`).default;
-    }
-
-    // 共有字段转换
-    loadPropConvert(code) {
-        return require(`./${this._mapMenu[code || this._code]}/model`).default;
-    }
-}
-
-export default Theme;
diff --git a/src/jmap/theme/fuzhou_01/menus/dialog/childDialog/childDialog/noticeInfo.vue b/src/jmap/theme/fuzhou_01/menus/dialog/childDialog/childDialog/noticeInfo.vue
deleted file mode 100644
index c85893d53..000000000
--- a/src/jmap/theme/fuzhou_01/menus/dialog/childDialog/childDialog/noticeInfo.vue
+++ /dev/null
@@ -1,86 +0,0 @@
-<template>
-  <el-dialog
-    v-dialogDrag
-    class="fuzhou-01__systerm notice-info"
-    :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">
-        <div :key="index">{{ message }}</div>
-      </template>
-    </div>
-    <el-row justify="center" class="button-group">
-      <el-col :span="10" :offset="8">
-        <el-button :id="domIdSure" type="primary" @click="commit">{{ $t('global.confirm') }}</el-button>
-      </el-col>
-    </el-row>
-  </el-dialog>
-</template>
-
-<script>
-import { OperationEvent } from '@/scripts/ConstDic';
-
-export default {
-    name: 'NoticeInfo',
-    data() {
-        return {
-            dialogShow: false,
-            messages: [this.$t('tip.commandFailed')],
-            operate: null
-        };
-    },
-    computed: {
-        show() {
-            return this.dialogShow && !this.$store.state.menuOperation.break;
-        },
-        title() {
-            return this.$t('tip.hint');
-        },
-        domIdSure() {
-            return this.dialogShow ? OperationEvent.Command.close.notice.domId : '';
-        }
-    },
-    mounted() {
-        this.$nextTick(() => {
-            this.$store.dispatch('training/tipReload');
-        });
-    },
-    methods: {
-        doShow(operate, messages) {
-            this.operate = operate || {};
-            this.dialogShow = true;
-            this.messages = [this.$t('tip.commandFailed')];
-            if (messages) {
-                this.messages = messages;
-            }
-            this.$nextTick(function () {
-                this.$store.dispatch('training/emitTipFresh');
-            });
-        },
-        doClose() {
-            this.dialogShow = false;
-            this.$store.dispatch('training/emitTipFresh');
-        },
-        commit() {
-            this.doClose();
-        },
-        cancel() {
-            this.doClose();
-        }
-    }
-};
-
-</script>
-<style>
-    .notice-info .context {
-        padding-bottom: 40px !important;
-        border: 1px solid lightgray;
-    }
-</style>
diff --git a/src/jmap/theme/fuzhou_01/menus/dialog/childDialog/confirmControl.vue b/src/jmap/theme/fuzhou_01/menus/dialog/childDialog/confirmControl.vue
deleted file mode 100644
index b9216b44b..000000000
--- a/src/jmap/theme/fuzhou_01/menus/dialog/childDialog/confirmControl.vue
+++ /dev/null
@@ -1,372 +0,0 @@
-<template>
-  <el-dialog
-    v-dialogDrag
-    class="fuzhou-01__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">{{ $t('global.confirm') }}</el-button>
-      </el-col>
-      <el-col :span="8" :offset="4">
-        <el-button :id="domIdCancel" @click="cancel">{{ $t('global.cancel') }}</el-button>
-      </el-col>
-    </el-row>
-    <notice-info ref="noticeInfo" />
-  </el-dialog>
-</template>
-
-<script>
-import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
-import NoticeInfo from './childDialog/noticeInfo';
-
-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.arrangementRoute.menu.operation) {
-                return this.$t('menu.accessSetting');
-            } else if (this.operation === OperationEvent.Signal.signalClose.menu.operation) {
-                return this.$t('menu.menuSignal.signalOff');
-            } else if (this.operation === OperationEvent.Signal.reopenSignal.menu.operation) {
-                return this.$t('menu.menuSignal.signalReopen');
-            } else if (this.operation === OperationEvent.Signal.cancelTrainRoute.menu.operation) {
-                return this.$t('menu.cancelTheWay');
-            } else if (this.operation === OperationEvent.Signal.humanControl.menu.operation) {
-                return this.$t('menu.approachManualControl');
-            } else if (this.operation === OperationEvent.Signal.atsAutoControl.menu.operation) {
-                return this.$t('menu.accessToATSAutomaticControl');
-            } else if (this.operation === OperationEvent.StationStand.setRunLevel.menu.operation) {
-                return this.$t('menu.menuStationStand.setRunLevel');
-            } else if (this.operation === OperationEvent.StationStand.setStopTime.menu.operation) {
-                return this.$t('menu.stopTime');
-            } else if (this.operation === OperationEvent.StationStand.setBackStrategy.menu.operation) {
-                return this.$t('menu.setSwitchbackStrategy');
-            }
-            return '';
-        },
-        domIdCancel() {
-            return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
-        },
-        domIdConfirm() {
-            if (this.dialogShow) {
-                if (this.operation === OperationEvent.Signal.arrangementRoute.menu.operation) {
-                    /** 进路设置*/
-                    return OperationEvent.Signal.arrangementRoute.confirm.domId;
-                } else if (this.operation === OperationEvent.Signal.signalClose.menu.operation) {
-                    /** 信号关灯*/
-                    return OperationEvent.Signal.signalClose.confirm.domId;
-                } else if (this.operation === OperationEvent.Signal.reopenSignal.menu.operation) {
-                    /** 信号重开*/
-                    return OperationEvent.Signal.reopenSignal.confirm.domId;
-                } else if (this.operation === OperationEvent.Signal.cancelTrainRoute.menu.operation) {
-                    /** 取消进路*/
-                    return OperationEvent.Signal.cancelTrainRoute.confirm.domId;
-                } else if (this.operation === OperationEvent.Signal.humanControl.menu.operation) {
-                    /** 进路交人工控*/
-                    return OperationEvent.Signal.humanControl.confirm.domId;
-                } else if (this.operation === OperationEvent.Signal.atsAutoControl.menu.operation) {
-                    /** 进路交ATS自动控*/
-                    return OperationEvent.Signal.atsAutoControl.confirm.domId;
-                } else if (this.operation === OperationEvent.StationStand.setRunLevel.menu.operation) {
-                    /** 设置运行等级*/
-                    return OperationEvent.StationStand.setRunLevel.confirm.domId;
-                } else if (this.operation === OperationEvent.StationStand.setStopTime.menu.operation) {
-                    /** 设置停站时间*/
-                    return OperationEvent.StationStand.setStopTime.confirm.domId;
-                } else if (this.operation === OperationEvent.StationStand.setBackStrategy.menu.operation) {
-                    /** 设置折返策略*/
-                    return OperationEvent.StationStand.setBackStrategy.confirm.domId;
-                }
-            }
-            return '';
-        }
-    },
-    mounted() {
-        this.$nextTick(() => {
-            this.$store.dispatch('training/tipReload');
-        });
-    },
-    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.arrangementRoute.menu.operation) {
-                /** 进路设置*/
-                this.routeSetting();
-            } else if (this.operation === OperationEvent.Signal.signalClose.menu.operation) {
-                /** 信号关灯*/
-                this.signalClose();
-            } else if (this.operation === OperationEvent.Signal.reopenSignal.menu.operation) {
-                /** 信号重开*/
-                this.reopenSignal();
-            } else if (this.operation === OperationEvent.Signal.cancelTrainRoute.menu.operation) {
-                /** 取消进路*/
-                this.cancelTrainRoute();
-            } else if (this.operation === OperationEvent.Signal.humanControl.menu.operation) {
-                /** 进路交人工控*/
-                this.humanControl();
-            } else if (this.operation === OperationEvent.Signal.atsAutoControl.menu.operation) {
-                /** 进路交ATS自动控*/
-                this.atsAutoControl();
-            } else if (this.operation === OperationEvent.StationStand.setRunLevel.menu.operation) {
-                /** 设置运行等级*/
-                this.setRunLevel();
-            } else if (this.operation === OperationEvent.StationStand.setStopTime.menu.operation) {
-                /** 停站时间*/
-                this.setStopTime();
-            } else if (this.operation === OperationEvent.StationStand.setBackStrategy.menu.operation) {
-                /** 设置折返策略*/
-                this.setBackStrategy();
-            }
-        },
-        // 进路设置
-        routeSetting() {
-            const operate = {
-                send: true,
-                type: this.operate.type,
-                operation: OperationEvent.Signal.arrangementRoute.confirm.operation
-            };
-
-            this.loading = true;
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                this.loading = false;
-                if (valid) {
-                    this.doClose();
-                }
-            }).catch(() => {
-                this.loading = false;
-                this.doClose();
-                this.$refs.noticeInfo.doShow(operate);
-            });
-        },
-        // 信号关灯
-        signalClose() {
-            const operate = {
-                send: true,
-                type: this.operate.type,
-                operation: OperationEvent.Signal.signalClose.confirm.operation
-            };
-
-            this.loading = true;
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                this.loading = false;
-                if (valid) {
-                    this.doClose();
-                }
-            }).catch(() => {
-                this.loading = false;
-                this.doClose();
-                this.$refs.noticeInfo.doShow(operate);
-            });
-        },
-        // 信号重开
-        reopenSignal() {
-            const operate = {
-                send: true,
-                type: this.operate.type,
-                operation: OperationEvent.Signal.reopenSignal.confirm.operation
-            };
-
-            this.loading = true;
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                this.loading = false;
-                if (valid) {
-                    this.doClose();
-                }
-            }).catch(() => {
-                this.loading = false;
-                this.doClose();
-                this.$refs.noticeInfo.doShow(operate);
-            });
-        },
-        // 取消进路
-        cancelTrainRoute() {
-            const operate = {
-                send: true,
-                type: this.operate.type,
-                operation: OperationEvent.Signal.cancelTrainRoute.confirm.operation
-            };
-
-            this.loading = true;
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                this.loading = false;
-                if (valid) {
-                    this.doClose();
-                }
-            }).catch(() => {
-                this.loading = false;
-                this.doClose();
-                this.$refs.noticeInfo.doShow(operate);
-            });
-        },
-        // 进路交人工控
-        humanControl() {
-            const operate = {
-                send: true,
-                type: MapDeviceType.Signal.type,
-                operation: OperationEvent.Signal.humanControl.menu.operation
-            };
-
-            this.loading = true;
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                this.loading = false;
-                if (valid) {
-                    this.doClose();
-                }
-            }).catch(() => {
-                this.loading = false;
-                this.doClose();
-                this.$refs.noticeInfo.doShow(operate);
-            });
-        },
-        // 进路交ATS自动控
-        atsAutoControl() {
-            const operate = {
-                send: true,
-                type: MapDeviceType.Signal.type,
-                operation: OperationEvent.Signal.atsAutoControl.menu.operation
-            };
-
-            this.loading = true;
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                this.loading = false;
-                if (valid) {
-                    this.doClose();
-                }
-            }).catch(() => {
-                this.loading = false;
-                this.doClose();
-                this.$refs.noticeInfo.doShow(operate);
-            });
-        },
-        // 设置运行等级
-        setRunLevel() {
-            const operate = {
-                send: true,
-                type: this.operate.type,
-                operation: OperationEvent.StationStand.setRunLevel.confirm.operation,
-                val: this.operate.val
-            };
-
-            this.loading = true;
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                this.loading = false;
-                if (valid) {
-                    this.doClose();
-                }
-            }).catch(() => {
-                this.loading = false;
-                this.doClose();
-                this.$refs.noticeInfo.doShow(operate);
-            });
-        },
-        // 停站时间
-        setStopTime() {
-            const operate = {
-                send: true,
-                type: this.operate.type,
-                operation: OperationEvent.StationStand.setStopTime.confirm.operation,
-                val: this.operate.val
-            };
-
-            this.loading = true;
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                this.loading = false;
-                if (valid) {
-                    this.doClose();
-                }
-            }).catch(() => {
-                this.loading = false;
-                this.doClose();
-                this.$refs.noticeInfo.doShow(operate);
-            });
-        },
-        // 设置折返策略
-        setBackStrategy() {
-            const operate = {
-                send: true,
-                type: this.operate.type,
-                operation: OperationEvent.StationStand.setBackStrategy.confirm.operation,
-                val: this.operate.val
-            };
-
-            this.loading = true;
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                this.loading = false;
-                if (valid) {
-                    this.doClose();
-                }
-            }).catch(() => {
-                this.loading = false;
-                this.doClose();
-                this.$refs.noticeInfo.doShow(operate);
-            });
-        },
-        cancel() {
-            const operate = {
-                type: this.operate.type,
-                operation: OperationEvent.Command.cancel.menu.operation
-            };
-
-            this.$store.dispatch('training/next', 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/jmap/theme/fuzhou_01/menus/dialog/childDialog/confirmControlSpeed.vue b/src/jmap/theme/fuzhou_01/menus/dialog/childDialog/confirmControlSpeed.vue
deleted file mode 100644
index 1fd034f26..000000000
--- a/src/jmap/theme/fuzhou_01/menus/dialog/childDialog/confirmControlSpeed.vue
+++ /dev/null
@@ -1,165 +0,0 @@
-<template>
-  <el-dialog
-    v-dialogDrag
-    class="fuzhou-01__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">{{ $t('global.confirm') }}</el-button>
-      </el-col>
-      <el-col :span="10" :offset="2">
-        <el-button :id="domIdCancel" @click="cancel">{{ $t('global.cancel') }}</el-button>
-      </el-col>
-    </el-row>
-  </el-dialog>
-</template>
-
-<script>
-import { OperationEvent } from '@/scripts/ConstDic';
-
-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.dialogShow) {
-                if (this.operation === OperationEvent.Section.setSpeed.order.operation) {
-                    return this.$t('menu.menuSection.sectionSetSpeedLimit');
-                } else if (this.operation === OperationEvent.Section.cancelSpeed.order.operation) {
-                    return this.$t('menu.menuSection.sectionCancelSpeedLimit');
-                } else if (this.operation === OperationEvent.Switch.setSpeed.order.operation) {
-                    return this.$t('menu.switchSettingSpeedLimit');
-                } else if (this.operation === OperationEvent.Switch.cancelSpeed.order.operation) {
-                    return this.$t('menu.menuSection.sectionCancelSpeedLimit');
-                }
-            }
-            return '';
-        },
-        domIdCancel() {
-            return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
-        },
-        domIdConfirm() {
-            if (this.dialogShow) {
-                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 '';
-        }
-    },
-    mounted() {
-        this.$nextTick(() => {
-            this.$store.dispatch('training/tipReload');
-        });
-    },
-    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/next', 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/next', 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/jmap/theme/fuzhou_01/menus/dialog/childDialog/confirmTrain.vue b/src/jmap/theme/fuzhou_01/menus/dialog/childDialog/confirmTrain.vue
deleted file mode 100644
index 7a690368f..000000000
--- a/src/jmap/theme/fuzhou_01/menus/dialog/childDialog/confirmTrain.vue
+++ /dev/null
@@ -1,180 +0,0 @@
-<template>
-  <el-dialog
-    v-dialogDrag
-    class="fuzhou-01__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">{{ $t('global.confirm') }}</el-button>
-      </el-col>
-      <el-col :span="8" :offset="4">
-        <el-button :id="domIdCancel" @click="cancel">{{ $t('global.cancel') }}</el-button>
-      </el-col>
-    </el-row>
-    <notice-info ref="noticeInfo" />
-  </el-dialog>
-</template>
-
-<script>
-import { OperationEvent } from '@/scripts/ConstDic';
-import NoticeInfo from './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 this.$t('menu.menuTrain.addTrainId');
-            } else if (this.operation === OperationEvent.Train.editTrainId.menu.operation) {
-                return this.$t('menu.menuTrain.editTrainId');
-            } else if (this.operation === OperationEvent.Train.delTrainId.menu.operation) {
-                return this.$t('menu.menuTrain.deleteTrainId');
-            } else if (this.operation === OperationEvent.Train.moveTrainId.menu.operation) {
-                return this.$t('menu.menuTrain.moveTrainId');
-            } else if (this.operation === OperationEvent.Train.switchTrainId.menu.operation) {
-                return this.$t('menu.menuTrain.switchTrainId');
-            } else if (this.operation === OperationEvent.Train.editTrainNo.menu.operation) {
-                return this.$t('menu.menuTrain.editTrainNo');
-            }
-            return '';
-        },
-        domIdCancel() {
-            return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
-        },
-        domIdConfirm() {
-            if (this.dialogShow) {
-                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 '';
-        }
-    },
-    mounted() {
-        this.$nextTick(() => {
-            this.$store.dispatch('training/tipReload');
-        });
-    },
-    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/next', operate).then(({ valid }) => {
-                this.loading = false;
-                if (valid) {
-                    this.doClose();
-                }
-            }).catch(() => {
-                this.loading = false;
-                this.doClose();
-                this.$refs.noticeInfo.doShow(operate);
-            });
-        },
-        cancel() {
-            const operate = {
-                type: this.operate.type,
-                operation: OperationEvent.Command.cancel.menu.operation
-            };
-
-            this.$store.dispatch('training/next', 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/jmap/theme/fuzhou_01/menus/dialog/routeCmdControl.vue b/src/jmap/theme/fuzhou_01/menus/dialog/routeCmdControl.vue
deleted file mode 100644
index 330b23760..000000000
--- a/src/jmap/theme/fuzhou_01/menus/dialog/routeCmdControl.vue
+++ /dev/null
@@ -1,453 +0,0 @@
-<template>
-  <div>
-    <el-dialog
-      v-dialogDrag
-      class="fuzhou-01__systerm route-cmd-control"
-      :title="title"
-      :visible.sync="show"
-      width="840px"
-      :before-close="doClose"
-      :z-index="2000"
-      :modal="false"
-      :close-on-click-modal="false"
-    >
-      <div style="padding: 10px 20px; border: 1px solid lightgray;">
-        <span class="base-label">{{ $t('menu.commandInformation') }}</span>
-        <el-form label-position="center" size="mini">
-          <el-row>
-            <el-col :span="8">
-              <el-form-item :label="this.$t('menu.type')" label-width="40px">
-                <el-select v-model="operation" size="small" disabled>
-                  <el-option
-                    v-for="option in typeList"
-                    :key="option.code"
-                    :label="option.name"
-                    :value="option.code"
-                  />
-                </el-select>
-              </el-form-item>
-            </el-col>
-            <el-col :span="8">
-              <el-form-item :label="this.$t('menu.stationName')" label-width="80px">
-                <el-input v-model="stationName" size="small" disabled />
-              </el-form-item>
-            </el-col>
-            <el-col :span="8">
-              <el-form-item :label="this.$t('menu.signalName')" label-width="100px">
-                <el-input v-model="signalName" size="small" disabled />
-              </el-form-item>
-            </el-col>
-          </el-row>
-        </el-form>
-      </div>
-      <el-table
-        ref="tempData"
-        class="table"
-        :data="tempData"
-        border
-        style="width: 100%"
-        size="mini"
-        highlight-current-row
-        height="200"
-      >
-        <el-table-column prop="order" :width="110" :label="this.$t('menu.serialNumber2')" />
-        <el-table-column prop="date" :width="160" :label="this.$t('menu.time')" />
-        <el-table-column prop="context" :width="180" :label="this.$t('menu.implementationProcess')" />
-        <el-table-column prop="result" :label="this.$t('menu.executionResult')" />
-      </el-table>
-      <span class="notice">{{ message }}</span>
-      <el-row class="button-group">
-        <el-col :span="2" :offset="3">
-          <el-button :id="domIdCommand" type="primary" :disabled="cmdDisabled[0]" @click="command">{{ $t('menu.release') }}<span
-            v-show="timeCountCommand>0"
-          >({{ timeCountCommand }})</span></el-button>
-        </el-col>
-        <el-col :span="2" :offset="1">
-          <el-button :id="domIdConfirm1" style="width:120px;" type="primary" :disabled="cmdDisabled[1]" @click="confirm1">{{ $t('menu.firstConfirm') }}
-          </el-button>
-        </el-col>
-        <el-col :span="2" :offset="2">
-          <el-button :id="domIdConfirm2" type="primary" style="width:120px;" :disabled="cmdDisabled[2]" @click="confirm2">{{ $t('menu.secondConfirm') }}<span
-            v-show="timeCountConfirm>0"
-          >({{ timeCountConfirm }})</span></el-button>
-        </el-col>
-        <el-col :span="2" :offset="2">
-          <el-button :id="domIdStop" type="primary" :disabled="stpDisabled" @click="stop">{{ $t('menu.suspend') }}</el-button>
-        </el-col>
-        <el-col :span="2" :offset="1">
-          <el-button :id="domIdClose" @click="close">{{ $t('global.close') }}</el-button>
-        </el-col>
-      </el-row>
-    </el-dialog>
-    <confirm-signal-unlock ref="confirmSignalUnlock" @setOperate="getOperate" />
-  </div>
-</template>
-<script>
-import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
-import { now } from '@/utils/date';
-import ConfirmSignalUnlock from './childDialog/confirmSignalUnlock';
-
-export default {
-    name: 'RouteCmdControl',
-    components: {
-        ConfirmSignalUnlock
-    },
-    data() {
-        return {
-            dialogShow: false,
-            backOperate: '',
-            selected: '',
-            order: 0,
-            row: null,
-            timer: null,
-            operation: '',
-            cmdDisabled: [true, true, true],
-            stpDisabled: true,
-            tempData: [],
-            message: '',
-            timeCountCommand: -1,
-            timeCountConfirm: -1,
-            stationName: '',
-            signalName: ''
-        };
-    },
-    computed: {
-        typeList() {
-            return [
-                { code: OperationEvent.Signal.unlock.menu.operation, name: this.$t('menu.menuSignal.signalDeblock') },
-                { code: OperationEvent.Signal.guide.menu.operation, name: this.$t('menu.menuSignal.guideRouteHandle') }
-            ];
-        },
-        show() {
-            return this.dialogShow && !this.$store.state.menuOperation.break;
-        },
-        domIdCommand() {
-            if (this.dialogShow) {
-                if (this.operation == OperationEvent.Signal.unlock.menu.operation) {
-                    /** 信号解封*/
-                    return OperationEvent.Signal.unlock.order.domId;
-                } else if (this.operation == OperationEvent.Signal.guide.menu.operation) {
-                    /** 办理引导进路*/
-                    return OperationEvent.Signal.guide.order.domId;
-                }
-            }
-            return '';
-        },
-        domIdConfirm1() {
-            if (this.dialogShow) {
-                if (this.operation == OperationEvent.Signal.unlock.menu.operation) {
-                    /** 信号解封*/
-                    return OperationEvent.Signal.unlock.confirm1.domId;
-                } else if (this.operation == OperationEvent.Signal.guide.menu.operation) {
-                    /** 办理引导进路*/
-                    return OperationEvent.Signal.guide.confirm1.domId;
-                }
-            }
-            return '';
-        },
-        domIdConfirm2() {
-            if (this.dialogShow) {
-                if (this.operation == OperationEvent.Signal.unlock.menu.operation) {
-                    /** 信号解封*/
-                    return OperationEvent.Signal.unlock.confirm2.domId;
-                } else if (this.operation == OperationEvent.Signal.guide.menu.operation) {
-                    /** 办理引导进路*/
-                    return OperationEvent.Signal.guide.confirm2.domId;
-                }
-            }
-            return '';
-        },
-        domIdStop() {
-            if (this.dialogShow) {
-                if (this.operation == OperationEvent.Signal.unlock.menu.operation) {
-                    /** 信号解封*/
-                    return OperationEvent.Signal.unlock.stop.domId;
-                } else if (this.operation == OperationEvent.Signal.guide.menu.operation) {
-                    /** 办理引导进路*/
-                    return OperationEvent.Signal.guide.stop.domId;
-                }
-            }
-            return '';
-        },
-        domIdClose() {
-            if (this.dialogShow) {
-                return OperationEvent.Command.close.menu.domId;
-            }
-            return '';
-        },
-        title() {
-            if (this.dialogShow) {
-                if (this.operation == OperationEvent.Signal.unlock.menu.operation) {
-                    return '信号解封';
-                } else if (this.operation == OperationEvent.Signal.guide.menu.operation) {
-                    return '办理引导进路';
-                }
-            }
-            return '';
-        }
-    },
-    watch: {
-        cmdDisabled: {
-            handler(val, oldVal) {
-                this.stpDisabled = true;
-                val.forEach((elem, index) => {
-                    // 在确定1之前的操作才可以终止
-                    if (elem == false && index >= 1 && index <= 2) {
-                        this.stpDisabled = false;
-                    }
-                });
-            },
-            deep: true
-        }
-    },
-    mounted() {
-        this.$nextTick(() => {
-            this.$store.dispatch('training/tipReload');
-        });
-        this.timer = setInterval(() => {
-            if (!this.$store.state.menuOperation.break) {
-                if (this.timeCountCommand > 0) {
-                    this.timeCountCommand--;
-                } else if (this.timeCountCommand == 0) {
-                    this.setButtonEnable({ step: 0 });
-                    this.timeCountCommand = -1;
-                }
-                if (this.timeCountConfirm > 0) {
-                    this.timeCountConfirm--;
-                } else if (this.timeCountConfirm == 0) {
-                    this.setButtonEnable({ step: 0 });
-                    this.timeCountConfirm = -1;
-                }
-            }
-        }, 1000);
-    },
-    beforeDestroy() {
-        clearInterval(this.timer);
-        this.timer = null;
-    },
-    methods: {
-        doShow(operate, 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.selected = selected;
-                }
-
-                this.order = 0;
-                this.operation = operate.operation;
-
-                this.tempData = [];
-                this.timeCountCommand = -1;
-                this.timeCountConfirm = -1;
-                this.cmdDisabled = [false, true, true];
-            }
-            this.dialogShow = true;
-            this.stpDisabled = true;
-            this.setMessage(this.$t('tip.releaseTip'));
-            this.$nextTick(function () {
-                this.$store.dispatch('training/emitTipFresh');
-            });
-        },
-        doClose() {
-            this.dialogShow = false;
-            this.$store.dispatch('training/emitTipFresh');
-        },
-        command() {
-            if (this.operation == OperationEvent.Signal.unlock.menu.operation) {
-                /** 第一步带弹框处理*/
-                this.commandHasPopUp();
-            } else if (this.operation == OperationEvent.Signal.guide.menu.operation) {
-                /** 第一步不带弹框处理*/
-                this.commandNoPopUp();
-            }
-        },
-        commandHasPopUp() {
-            const operate = {
-                type: MapDeviceType.Signal.type
-            };
-
-            if (this.operation == OperationEvent.Signal.unlock.menu.operation) {
-                /** 信号解封*/
-                operate.operation = OperationEvent.Signal.unlock.order.operation;
-            }
-
-            this.setMessage(this.$t('tip.firstConfirmTip'));
-            this.writeRecord({ order: ++this.order, date: now(), context: this.$t('menu.clickReleaseCommand'), result: '' });
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                if (valid) {
-                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    if (this.operation == OperationEvent.Signal.unlock.menu.operation) {
-                        this.$refs.confirmSignalUnlock.doShow(operate, this.selected);
-                    }
-                }
-            });
-        },
-        commandNoPopUp() {
-            const operate = {
-                type: MapDeviceType.Signal.type
-            };
-
-            if (this.operation == OperationEvent.Signal.guide.menu.operation) {
-                /** 办理引导进路*/
-                operate.operation = OperationEvent.Signal.guide.order.operation;
-            }
-
-            this.setMessage(this.$t('tip.firstConfirmTip'));
-            this.writeRecord({ order: ++this.order, date: now(), context: this.$t('menu.clickReleaseCommand'), result: '' });
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                if (valid) {
-                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    this.setButtonEnable({ step: 1 });
-                    this.editRecord({ order: this.order, date: now(), context: this.$t('menu.clickReleaseCommand'), result: this.$t('tip.executionSucceed') });
-                } else {
-                    this.editRecord({ order: this.order, date: now(), context: this.$t('menu.clickReleaseCommand'), result: this.$t('tip.executionFailed') });
-                }
-            }).catch(() => {
-                this.editRecord({ order: this.order, date: now(), context: this.$t('menu.clickReleaseCommand'), result: this.$t('tip.executionException') });
-            });
-        },
-        confirm1() {
-            const operate = {
-                type: MapDeviceType.Signal.type
-            };
-
-            if (this.operation == OperationEvent.Signal.unlock.menu.operation) {
-                /** 信号解封*/
-                operate.operation = OperationEvent.Signal.unlock.confirm1.operation;
-            } else if (this.operation == OperationEvent.Signal.guide.menu.operation) {
-                /** 办理引导进路*/
-                operate.operation = OperationEvent.Signal.guide.confirm1.operation;
-            }
-
-            this.setMessage(this.$t('tip.secondConfirmTip'));
-            this.writeRecord({ order: ++this.order, date: now(), context: this.$t('menu.clickFirstConfirm'), result: '' });
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                if (valid) {
-                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    this.timeCountCommand = -1;
-                    this.timeCountConfirm = 10;
-                    this.setButtonEnable({ step: 2 });
-                    this.editRecord({ order: this.order, date: now(), context: this.$t('menu.clickFirstConfirm'), result: this.$t('tip.executionSucceed') });
-                } else {
-                    this.editRecord({ order: this.order, date: now(), context: this.$t('menu.clickFirstConfirm'), result: this.$t('tip.executionFailed') });
-                }
-            }).catch(() => {
-                this.editRecord({ order: this.order, date: now(), context: this.$t('menu.clickFirstConfirm'), result: this.$t('tip.executionException') });
-            });
-        },
-        confirm2() {
-            const operate = {
-                send: true,
-                type: MapDeviceType.Signal.type
-            };
-
-            if (this.operation == OperationEvent.Signal.unlock.menu.operation) {
-                /** 信号解封*/
-                operate.operation = OperationEvent.Signal.unlock.confirm2.operation;
-            } else if (this.operation == OperationEvent.Signal.guide.menu.operation) {
-                /** 办理引导进路*/
-                operate.operation = OperationEvent.Signal.guide.confirm2.operation;
-            }
-            this.setMessage('');
-            this.writeRecord({ order: ++this.order, date: now(), context: this.$t('menu.clickSecondConfirm'), result: '' });
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                this.timeCountCommand = -1;
-                this.timeCountConfirm = -1;
-                this.setButtonEnable({ step: -1 });
-                if (valid) {
-                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    this.editRecord({ order: this.order, date: now(), context: this.$t('menu.clickSecondConfirm'), result: this.$t('tip.executionSucceed') });
-                } else {
-                    this.editRecord({ order: this.order, date: now(), context: this.$t('menu.clickSecondConfirm'), result: this.$t('tip.executionFailed') });
-                }
-            }).catch(() => {
-                this.timeCountCommand = -1;
-                this.timeCountConfirm = -1;
-                this.setButtonEnable({ step: -1 });
-                this.editRecord({ order: this.order, date: now(), context: this.$t('menu.clickSecondConfirm'), result: this.$t('tip.executionException') });
-            });
-        },
-        stop() {
-            const operate = {
-                type: MapDeviceType.Signal.type
-            };
-
-            if (this.operation == OperationEvent.Signal.unlock.menu.operation) {
-                /** 信号解封*/
-                operate.operation = OperationEvent.Signal.unlock.stop.operation;
-            } else if (this.operation == OperationEvent.Signal.guide.menu.operation) {
-                /** 办理引导进路*/
-                operate.operation = OperationEvent.Signal.guide.stop.operation;
-            }
-
-            this.writeRecord({ order: ++this.order, date: now(), context: this.$t('menu.clickSuspend'), result: '' });
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                if (valid) {
-                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    this.setButtonEnable({ step: 0 });
-                    this.editRecord({ order: this.order, date: now(), context: this.$t('menu.clickSuspend'), result: this.$t('tip.executionSucceed') });
-                } else {
-                    this.editRecord({ order: this.order, date: now(), context: this.$t('menu.clickSuspend'), result: this.$t('tip.executionFailed') });
-                }
-            }).catch(() => {
-                this.editRecord({ order: this.order, date: now(), context: this.$t('menu.clickSuspend'), result: this.$t('tip.executionException') });
-            });
-        },
-        close() {
-            const operate = {
-                type: MapDeviceType.Signal.type,
-                operation: OperationEvent.Command.close.menu.operation
-            };
-
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                if (valid) {
-                    this.doClose();
-                }
-            }).catch(() => {
-                this.doClose();
-            });
-        },
-        getOperate(operate) {
-            /** 弹框返回值处理*/
-            if (this.operation == OperationEvent.Signal.unlock.menu.operation) {
-                /** 信号解封*/
-                this.backOperate = operate;
-                this.setButtonEnable(operate);
-                if (operate.success) {
-                    this.timeCountCommand = 30;
-                    this.editRecord({ order: this.order, date: now(), context: this.$t('menu.clickReleaseCommand'), result: this.$t('tip.confirmedSuccess') });
-                } else {
-                    this.editRecord({ order: this.order, date: now(), context: this.$t('menu.clickReleaseCommand'), result: this.$t('tip.cancelSuccess') });
-                }
-            }
-        },
-        setButtonEnable(param) {
-            this.cmdDisabled = [true, true, true];
-            if (param && param.step >= 0) {
-                this.cmdDisabled[param.step] = false;
-            }
-        },
-        setMessage(message) {
-            this.message = message;
-        },
-        writeRecord(param) {
-            this.tempData.push(param);
-        },
-        editRecord(param) {
-            this.tempData.forEach(elem => {
-                if (elem.order == param.order) {
-                    for (var prop in param) {
-                        elem[prop] = param[prop];
-                    }
-                }
-            });
-        }
-    }
-};
-</script>
diff --git a/src/jmap/theme/fuzhou_01/menus/dialog/routeControl.vue b/src/jmap/theme/fuzhou_01/menus/dialog/routeControl.vue
deleted file mode 100644
index 0b5a45fe7..000000000
--- a/src/jmap/theme/fuzhou_01/menus/dialog/routeControl.vue
+++ /dev/null
@@ -1,332 +0,0 @@
-<template>
-  <el-dialog
-    v-dialogDrag
-    class="fuzhou-01__systerm signal-control"
-    :title="title"
-    :visible.sync="show"
-    width="300px"
-    :before-close="doClose"
-    :z-index="2000"
-    :modal="false"
-    :close-on-click-modal="false"
-  >
-    <el-row class="header">
-      <el-col :span="11"><span>{{ $t('menu.stationName') }}</span></el-col>
-      <el-col :span="11" :offset="2"><span>{{ $t('menu.signal') }}</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>
-    <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>
-    <confirm-control ref="confirmControl" />
-    <notice-info ref="noticeInfo" />
-  </el-dialog>
-</template>
-
-<script>
-import { MapDeviceType, OperationEvent, getDomIdByOperation } from '@/scripts/ConstDic';
-import ConfirmControl from './childDialog/confirmControl';
-import NoticeInfo from './childDialog/childDialog/noticeInfo';
-
-export default {
-    name: 'RouteControl',
-    components: {
-        ConfirmControl,
-        NoticeInfo
-    },
-    data() {
-        return {
-            dialogShow: false,
-            loading: false,
-            selected: null,
-            operation: null,
-            stationName: '',
-            signalName: ''
-
-        };
-    },
-    computed: {
-        show() {
-            return this.dialogShow && !this.$store.state.menuOperation.break;
-        },
-        domIdCancel() {
-            return this.dialogShow ? OperationEvent.Command.close.menu.domId : '';
-        },
-        domIdConfirm() {
-            return this.dialogShow ? getDomIdByOperation(this.operation) : '';
-        },
-        title() {
-            if (this.operation == OperationEvent.Signal.cancelTrainRoute.menu.operation) {
-                return this.$t('menu.menuSignal.cancelTheTrainApproach');
-            } else if (this.operation == OperationEvent.Signal.signalClose.menu.operation) {
-                return this.$t('menu.menuSignal.signalOff');
-            } else if (this.operation == OperationEvent.Signal.reopenSignal.menu.operation) {
-                return this.$t('menu.menuSignal.reopenTrainSignal');
-            } else if (this.operation == OperationEvent.Signal.setAutoInterlock.menu.operation) {
-                return this.$t('menu.menuSignal.setInterlockAutoRoute');
-            } else if (this.operation == OperationEvent.Signal.cancelAutoInterlock.menu.operation) {
-                return this.$t('menu.menuSignal.cancelInterlockAutoRoute');
-            } else if (this.operation == OperationEvent.Signal.setAutoTrigger.menu.operation) {
-                return this.$t('menu.menuSignal.setInterlockAutoTrigger');
-            } else if (this.operation == OperationEvent.Signal.cancelAutoTrigger.menu.operation) {
-                return this.$t('menu.menuSignal.cancelInterlockAutoTrigger');
-            }
-            return '';
-        }
-    },
-    mounted() {
-        this.$nextTick(() => {
-            this.$store.dispatch('training/tipReload');
-        });
-    },
-    methods: {
-        doShow(operate, 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.selected = selected;
-                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.cancelTrainRoute.menu.operation) {
-                /** 取消列车进路*/
-                this.cancelTrainRoute();
-            } else if (this.operation == OperationEvent.Signal.signalClose.menu.operation) {
-                /** 信号关灯*/
-                this.signalClose();
-            } else if (this.operation == OperationEvent.Signal.reopenSignal.menu.operation) {
-                /** 信号重开*/
-                this.reopenSignal();
-            } else if (this.operation == OperationEvent.Signal.setAutoInterlock.menu.operation) {
-                /** 设置联锁自动进路*/
-                this.setAutoInterlock();
-            } else if (this.operation == OperationEvent.Signal.cancelAutoInterlock.menu.operation) {
-                /** 取消联锁自动进路*/
-                this.cancelAutoInterlock();
-            } else if (this.operation == OperationEvent.Signal.setAutoTrigger.menu.operation) {
-                /** 设置联锁自动触发*/
-                this.setAutoTrigger();
-            } else if (this.operation == OperationEvent.Signal.cancelAutoTrigger.menu.operation) {
-                /** 取消联锁自动触发*/
-                this.cancelAutoTrigger();
-            }
-        },
-        // 取消列车进路
-        cancelTrainRoute() {
-            if (this.$store.state.training.prdType == '01') {
-                /** 现地工作站*/
-                this.cancelTrainRouteByLocal();
-            } else if (this.$store.state.training.prdType == '02') {
-                /** 行调工作站*/
-                this.cancelTrainRouteByCentral();
-            }
-        },
-        // 现地工作站取消进路
-        cancelTrainRouteByLocal() {
-            const operate = {
-                send: true,
-                type: MapDeviceType.Signal.type,
-                operation: OperationEvent.Signal.cancelTrainRoute.menu.operation
-            };
-
-            this.loading = true;
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                this.loading = false;
-                if (valid) {
-                    this.doClose();
-                }
-            }).catch(() => {
-                this.loading = false;
-                this.doClose();
-                this.$refs.noticeInfo.doShow(operate);
-            });
-        },
-        // 行调工作站取消进路
-        cancelTrainRouteByCentral() {
-            const operate = {
-                type: MapDeviceType.Signal.type,
-                operation: OperationEvent.Signal.cancelTrainRoute.menu.operation,
-                messages: [this.$t('tip.signalModeToManualModeTipPrefix') + this.signalName + this.$t('tip.signalModeToManualModeTipSuffix')]
-            };
-
-            this.loading = true;
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                this.loading = false;
-                if (valid) {
-                    this.doClose();
-                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    this.$refs.confirmControl.doShow(operate, this.selected);
-                }
-            }).catch(() => {
-                this.loading = false;
-            });
-        },
-        // 信号关灯
-        signalClose() {
-            const operate = {
-                type: MapDeviceType.Signal.type,
-                operation: OperationEvent.Signal.signalClose.menu.operation,
-                messages: [this.$t('menu.menuSignal.signalOff') + this.$t('global.colon') + this.signalName]
-            };
-
-            this.loading = true;
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                this.loading = false;
-                if (valid) {
-                    this.doClose();
-                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    this.$refs.confirmControl.doShow(operate);
-                }
-            }).catch(() => {
-                this.loading = false;
-            });
-        },
-        // 信号重开
-        reopenSignal() {
-            const operate = {
-                type: MapDeviceType.Signal.type,
-                operation: OperationEvent.Signal.reopenSignal.menu.operation,
-                messages: [this.$t('menu.menuSignal.signalReopen') + this.$t('global.colon') + this.signalName]
-            };
-
-            this.loading = true;
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                this.loading = false;
-                if (valid) {
-                    this.doClose();
-                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    this.$refs.confirmControl.doShow(operate);
-                }
-            }).catch(() => {
-                this.loading = false;
-            });
-        },
-        // 设置联锁自动进路
-        setAutoInterlock() {
-            const operate = {
-                send: true,
-                type: MapDeviceType.Signal.type,
-                operation: OperationEvent.Signal.setAutoInterlock.menu.operation
-            };
-
-            this.loading = true;
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                this.loading = false;
-                if (valid) {
-                    this.doClose();
-                }
-            }).catch(() => {
-                this.loading = false;
-                this.doClose();
-                this.$refs.noticeInfo.doShow(operate);
-            });
-        },
-        // 取消联锁自动进路
-        cancelAutoInterlock() {
-            const operate = {
-                send: true,
-                type: MapDeviceType.Signal.type,
-                operation: OperationEvent.Signal.cancelAutoInterlock.menu.operation
-            };
-
-            this.loading = true;
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                this.loading = false;
-                if (valid) {
-                    this.doClose();
-                }
-            }).catch(() => {
-                this.loading = false;
-                this.doClose();
-                this.$refs.noticeInfo.doShow(operate);
-            });
-        },
-        // 设置联锁自动触发
-        setAutoTrigger() {
-            const operate = {
-                send: true,
-                type: MapDeviceType.Signal.type,
-                operation: OperationEvent.Signal.setAutoTrigger.menu.operation
-            };
-
-            this.loading = true;
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                this.loading = false;
-                if (valid) {
-                    this.doClose();
-                }
-            }).catch(() => {
-                this.loading = false;
-                this.doClose();
-                this.$refs.noticeInfo.doShow(operate);
-            });
-        },
-        // 取消联锁自动触发
-        cancelAutoTrigger() {
-            const operate = {
-                send: true,
-                type: MapDeviceType.Signal.type,
-                operation: OperationEvent.Signal.cancelAutoTrigger.menu.operation
-            };
-
-            this.doClose();
-            this.loading = true;
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                this.loading = false;
-                if (valid) {
-                    this.doClose();
-                }
-            }).catch(() => {
-                this.loading = false;
-                this.doClose();
-                this.$refs.noticeInfo.doShow(operate);
-            });
-        },
-        // 取消
-        cancel() {
-            const operate = {
-                type: MapDeviceType.Signal.type,
-                operation: OperationEvent.Command.close.menu.operation
-            };
-
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                if (valid) {
-                    this.doClose();
-                }
-            }).catch(() => {
-                this.doClose();
-                this.$refs.noticeInfo.doShow(operate);
-            });
-        }
-    }
-};
-</script>
diff --git a/src/jmap/theme/fuzhou_01/menus/dialog/routeDetail.vue b/src/jmap/theme/fuzhou_01/menus/dialog/routeDetail.vue
deleted file mode 100644
index d9279fb05..000000000
--- a/src/jmap/theme/fuzhou_01/menus/dialog/routeDetail.vue
+++ /dev/null
@@ -1,165 +0,0 @@
-<template>
-  <div>
-    <el-dialog
-      v-dialogDrag
-      class="fuzhou-01__systerm route-detail"
-      :title="title"
-      :visible.sync="show"
-      width="340px"
-      :before-close="doClose"
-      :z-index="2000"
-      :modal="false"
-      :close-on-click-modal="false"
-    >
-      <el-row class="header">
-        <el-col :span="10"><span>{{ $t('menu.stationName') }}</span></el-col>
-        <el-col :span="10" :offset="2"><span>{{ $t('menu.startSignal') }}</span></el-col>
-      </el-row>
-      <el-row>
-        <el-col :span="10">
-          <el-input v-model="stationName" size="small" disabled />
-        </el-col>
-        <el-col :span="10" :offset="2">
-          <el-input v-model="signalName" size="small" disabled />
-        </el-col>
-      </el-row>
-      <div class="table">
-        <span>{{ $t('menu.routeList') }}</span>
-        <el-table
-          ref="tempTable"
-          :data="tempData"
-          border
-          style="width: 100%"
-          size="mini"
-          highlight-current-row
-          :height="140"
-        >
-          <el-table-column :label="this.$t('menu.route')">
-            <template slot-scope="scope">
-              <span>{{ scope.row.name }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column prop="status" :label="this.$t('menu.controlState')" width="180">
-            <template slot-scope="scope">
-              <span v-if="scope.row.controlType == '01'">{{ $t('menu.automatic') }}</span>
-              <span v-else>{{ $t('menu.artificial') }}</span>
-            </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">{{ $t('global.confirm') }}</el-button>
-        </el-col>
-        <el-col :span="8" :offset="4">
-          <el-button :id="domIdCancel" @click="cancel">{{ $t('global.cancel') }}</el-button>
-        </el-col>
-      </el-row>
-      <notice-info ref="noticeInfo" />
-    </el-dialog>
-  </div>
-</template>
-
-<script>
-import { mapGetters } from 'vuex';
-import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
-import NoticeInfo from './childDialog/childDialog/noticeInfo';
-
-export default {
-    name: 'RouteDetail',
-    components: {
-        NoticeInfo
-    },
-    data() {
-        return {
-            dialogShow: false,
-            loading: false,
-            tempData: [],
-            stationName: '',
-            signalName: ''
-        };
-    },
-    computed: {
-        ...mapGetters('map', [
-            'signalList'
-        ]),
-        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 this.$t('menu.queryAccessControlMode');
-        }
-    },
-    mounted() {
-        this.$nextTick(() => {
-            this.$store.dispatch('training/tipReload');
-        });
-    },
-    methods: {
-        doShow(operate, selected, tempData) {
-            // 如果不是因为断点激活则需要，初始化菜单初始值
-            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');
-            });
-        },
-        doClose() {
-            this.loading = false;
-            this.dialogShow = false;
-            this.$store.dispatch('training/emitTipFresh');
-        },
-        commit() {
-            const operate = {
-                send: true,
-                type: MapDeviceType.Signal.type,
-                operation: OperationEvent.Signal.detail.menu.operation
-            };
-
-            this.loading = true;
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                this.loading = false;
-                if (valid) {
-                    this.doClose();
-                }
-            }).catch(() => {
-                this.loading = false;
-                this.doClose();
-                this.$refs.noticeInfo.doShow(operate);
-            });
-        },
-        cancel() {
-            const operate = {
-                type: MapDeviceType.Signal.type,
-                operation: OperationEvent.Command.cancel.menu.operation
-            };
-
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                if (valid) {
-                    this.doClose();
-                }
-            }).catch(() => {
-                this.doClose();
-            });
-        }
-    }
-};
-</script>
diff --git a/src/jmap/theme/fuzhou_01/menus/dialog/routeHandControl.vue b/src/jmap/theme/fuzhou_01/menus/dialog/routeHandControl.vue
deleted file mode 100644
index 019ea38fa..000000000
--- a/src/jmap/theme/fuzhou_01/menus/dialog/routeHandControl.vue
+++ /dev/null
@@ -1,317 +0,0 @@
-<template>
-  <div>
-    <el-dialog
-      v-dialogDrag
-      class="fuzhou-01__systerm route-hand-control"
-      :title="title"
-      :visible.sync="show"
-      width="360px"
-      :before-close="doClose"
-      :z-index="2000"
-      :modal="false"
-      :close-on-click-modal="false"
-    >
-      <el-row class="header">
-        <el-col :span="10"><span>{{ $t('menu.stationName') }}</span></el-col>
-        <el-col :span="10" :offset="2"><span>{{ $t('menu.startSignal') }}</span></el-col>
-      </el-row>
-      <el-row>
-        <el-col :span="10">
-          <el-input v-model="stationName" size="small" disabled />
-        </el-col>
-        <el-col :span="10" :offset="2">
-          <el-input v-model="signalName" size="small" disabled />
-        </el-col>
-      </el-row>
-      <div class="table">
-        <span>{{ $t('menu.routeList') }}</span>
-        <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="this.$t('menu.route')" style="margin-left:30px">
-            <template slot-scope="scope">
-              <el-checkbox v-model="scope.row.check" :disabled="scope.row.disabled" />
-              <span :style="{color: scope.row.disabled ? '#CBCBCB':'unset'}">{{ scope.row.name }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column prop="controlType" :label="this.$t('menu.controlState')" :width="80">
-            <template slot-scope="scope">
-              <span :style="{color: scope.row.disabled ? '#CBCBCB':'unset'}">
-                <span v-if="scope.row.controlType == '01'">{{ $t('menu.automatic2') }}</span>
-                <span v-else>{{ $t('menu.artificial') }}</span>
-              </span>
-            </template>
-          </el-table-column>
-          <el-table-column prop="conflictCheck" :label="this.$t('menu.conflictCheck')" :width="80">
-            <template slot-scope="scope">
-              <span
-                :style="{color: scope.row.disabled ? '#CBCBCB':'unset'}"
-              >{{ scope.row.conflictCheck }}</span>
-            </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"
-          >{{ $t('global.confirm') }}</el-button>
-        </el-col>
-        <el-col :span="8" :offset="4">
-          <el-button :id="domIdCancel" @click="cancel">{{ $t('global.cancel') }}</el-button>
-        </el-col>
-      </el-row>
-      <confirm-control ref="confirmControl" />
-      <notice-info ref="noticeInfo" />
-    </el-dialog>
-  </div>
-</template>
-
-<script>
-import { mapGetters } from 'vuex';
-import { MapDeviceType, OperationEvent, getDomIdByOperation } from '@/scripts/ConstDic';
-import ConfirmControl from './childDialog/confirmControl';
-import NoticeInfo from './childDialog/childDialog/noticeInfo';
-
-export default {
-    name: 'RouteHandControl',
-    components: {
-        ConfirmControl,
-        NoticeInfo
-    },
-    data() {
-        return {
-            dialogShow: false,
-            loading: false,
-            tempData: [],
-            operation: null,
-            selection: [],
-            stationName: '',
-            signalName: ''
-        };
-    },
-    computed: {
-        ...mapGetters('map', [
-            'signalList'
-        ]),
-        show() {
-            return this.dialogShow && !this.$store.state.menuOperation.break;
-        },
-        domIdCancel() {
-            return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
-        },
-        domIdChoose() {
-            if (this.dialogShow) {
-                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 ? getDomIdByOperation(this.operation) : '';
-        },
-        title() {
-            if (this.operation == OperationEvent.Signal.humanControl.menu.operation) {
-                return this.$t('menu.menuSignal.humanControl');
-            } else if (this.operation == OperationEvent.Signal.atsAutoControl.menu.operation) {
-                return this.$t('menu.menuSignal.atsAutoControl');
-            }
-            return '';
-        },
-        commitDisabled() {
-            let disabled = true;
-            if (this.selection && this.selection.length) {
-                disabled = false;
-            }
-
-            return disabled;
-        }
-    },
-    watch: {
-        // 深度数据状态
-        tempData: {
-            handler(val, oldVal) {
-                this.checkTableDataSelction(val);
-            },
-            deep: true
-        }
-    },
-    mounted() {
-        this.$nextTick(() => {
-            this.$store.dispatch('training/tipReload');
-        });
-    },
-    methods: {
-        doShow(operate, selected, tempData) {
-            // 如果不是断点激活，而是第一次显示则初始化
-            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.controlType != '01') {
-                            elem.disabled = true;
-                        } if (operate.operation === OperationEvent.Signal.atsAutoControl.menu.operation &&
-                                elem.controlType == '01') {
-                            elem.disabled = true;
-                        }
-                    });
-                }
-
-                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.$refs.tempTable.setCurrentRow();
-            this.$store.dispatch('training/emitTipFresh');
-        },
-        checkTableDataSelction(data) {
-            const selection = [];
-            if (data && data.length > 0) {
-                data.forEach(row => {
-                    if (row.check && !row.disabled) {
-                        selection.push(row);
-                    }
-                });
-            }
-
-            if (JSON.stringify(selection) !== JSON.stringify(this.selection)) {
-                this.handleChooseChange(selection);
-                this.selection = selection;
-            }
-        },
-        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 = {
-                    repeat: true,
-                    type: MapDeviceType.Signal.type,
-                    operation: '',
-                    val: this.serializeCodeListWithSeparator('::'),
-                    selection: selection
-                };
-
-                if (this.operation == OperationEvent.Signal.humanControl.menu.operation) {
-                    /** 自排关*/
-                    operate.operation = OperationEvent.Signal.humanControl.choose.operation;
-                } else if (this.operation == OperationEvent.Signal.atsAutoControl.menu.operation) {
-                    /** 自排开*/
-                    operate.operation = OperationEvent.Signal.atsAutoControl.choose.operation;
-                }
-
-                this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                    if (valid) {
-                        this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    }
-                });
-            } else if (!selection) {
-                this.$messageBox(this.$t('tip.selectAPieceOfData'));
-            }
-        },
-        commit() {
-            if (this.operation == OperationEvent.Signal.humanControl.menu.operation) {
-                /** 自排关*/
-                this.humanControl();
-            } else if (this.operation == OperationEvent.Signal.atsAutoControl.menu.operation) {
-                /** 自排开*/
-                this.atsAutoControl();
-            }
-        },
-        // 自排关
-        humanControl() {
-            const operate = {
-                send: true,
-                type: MapDeviceType.Signal.type,
-                operation: OperationEvent.Signal.humanControl.menu.operation
-            };
-
-            this.loading = true;
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                this.loading = false;
-                if (valid) {
-                    this.doClose();
-                }
-            }).catch(() => {
-                this.loading = false;
-                this.doClose();
-                this.$refs.noticeInfo.doShow(operate);
-            });
-        },
-        // 自排开
-        atsAutoControl() {
-            const operate = {
-                send: true,
-                type: MapDeviceType.Signal.type,
-                operation: OperationEvent.Signal.atsAutoControl.menu.operation
-            };
-
-            this.loading = true;
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                this.loading = false;
-                if (valid) {
-                    this.doClose();
-                }
-            }).catch(() => {
-                this.loading = false;
-                this.doClose();
-                this.$refs.noticeInfo.doShow(operate);
-            });
-        },
-        cancel() {
-            const operate = {
-                type: MapDeviceType.Signal.type,
-                operation: OperationEvent.Command.cancel.menu.operation
-            };
-
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                if (valid) {
-                    this.doClose();
-                }
-            }).catch(() => {
-                this.doClose();
-            });
-        }
-    }
-};
-</script>
diff --git a/src/jmap/theme/fuzhou_01/menus/dialog/routeLock.vue b/src/jmap/theme/fuzhou_01/menus/dialog/routeLock.vue
deleted file mode 100644
index a2072d2fc..000000000
--- a/src/jmap/theme/fuzhou_01/menus/dialog/routeLock.vue
+++ /dev/null
@@ -1,167 +0,0 @@
-<template>
-  <div>
-    <el-dialog
-      v-dialogDrag
-      class="fuzhou-01__systerm route-lock"
-      :title="title"
-      :visible.sync="show"
-      width="340px"
-      :before-close="doClose"
-      :z-index="2000"
-      :modal="false"
-      :close-on-click-modal="false"
-    >
-      <el-row class="header">
-        <el-col :span="10"><span>{{ $t('menu.stationName') }}</span></el-col>
-        <el-col :span="10" :offset="2"><span>{{ $t('menu.signalName') }}</span></el-col>
-      </el-row>
-      <el-row>
-        <el-col :span="10">
-          <el-input v-model="stationName" size="small" disabled />
-        </el-col>
-        <el-col :span="10" :offset="2">
-          <el-input v-model="signalName" size="small" disabled />
-        </el-col>
-      </el-row>
-      <div class="table">
-        <span>{{ $t('menu.listOfSignalButtons') }}</span>
-        <el-table
-          ref="table"
-          :data="tempData"
-          border
-          style="width: 100%"
-          size="mini"
-          highlight-current-row
-          :height="140"
-        >
-          <el-table-column prop="name" :label="this.$t('menu.buttonName')" />
-          <el-table-column prop="status" :label="this.$t('menu.buttonStatus')" />
-        </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">{{ $t('global.confirm') }}</el-button>
-        </el-col>
-        <el-col :span="8" :offset="4">
-          <el-button :id="domIdCancel" @click="cancel">{{ $t('global.cancel') }}</el-button>
-        </el-col>
-      </el-row>
-      <notice-info ref="noticeInfo" />
-    </el-dialog>
-  </div>
-</template>
-
-<script>
-import { mapGetters } from 'vuex';
-import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
-import NoticeInfo from './childDialog/childDialog/noticeInfo';
-
-export default {
-    name: 'RouteLock',
-    components: {
-        NoticeInfo
-    },
-    data() {
-        return {
-            dialogShow: false,
-            loading: false,
-            tempData: [],
-            operate: null,
-            stationName: '',
-            signalName: ''
-        };
-    },
-    computed: {
-        ...mapGetters('map', [
-            'signalList'
-        ]),
-        show() {
-            return this.dialogShow && !this.$store.state.menuOperation.break;
-        },
-        domIdCancel() {
-            return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
-        },
-        domIdConfirm() {
-            return this.dialogShow ? OperationEvent.Signal.lock.menu.domId : '';
-        },
-        title() {
-            return this.$t('menu.blockSignalButton');
-        }
-    },
-    mounted() {
-        this.$nextTick(() => {
-            this.$store.dispatch('training/tipReload');
-        });
-    },
-    methods: {
-        doShow(operate, 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;
-                    }
-                }
-
-                /** status 04:封锁*/
-                const signal = (selected || {}).status;
-                this.tempData = [{ code: selected.code, name: selected.name, status: signal.status != '04' ? this.$t('menu.unblocked') : this.$t('menu.blocked') }];
-                const timer = setInterval(() => {
-                    if (this.$refs.table) {
-                        this.$refs.table.setCurrentRow(this.tempData[0]);
-                        clearInterval(timer);
-                    }
-                }, 300);
-            }
-
-            this.dialogShow = true;
-            this.$nextTick(() => {
-                this.$store.dispatch('training/emitTipFresh');
-            });
-        },
-        doClose() {
-            this.loading = false;
-            this.dialogShow = false;
-            this.$store.dispatch('training/emitTipFresh');
-        },
-        commit() {
-            const operate = {
-                send: true,
-                type: MapDeviceType.Signal.type,
-                operation: OperationEvent.Signal.lock.menu.operation
-            };
-
-            this.loading = true;
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                this.loading = false;
-                if (valid) {
-                    this.doClose();
-                }
-            }).catch(() => {
-                this.loading = false;
-                this.doClose();
-                this.$refs.noticeInfo.doShow(operate);
-            });
-        },
-        cancel() {
-            const operate = {
-                type: MapDeviceType.Signal.type,
-                operation: OperationEvent.Command.cancel.menu.operation
-            };
-
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                if (valid) {
-                    this.doClose();
-                }
-            }).catch(() => {
-                this.doClose();
-            });
-        }
-    }
-};
-</script>
diff --git a/src/jmap/theme/fuzhou_01/menus/dialog/routeSelection.vue b/src/jmap/theme/fuzhou_01/menus/dialog/routeSelection.vue
deleted file mode 100644
index ca7261a8b..000000000
--- a/src/jmap/theme/fuzhou_01/menus/dialog/routeSelection.vue
+++ /dev/null
@@ -1,262 +0,0 @@
-<template>
-  <el-dialog
-    v-dialogDrag
-    class="fuzhou-01__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 class="header">
-      <el-col :span="8"><span>{{ $t('menu.stationName') }}</span></el-col>
-      <el-col :span="8" :offset="2"><span>{{ $t('menu.startSignal') }}</span></el-col>
-    </el-row>
-    <el-row>
-      <el-col :span="8">
-        <el-input v-model="stationName" size="small" disabled />
-      </el-col>
-      <el-col :span="8" :offset="2">
-        <el-input v-model="signalName" size="small" disabled />
-      </el-col>
-    </el-row>
-    <el-table
-      ref="table"
-      :data="tempData"
-      border
-      style="width: 100%; margin-top:10px"
-      size="mini"
-      height="120"
-      highlight-current-row
-      @row-click="clickEvent"
-    >
-      <el-table-column :id="domIdChoose" prop="name" :label="this.$t('menu.route')" style="margin-left:30px" />
-      <el-table-column prop="protectedSection" :label="this.$t('menu.protectionSection')" :width="180">
-        <template slot-scope="scope">
-          <span>{{ getProtectedSectionName(scope.row) }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column prop="canSetting" :label="this.$t('global.status')" :width="100">
-        <template slot-scope="scope">
-          <span v-if="scope.row.canSetting">{{ $t('menu.allowSelection') }}</span>
-          <span v-else>{{ $t('menu.notAllowSelection') }}</span>
-        </template>
-      </el-table-column>
-    </el-table>
-    <el-row
-      justify="
-                        center"
-      class="button-group"
-    >
-      <el-col :span="8" :offset="4">
-        <el-button
-          :id="domIdConfirm"
-          type="primary"
-          :loading="loading"
-          :disabled="commitDisabled"
-          @click="commit"
-        >{{ $t('global.confirm') }}</el-button>
-      </el-col>
-      <el-col :span="8" :offset="4">
-        <el-button :id="domIdCancel" @click="cancel">{{ $t('global.cancel') }}</el-button>
-      </el-col>
-    </el-row>
-    <confirm-control ref="confirmControl" />
-    <notice-info ref="noticeInfo" />
-  </el-dialog>
-</template>
-
-<script>
-import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
-import ConfirmControl from './childDialog/confirmControl';
-import NoticeInfo from './childDialog/childDialog/noticeInfo';
-
-export default {
-    name: 'RouteSelection',
-    components: {
-        ConfirmControl,
-        NoticeInfo
-    },
-    data() {
-        return {
-            tempData: [],
-            beforeSectionList: [],
-            dialogShow: false,
-            loading: false,
-            row: null,
-            operation: '',
-            display: true,
-            stationName: '',
-            signalName: ''
-        };
-    },
-    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.menu.domId : '';
-        },
-        title() {
-            return this.$t('menu.menuSignal.routeSelect');
-        },
-        commitDisabled() {
-            let disabled = true;
-            if (this.row) {
-                disabled = !this.row.canSetting;
-            }
-            return disabled;
-        }
-    },
-    mounted() {
-        this.$nextTick(() => {
-            this.$store.dispatch('training/tipReload');
-        });
-    },
-    methods: {
-        getProtectedSectionName(row) {
-            let name = '';
-            if (row &&
-                    row.overlapSectionList &&
-                    row.overlapSectionList &&
-                    row.overlapSectionList.length > 0) {
-
-                const protect = row.overlapSectionList[0];
-                name = `${protect.name}`;
-                if (protect.parentName) {
-                    name = `${protect.parentName}${protect.name}`;
-                }
-                const station = this.$store.getters['map/getDeviceByCode'](protect.stationCode);
-                if (station) {
-                    name = `${name}(${station.name})`;
-                }
-            }
-            return name;
-        },
-        doShow(operate, selected, tempData) {
-            // 如果不是断点激活，而是第一次显示，则需要设置初始值
-            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();
-
-                if (row.canSetting) {
-                    // 设置选中区段为切除状态
-                    if (row.containSectionList && row.containSectionList.length) {
-                        // 设置新选的进路区段为切除状态
-                        row.containSectionList.forEach(elem => {
-                            elem.cutOff = true;
-                        });
-                    }
-
-                    this.$store.dispatch('training/updateMapState', [...row.containSectionList]);
-                    this.beforeSectionList = row.containSectionList || [];
-
-                    // 设置选中指令
-                    const operate = {
-                        type: MapDeviceType.Signal.type,
-                        operation: OperationEvent.Signal.arrangementRoute.choose.operation,
-                        val: row.code
-                    };
-
-                    this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                        if (valid) {
-                            this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                        }
-                    });
-                }
-            }
-        },
-        commit() {
-            if (this.row && this.row.canSetting) {
-                let names = '';
-                if (this.row.overlapSectionList && this.row.overlapSectionList.length > 0) {
-                    names = names + this.row.overlapSectionList.map(elem => { return elem.name; }).join('');
-                }
-                if (this.row.overlapSwitchList && this.row.overlapSwitchList.length > 0) {
-                    names = names + this.row.overlapSwitchList.map(elem => { return elem.name; }).join('');
-                }
-                const operate = {
-                    type: MapDeviceType.Signal.type,
-                    operation: OperationEvent.Signal.arrangementRoute.menu.operation,
-                    messages: [this.$t('menu.accessSetting') + this.$t('global.colon') + `${this.row.name}${names}(${this.row.stationName})`]
-                };
-
-                this.loading = true;
-                this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                    this.loading = false;
-                    if (valid) {
-                        this.doClose();
-                        this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                        this.$refs.confirmControl.doShow(operate);
-                    }
-                }).catch(() => {
-                    this.loading = false;
-                    this.doClose();
-                    this.$refs.noticeInfo.doShow(operate);
-                });
-            }
-        },
-        cancel() {
-            const operate = {
-                type: MapDeviceType.Signal.type,
-                operation: OperationEvent.Command.cancel.menu.operation
-            };
-
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                if (valid) {
-                    this.doClose();
-                }
-            }).catch(() => {
-                this.doClose();
-            });
-        }
-    }
-};
-</script>
diff --git a/src/jmap/theme/fuzhou_01/menus/dialog/sectionCmdControl.vue b/src/jmap/theme/fuzhou_01/menus/dialog/sectionCmdControl.vue
deleted file mode 100644
index 59cf14ae0..000000000
--- a/src/jmap/theme/fuzhou_01/menus/dialog/sectionCmdControl.vue
+++ /dev/null
@@ -1,457 +0,0 @@
-<template>
-  <div>
-    <el-dialog
-      v-dialogDrag
-      class="fuzhou-01__systerm section-cmd-control"
-      :title="title"
-      :visible.sync="show"
-      width="840px"
-      :before-close="doClose"
-      :z-index="2000"
-      :modal="false"
-      :close-on-click-modal="false"
-    >
-      <div style="padding: 10px 20px; border: 1px solid lightgray;">
-        <span class="base-label">{{ $t('menu.commandInformation') }}</span>
-        <el-form label-position="center" size="mini">
-          <el-row>
-            <el-col :span="8">
-              <el-form-item :label="this.$t('global.status')" label-width="40px">
-                <el-select v-model="operation" size="small" disabled>
-                  <el-option
-                    v-for="option in typeList"
-                    :key="option.code"
-                    :label="option.name"
-                    :value="option.code"
-                  />
-                </el-select>
-              </el-form-item>
-            </el-col>
-            <el-col :span="8">
-              <el-form-item :label="this.$t('menu.stationName')" label-width="80px">
-                <el-input v-model="stationName" size="small" disabled />
-              </el-form-item>
-            </el-col>
-            <el-col :span="8">
-              <el-form-item :label="this.$t('menu.sectionName')" label-width="100px">
-                <el-input v-model="sectionName" size="small" disabled />
-              </el-form-item>
-            </el-col>
-          </el-row>
-        </el-form>
-      </div>
-      <el-table
-        ref="tempData"
-        class="table"
-        :data="tempData"
-        border
-        style="width: 100%"
-        size="mini"
-        highlight-current-row
-        height="200"
-      >
-        <el-table-column prop="order" :width="110" :label="this.$t('menu.serialNumber2')" />
-        <el-table-column prop="date" :width="160" :label="this.$t('menu.time')" />
-        <el-table-column prop="context" :width="180" :label="this.$t('menu.implementationProcess')" />
-        <el-table-column prop="result" :label="this.$t('menu.executionResult')" />
-      </el-table>
-      <span class="notice">{{ message }}</span>
-      <el-row class="button-group">
-        <el-col :span="2" :offset="3">
-          <el-button :id="domIdCommand" type="primary" :disabled="cmdDisabled[0]" @click="command">{{ $t('menu.release') }}<span
-            v-show="timeCountCommand>0"
-          >({{ timeCountCommand }})</span></el-button>
-        </el-col>
-        <el-col :span="2" :offset="1">
-          <el-button :id="domIdConfirm1" type="primary" style="width:120px;" :disabled="cmdDisabled[1]" @click="confirm1">{{ $t('menu.firstConfirm') }}
-          </el-button>
-        </el-col>
-        <el-col :span="2" :offset="2">
-          <el-button :id="domIdConfirm2" type="primary" style="width:120px;" :disabled="cmdDisabled[2]" @click="confirm2">{{ $t('menu.secondConfirm') }}<span
-            v-show="timeCountConfirm>0"
-          >({{ timeCountConfirm }})</span></el-button>
-        </el-col>
-        <el-col :span="2" :offset="2">
-          <el-button :id="domIdStop" type="primary" :disabled="stpDisabled" @click="stop">{{ $t('menu.suspend') }}</el-button>
-        </el-col>
-        <el-col :span="2" :offset="1">
-          <el-button :id="domIdClose" @click="close">{{ $t('global.close') }}</el-button>
-        </el-col>
-      </el-row>
-    </el-dialog>
-  </div>
-</template>
-<script>
-import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
-import { now } from '@/utils/date';
-
-export default {
-    name: 'SectionCmdControl',
-    data() {
-        return {
-            dialogShow: false,
-            backOperate: '',
-            selected: '',
-            order: 0,
-            row: null,
-            timer: null,
-            operation: '',
-            cmdDisabled: [true, true, true],
-            stpDisabled: true,
-            tempData: [],
-            message: '',
-            timeCountCommand: -1,
-            timeCountConfirm: -1,
-            stationName: '',
-            sectionName: ''
-        };
-    },
-    computed: {
-        typeList() {
-            return [
-                { code: OperationEvent.Section.unlock.menu.operation, name: this.$t('menu.menuSection.sectionUnblock') },
-                { code: OperationEvent.Section.fault.menu.operation, name: this.$t('menu.menuSection.sectionFaultUnlock') },
-                { code: OperationEvent.Section.axlePreReset.menu.operation, name: this.$t('menu.menuSection.sectionAxisPreReset') }
-            ];
-        },
-        show() {
-            return this.dialogShow && !this.$store.state.menuOperation.break;
-        },
-        domIdCommand() {
-            if (this.dialogShow) {
-                if (this.operation == OperationEvent.Section.unlock.menu.operation) {
-                    /** 区段解封*/
-                    return OperationEvent.Section.unlock.order.domId;
-                } else if (this.operation == OperationEvent.Section.fault.menu.operation) {
-                    /** 区段故障解锁*/
-                    return OperationEvent.Section.fault.order.domId;
-                } else if (this.operation == OperationEvent.Section.axlePreReset.menu.operation) {
-                    /** 区段计轴预复位*/
-                    return OperationEvent.Section.axlePreReset.order.domId;
-                }
-            }
-            return '';
-        },
-        domIdConfirm1() {
-            if (this.dialogShow) {
-                if (this.operation == OperationEvent.Section.unlock.menu.operation) {
-                    /** 区段解封*/
-                    return OperationEvent.Section.unlock.confirm1.domId;
-                } else if (this.operation == OperationEvent.Section.fault.menu.operation) {
-                    /** 区段故障解锁*/
-                    return OperationEvent.Section.fault.confirm1.domId;
-                } else if (this.operation == OperationEvent.Section.axlePreReset.menu.operation) {
-                    /** 区段计轴预复位*/
-                    return OperationEvent.Section.axlePreReset.confirm1.domId;
-                }
-            }
-            return '';
-        },
-        domIdConfirm2() {
-            if (this.dialogShow) {
-                if (this.operation == OperationEvent.Section.unlock.menu.operation) {
-                    /** 区段解封*/
-                    return OperationEvent.Section.unlock.confirm2.domId;
-                } else if (this.operation == OperationEvent.Section.fault.menu.operation) {
-                    /** 区段故障解锁*/
-                    return OperationEvent.Section.fault.confirm2.domId;
-                } else if (this.operation == OperationEvent.Section.axlePreReset.menu.operation) {
-                    /** 区段计轴预复位*/
-                    return OperationEvent.Section.axlePreReset.confirm2.domId;
-                }
-            }
-            return '';
-        },
-        domIdStop() {
-            if (this.dialogShow) {
-                if (this.operation == OperationEvent.Section.unlock.menu.operation) {
-                    /** 区段解封*/
-                    return OperationEvent.Section.unlock.stop.domId;
-                } else if (this.operation == OperationEvent.Section.fault.menu.operation) {
-                    /** 区段故障解锁*/
-                    return OperationEvent.Section.fault.stop.domId;
-                } else if (this.operation == OperationEvent.Section.axlePreReset.menu.operation) {
-                    /** 区段计轴预复位*/
-                    return OperationEvent.Section.axlePreReset.stop.domId;
-                }
-            }
-            return '';
-        },
-        domIdClose() {
-            if (this.dialogShow) {
-                return OperationEvent.Command.close.menu.domId;
-            }
-            return '';
-        },
-        title() {
-            if (this.dialogShow) {
-                if (this.operation == OperationEvent.Section.unlock.menu.operation) {
-                    return this.$t('menu.menuSection.sectionUnblock');
-                } else if (this.operation == OperationEvent.Section.fault.menu.operation) {
-                    return this.$t('menu.menuSection.sectionFaultUnlock');
-                } else if (this.operation == OperationEvent.Section.axlePreReset.menu.operation) {
-                    return this.$t('menu.menuSection.sectionAxisPreReset');
-                }
-            }
-            return '';
-        }
-    },
-    watch: {
-        cmdDisabled: {
-            handler(val, oldVal) {
-                this.stpDisabled = true;
-                val.forEach((elem, index) => {
-                    // 在确定1之前的操作才可以终止
-                    if (elem == false && index >= 1 && index <= 2) {
-                        this.stpDisabled = false;
-                    }
-                });
-            },
-            deep: true
-        }
-    },
-    mounted() {
-        this.$nextTick(() => {
-            this.$store.dispatch('training/tipReload');
-        });
-        this.timer = setInterval(() => {
-            if (!this.$store.state.menuOperation.break) {
-                if (this.timeCountCommand > 0) {
-                    this.timeCountCommand--;
-                } else if (this.timeCountCommand == 0) {
-                    this.setButtonEnable({ step: 0 });
-                    this.timeCountCommand = -1;
-                }
-                if (this.timeCountConfirm > 0) {
-                    this.timeCountConfirm--;
-                } else if (this.timeCountConfirm == 0) {
-                    this.setButtonEnable({ step: 0 });
-                    this.timeCountConfirm = -1;
-                }
-            }
-        }, 1000);
-    },
-    beforeDestroy() {
-        clearInterval(this.timer);
-        this.timer = null;
-    },
-    methods: {
-        doShow(operate, selected) {
-            if (!this.dialogShow) {
-                this.sectionName = '';
-                this.stationName = '';
-                if (selected && selected._type.toUpperCase() === 'Section'.toUpperCase()) {
-                    if (selected.type === '02') {
-                        const section = this.$store.getters['map/getDeviceByCode'](selected.parentCode);
-                        if (section) {
-                            this.sectionName += section.name;
-                        }
-                    }
-                    this.sectionName += selected.name;
-
-                    const station = this.$store.getters['map/getDeviceByCode'](selected.stationCode);
-                    if (station) {
-                        this.stationName = station.name;
-                    }
-                    this.selected = selected;
-                }
-
-                this.order = 0;
-                this.operation = operate.operation || '';
-                this.dialogShow = true;
-                this.tempData = [];
-                this.timeCountCommand = -1;
-                this.timeCountConfirm = -1;
-                this.cmdDisabled = [false, true, true];
-            }
-            this.stpDisabled = true;
-            this.setMessage(this.$t('tip.releaseTip'));
-            this.$nextTick(function () {
-                this.$store.dispatch('training/emitTipFresh');
-            });
-        },
-        doClose() {
-            this.dialogShow = false;
-            this.$store.dispatch('training/emitTipFresh');
-        },
-        command() {
-            if (this.operation == OperationEvent.Section.fault.menu.operation ||
-                    this.operation == OperationEvent.Section.unlock.menu.operation ||
-                    this.operation == OperationEvent.Section.cancelSpeed.menu.operation ||
-                    this.operation == OperationEvent.Section.axlePreReset.menu.operation) {
-                /** 第一步不带弹框处理*/
-                this.commandNoPopUp();
-            } else {
-                /** 第一步带弹框处理*/
-                this.commandHasPopUp();
-            }
-        },
-        commandHasPopUp() {
-        },
-        commandNoPopUp() {
-            const operate = {
-                type: MapDeviceType.Section.type
-            };
-
-            if (this.operation == OperationEvent.Section.unlock.menu.operation) {
-                /** 区段解封*/
-                operate.operation = OperationEvent.Section.unlock.order.operation;
-            } else if (this.operation == OperationEvent.Section.fault.menu.operation) {
-                /** 区段故障解锁*/
-                operate.operation = OperationEvent.Section.fault.order.operation;
-            } else if (this.operation == OperationEvent.Section.axlePreReset.menu.operation) {
-                /** 区段计轴预复位*/
-                operate.operation = OperationEvent.Section.axlePreReset.order.operation;
-            }
-
-            this.setMessage(this.$t('tip.firstConfirmTip'));
-            this.writeRecord({ order: ++this.order, date: now(), context: this.$t('menu.clickReleaseCommand'), result: '' });
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                if (valid) {
-                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    this.setButtonEnable({ step: 1 });
-                    this.editRecord({ order: this.order, date: now(), context: this.$t('menu.clickReleaseCommand'), result: this.$t('tip.executionSucceed') });
-                } else {
-                    this.editRecord({ order: this.order, date: now(), context: this.$t('menu.clickReleaseCommand'), result: this.$t('tip.executionFailed') });
-                }
-            }).catch(() => {
-                this.editRecord({ order: this.order, date: now(), context: this.$t('menu.clickReleaseCommand'), result: this.$t('tip.executionException') });
-            });
-        },
-        confirm1() {
-            const operate = {
-                type: MapDeviceType.Section.type
-            };
-
-            if (this.operation == OperationEvent.Section.unlock.menu.operation) {
-                /** 区段解封*/
-                operate.operation = OperationEvent.Section.unlock.confirm1.operation;
-            } else if (this.operation == OperationEvent.Section.fault.menu.operation) {
-                /** 区段故障解锁*/
-                operate.operation = OperationEvent.Section.fault.confirm1.operation;
-            } else if (this.operation == OperationEvent.Section.axlePreReset.menu.operation) {
-                /** 区段计轴预复位*/
-                operate.operation = OperationEvent.Section.axlePreReset.confirm1.operation;
-            }
-
-            this.setMessage(this.$t('tip.secondConfirmTip'));
-            this.writeRecord({ order: ++this.order, date: now(), context: this.$t('menu.clickFirstConfirm'), result: '' });
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                if (valid) {
-                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    this.timeCountCommand = -1;
-                    this.timeCountConfirm = 10;
-                    this.setButtonEnable({ step: 2 });
-                    this.editRecord({ order: this.order, date: now(), context: this.$t('menu.clickFirstConfirm'), result: this.$t('tip.executionSucceed') });
-                } else {
-                    this.editRecord({ order: this.order, date: now(), context: this.$t('menu.clickFirstConfirm'), result: this.$t('tip.executionFailed') });
-                }
-            }).catch(() => {
-                this.editRecord({ order: this.order, date: now(), context: this.$t('menu.clickFirstConfirm'), result: this.$t('tip.executionException') });
-            });
-        },
-        confirm2() {
-            const operate = {
-                send: true,
-                type: MapDeviceType.Section.type
-            };
-
-            if (this.operation == OperationEvent.Section.unlock.menu.operation) {
-                /** 区段解封*/
-                operate.operation = OperationEvent.Section.unlock.confirm2.operation;
-            } else if (this.operation == OperationEvent.Section.fault.menu.operation) {
-                /** 区段故障解锁*/
-                operate.operation = OperationEvent.Section.fault.confirm2.operation;
-            } else if (this.operation == OperationEvent.Section.axlePreReset.menu.operation) {
-                /** 区段计轴预复位*/
-                operate.operation = OperationEvent.Section.axlePreReset.confirm2.operation;
-            }
-            this.setMessage('');
-            this.writeRecord({ order: ++this.order, date: now(), context: this.$t('menu.clickSecondConfirm'), result: '' });
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                this.timeCountCommand = -1;
-                this.timeCountConfirm = -1;
-                this.setButtonEnable({ step: -1 });
-                if (valid) {
-                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    this.editRecord({ order: this.order, date: now(), context: this.$t('menu.clickSecondConfirm'), result: this.$t('tip.executionSucceed') });
-                } else {
-                    this.editRecord({ order: this.order, date: now(), context: this.$t('menu.clickSecondConfirm'), result: this.$t('tip.executionFailed') });
-                }
-            }).catch(() => {
-                this.timeCountCommand = -1;
-                this.timeCountConfirm = -1;
-                this.setButtonEnable({ step: -1 });
-                this.editRecord({ order: this.order, date: now(), context: this.$t('menu.clickSecondConfirm'), result: this.$t('tip.executionException') });
-            });
-        },
-        stop() {
-            const operate = {
-                type: MapDeviceType.Section.type
-            };
-
-            if (this.operation == OperationEvent.Section.unlock.menu.operation) {
-                /** 区段解封*/
-                operate.operation = OperationEvent.Section.unlock.stop.operation;
-            } else if (this.operation == OperationEvent.Section.fault.menu.operation) {
-                /** 区段故障解锁*/
-                operate.operation = OperationEvent.Section.fault.stop.operation;
-            } else if (this.operation == OperationEvent.Section.axlePreReset.menu.operation) {
-                /** 区段计轴预复位*/
-                operate.operation = OperationEvent.Section.axlePreReset.stop.operation;
-            }
-
-            this.writeRecord({ order: ++this.order, date: now(), context: this.$t('menu.clickSuspend'), result: '' });
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                if (valid) {
-                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    this.setButtonEnable({ step: 0 });
-                    this.editRecord({ order: this.order, date: now(), context: this.$t('menu.clickSuspend'), result: this.$t('tip.executionSucceed') });
-                } else {
-                    this.editRecord({ order: this.order, date: now(), context: this.$t('menu.clickSuspend'), result: this.$t('tip.executionFailed') });
-                }
-            }).catch(() => {
-                this.editRecord({ order: this.order, date: now(), context: this.$t('menu.clickSuspend'), result: this.$t('tip.executionException') });
-            });
-        },
-        close() {
-            const operate = {
-                type: MapDeviceType.Section.type,
-                operation: OperationEvent.Command.close.menu.operation
-            };
-
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                if (valid) {
-                    this.doClose();
-                }
-            }).catch(() => {
-                this.doClose();
-            });
-        },
-        getOperate(operate) {
-            /** 弹框返回值处理*/
-        },
-        setButtonEnable(param) {
-            this.cmdDisabled = [true, true, true];
-            if (param && param.step >= 0) {
-                this.cmdDisabled[param.step] = false;
-            }
-        },
-        setMessage(message) {
-            this.message = message;
-        },
-        writeRecord(param) {
-            this.tempData.push(param);
-        },
-        editRecord(param) {
-            this.tempData.forEach(elem => {
-                if (elem.order == param.order) {
-                    for (var prop in param) {
-                        elem[prop] = param[prop];
-                    }
-                }
-            });
-        }
-    }
-};
-</script>
diff --git a/src/jmap/theme/fuzhou_01/menus/dialog/sectionControl.vue b/src/jmap/theme/fuzhou_01/menus/dialog/sectionControl.vue
deleted file mode 100644
index dc81675d1..000000000
--- a/src/jmap/theme/fuzhou_01/menus/dialog/sectionControl.vue
+++ /dev/null
@@ -1,200 +0,0 @@
-<template>
-  <el-dialog
-    v-dialogDrag
-    class="fuzhou-01__systerm section-control"
-    :title="title"
-    :visible.sync="show"
-    width="300px"
-    :before-close="doClose"
-    :z-index="2000"
-    :modal="false"
-    :close-on-click-modal="false"
-  >
-    <el-row class="header">
-      <el-col :span="11"><span>{{ $t('menu.stationName') }}</span></el-col>
-      <el-col :span="11" :offset="2"><span>{{ $t('menu.section') }}</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="sectionName" size="small" disabled />
-      </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">{{ $t('global.confirm') }}</el-button>
-      </el-col>
-      <el-col :span="8" :offset="4">
-        <el-button :id="domIdCancel" @click="cancel">{{ $t('global.cancel') }}</el-button>
-      </el-col>
-    </el-row>
-    <notice-info ref="noticeInfo" />
-  </el-dialog>
-</template>
-
-<script>
-import { MapDeviceType, OperationEvent, getDomIdByOperation } from '@/scripts/ConstDic';
-import NoticeInfo from './childDialog/childDialog/noticeInfo';
-
-export default {
-    name: 'SectionControl',
-    components: {
-        NoticeInfo
-    },
-    data() {
-        return {
-            dialogShow: false,
-            loading: false,
-            operation: '',
-            stationName: '',
-            sectionName: ''
-        };
-    },
-    computed: {
-        show() {
-            return this.dialogShow && !this.$store.state.menuOperation.break;
-        },
-        domIdCancel() {
-            return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
-        },
-        domIdConfirm() {
-            return this.dialogShow ? getDomIdByOperation(this.operation) : '';
-        },
-        title() {
-            if (this.operation == OperationEvent.Section.lock.menu.operation) {
-                return this.$t('menu.menuSection.sectionBlockade');
-            } else if (this.operation == OperationEvent.Section.split.menu.operation) {
-                return this.$t('menu.menuSection.orbitalSectionResection');
-            } else if (this.operation == OperationEvent.Section.active.menu.operation) {
-                return this.$t('menu.menuSection.orbitalSectionActive');
-            }
-            return '';
-        }
-    },
-    mounted() {
-        this.$nextTick(() => {
-            this.$store.dispatch('training/tipReload');
-        });
-    },
-    methods: {
-        doShow(operate, selected) {
-            if (!this.dialogShow) {
-                this.sectionName = '';
-                this.stationName = '';
-                if (selected && selected._type.toUpperCase() === 'Section'.toUpperCase()) {
-                    if (selected.type === '02') {
-                        const section = this.$store.getters['map/getDeviceByCode'](selected.parentCode);
-                        if (section) {
-                            this.sectionName += section.name;
-                        }
-                    }
-                    this.sectionName += selected.name;
-
-                    const station = this.$store.getters['map/getDeviceByCode'](selected.stationCode);
-                    if (station) {
-                        this.stationName = station.name;
-                    }
-                }
-                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.Section.lock.menu.operation) {
-                /** 区段封锁*/
-                this.lock();
-            } else if (this.operation == OperationEvent.Section.split.menu.operation) {
-                /** 轨道区段切除*/
-                this.split();
-            } else if (this.operation == OperationEvent.Section.active.menu.operation) {
-                /** 轨道区段激活*/
-                this.active();
-            }
-        },
-        // 道岔单锁
-        lock() {
-            const operate = {
-                send: true,
-                type: MapDeviceType.Section.type,
-                operation: OperationEvent.Section.lock.menu.operation
-            };
-
-            this.loading = true;
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                this.loading = false;
-                if (valid) {
-                    this.doClose();
-                }
-            }).catch(() => {
-                this.loading = false;
-                this.doClose();
-                this.$refs.noticeInfo.doShow(operate);
-            });
-        },
-        // 轨道区段切除
-        split() {
-            const operate = {
-                send: true,
-                type: MapDeviceType.Section.type,
-                operation: OperationEvent.Section.split.menu.operation
-            };
-
-            this.loading = true;
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                this.loading = false;
-                if (valid) {
-                    this.doClose();
-                }
-            }).catch(() => {
-                this.loading = false;
-                this.doClose();
-                this.$refs.noticeInfo.doShow(operate);
-            });
-        },
-        // 轨道区段激活
-        active() {
-            const operate = {
-                send: true,
-                type: MapDeviceType.Section.type,
-                operation: OperationEvent.Section.active.menu.operation
-            };
-
-            this.loading = true;
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                this.loading = false;
-                if (valid) {
-                    this.doClose();
-                }
-            }).catch(() => {
-                this.loading = false;
-                this.doClose();
-                this.$refs.noticeInfo.doShow(operate);
-            });
-        },
-        cancel() {
-            const operate = {
-                type: MapDeviceType.Section.type,
-                operation: OperationEvent.Command.cancel.menu.operation
-            };
-
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                if (valid) {
-                    this.doClose();
-                }
-            }).catch(() => {
-                this.doClose();
-            });
-        }
-    }
-};
-</script>
diff --git a/src/jmap/theme/fuzhou_01/menus/dialog/speedCmdControl.vue b/src/jmap/theme/fuzhou_01/menus/dialog/speedCmdControl.vue
deleted file mode 100644
index eaa7c36e2..000000000
--- a/src/jmap/theme/fuzhou_01/menus/dialog/speedCmdControl.vue
+++ /dev/null
@@ -1,583 +0,0 @@
-<template>
-  <div>
-    <el-dialog
-      v-dialogDrag
-      class="fuzhou-01__systerm section-cmd-speed"
-      :title="title"
-      :visible.sync="show"
-      width="840px"
-      :before-close="doClose"
-      :z-index="2000"
-      :modal="false"
-      :close-on-click-modal="false"
-    >
-      <div style="padding: 10px 20px; border: 1px solid lightgray;">
-        <span class="base-label">{{ $t('menu.commandInformation') }}</span>
-        <el-form label-position="center" size="mini">
-          <el-row>
-            <el-col :span="6">
-              <el-form-item :label="this.$t('menu.type')" label-width="40px">
-                <el-select v-model="operation" size="small" disabled>
-                  <el-option
-                    v-for="option in typeList"
-                    :key="option.code"
-                    :label="option.name"
-                    :value="option.code"
-                  />
-                </el-select>
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item :label="this.$t('menu.stationName')" label-width="80px">
-                <el-input v-model="stationName" size="small" disabled />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item :label="nameLabel" label-width="80px">
-                <el-input v-model="name" size="small" disabled />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item :label="this.$t('menu.speedLimitValue')" label-width="80px">
-                <el-select
-                  :id="domIdChoose"
-                  v-model="speed"
-                  size="small"
-                  :disabled="spdDisabled"
-                  @change="speedSelectChange"
-                >
-                  <el-option v-for="item in speedList" :key="item" :label="item" :value="item" />
-                </el-select>
-              </el-form-item>
-            </el-col>
-          </el-row>
-        </el-form>
-      </div>
-      <el-table
-        ref="table"
-        class="table"
-        :data="tableData"
-        border
-        style="width: 100%"
-        size="mini"
-        highlight-current-row
-        height="200"
-      >
-        <el-table-column prop="order" :width="110" :label="this.$t('menu.serialNumber2')" />
-        <el-table-column prop="date" :width="160" :label="this.$t('menu.time')" />
-        <el-table-column prop="context" :width="180" :label="this.$t('menu.implementationProcess')" />
-        <el-table-column prop="result" :label="this.$t('menu.executionResult')" />
-      </el-table>
-      <span class="notice">{{ message }}</span>
-      <el-row class="button-group">
-        <el-col :span="2" :offset="3">
-          <el-button :id="domIdCommand" type="primary" :disabled="cmdDisabled[0]" @click="command">{{ $t('menu.release') }}<span
-            v-show="timeCountCommand>0"
-          >({{ timeCountCommand }})</span></el-button>
-        </el-col>
-        <el-col :span="2" :offset="1">
-          <el-button :id="domIdConfirm1" type="primary" style="width:120px;" :disabled="cmdDisabled[1]" @click="confirm1">{{ $t('menu.firstConfirm') }}
-          </el-button>
-        </el-col>
-        <el-col :span="2" :offset="2">
-          <el-button :id="domIdConfirm2" type="primary" style="width:120px;" :disabled="cmdDisabled[2]" @click="confirm2">{{ $t('menu.secondConfirm') }}<span
-            v-show="timeCountConfirm>0"
-          >({{ timeCountConfirm }})</span></el-button>
-        </el-col>
-        <el-col :span="2" :offset="2">
-          <el-button :id="domIdStop" type="primary" :disabled="stpDisabled" @click="stop">{{ $t('menu.suspend') }}</el-button>
-        </el-col>
-        <el-col :span="2" :offset="1">
-          <el-button :id="domIdClose" @click="close">{{ $t('global.close') }}</el-button>
-        </el-col>
-      </el-row>
-    </el-dialog>
-    <confirm-control-speed ref="confirmControlSpeed" @setOperate="getOperate" />
-  </div>
-</template>
-<script>
-import { OperationEvent } from '@/scripts/ConstDic';
-import ConfirmControlSpeed from './childDialog/confirmControlSpeed';
-import { now } from '@/utils/date';
-
-export default {
-    name: 'SectionCmdSpeed',
-    components: {
-        ConfirmControlSpeed
-    },
-    data() {
-        return {
-            dialogShow: false,
-            backOperate: '',
-            selected: '',
-            order: 0,
-            row: null,
-            timer: null,
-            type: '',
-            operation: '',
-            cmdDisabled: [true, true, true],
-            spdDisabled: false,
-            stpDisabled: true,
-            tableData: [],
-            message: '',
-            timeCountCommand: -1,
-            timeCountConfirm: -1,
-            maxSpeed: 80,
-            speedSpace: 5,
-            stationName: '',
-            name: '',
-            speed: ''
-        };
-    },
-    computed: {
-        nameLabel() {
-            if (this.operation == OperationEvent.Section.setSpeed.menu.operation ||
-                this.operation == OperationEvent.Section.cancelSpeed.menu.operation) {
-                return this.$t('menu.sectionName');
-            } else if (this.operation == OperationEvent.Switch.setSpeed.menu.operation ||
-                this.operation == OperationEvent.Switch.cancelSpeed.menu.operation) {
-                return this.$t('menu.switchName');
-            }
-            return null;
-        },
-        speedList() {
-            const list = [];
-            for (var i = 0; i * this.speedSpace <= this.maxSpeed; i++) {
-                list.push(String(i * this.speedSpace));
-            }
-            return list;
-        },
-        typeList() {
-            return [
-                { code: OperationEvent.Section.setSpeed.menu.operation, name: this.$t('menu.menuSection.sectionSetSpeedLimit') },
-                { code: OperationEvent.Section.cancelSpeed.menu.operation, name: this.$t('menu.menuSection.sectionCancelSpeedLimit') },
-                { code: OperationEvent.Switch.setSpeed.menu.operation, name: this.$t('menu.turnoutSettingSpeedLimit') },
-                { code: OperationEvent.Switch.cancelSpeed.menu.operation, name: this.$t('menu.turnoutCancelsSpeedLimit') }
-            ];
-        },
-        title() {
-            if (this.dialogShow) {
-                if (this.operation == OperationEvent.Section.setSpeed.menu.operation) {
-                    return this.$t('menu.menuSection.sectionSetSpeedLimit');
-                } else if (this.operation == OperationEvent.Section.cancelSpeed.menu.operation) {
-                    return this.$t('menu.menuSection.sectionCancelSpeedLimit');
-                } else if (this.operation == OperationEvent.Switch.setSpeed.menu.operation) {
-                    return this.$t('menu.turnoutSettingSpeedLimit');
-                } else if (this.operation == OperationEvent.Switch.cancelSpeed.menu.operation) {
-                    return this.$t('menu.turnoutCancelsSpeedLimit');
-                }
-            }
-            return null;
-        },
-        show() {
-            return this.dialogShow && !this.$store.state.menuOperation.break;
-        },
-        domIdChoose() {
-            if (this.dialogShow) {
-                if (this.operation == OperationEvent.Section.setSpeed.menu.operation) {
-                    /** 区段设置限速*/
-                    return OperationEvent.Section.setSpeed.choose.domId;
-                } else if (this.operation == OperationEvent.Switch.setSpeed.menu.operation) {
-                    /** 道岔设置限速*/
-                    return OperationEvent.Switch.setSpeed.choose.domId;
-                }
-            }
-            return null;
-        },
-        domIdCommand() {
-            if (this.dialogShow) {
-                if (this.operation == OperationEvent.Section.setSpeed.menu.operation) {
-                    /** 区段设置限速*/
-                    return OperationEvent.Section.setSpeed.order.domId;
-                } else if (this.operation == OperationEvent.Section.cancelSpeed.menu.operation) {
-                    /** 区段取消限速*/
-                    return OperationEvent.Section.cancelSpeed.order.domId;
-                } else if (this.operation == OperationEvent.Switch.setSpeed.menu.operation) {
-                    /** 道岔设置限速*/
-                    return OperationEvent.Switch.setSpeed.order.domId;
-                } else if (this.operation == OperationEvent.Switch.cancelSpeed.menu.operation) {
-                    /** 道岔取消限速*/
-                    return OperationEvent.Switch.cancelSpeed.order.domId;
-                }
-            }
-            return null;
-        },
-        domIdConfirm1() {
-            if (this.dialogShow) {
-                if (this.operation == OperationEvent.Section.setSpeed.menu.operation) {
-                    /** 区段设置限速*/
-                    return OperationEvent.Section.setSpeed.confirm1.domId;
-                } else if (this.operation == OperationEvent.Section.cancelSpeed.menu.operation) {
-                    /** 区段取消限速*/
-                    return OperationEvent.Section.cancelSpeed.confirm1.domId;
-                } else if (this.operation == OperationEvent.Switch.setSpeed.menu.operation) {
-                    /** 道岔设置限速*/
-                    return OperationEvent.Switch.setSpeed.confirm1.domId;
-                } else if (this.operation == OperationEvent.Switch.cancelSpeed.menu.operation) {
-                    /** 道岔取消限速*/
-                    return OperationEvent.Switch.cancelSpeed.confirm1.domId;
-                }
-            }
-            return null;
-        },
-        domIdConfirm2() {
-            if (this.dialogShow) {
-                if (this.operation == OperationEvent.Section.setSpeed.menu.operation) {
-                    /** 区段设置限速*/
-                    return OperationEvent.Section.setSpeed.confirm2.domId;
-                } else if (this.operation == OperationEvent.Section.cancelSpeed.menu.operation) {
-                    /** 区段取消限速*/
-                    return OperationEvent.Section.cancelSpeed.confirm2.domId;
-                } else if (this.operation == OperationEvent.Switch.setSpeed.menu.operation) {
-                    /** 道岔设置限速*/
-                    return OperationEvent.Switch.setSpeed.confirm2.domId;
-                } else if (this.operation == OperationEvent.Switch.cancelSpeed.menu.operation) {
-                    /** 道岔设置限速*/
-                    return OperationEvent.Switch.cancelSpeed.confirm2.domId;
-                }
-            }
-            return null;
-        },
-        domIdStop() {
-            if (this.dialogShow) {
-                if (this.operation == OperationEvent.Section.setSpeed.menu.operation) {
-                    /** 区段设置限速*/
-                    return OperationEvent.Section.setSpeed.stop.domId;
-                } else if (this.operation == OperationEvent.Section.cancelSpeed.menu.operation) {
-                    /** 区段取消限速*/
-                    return OperationEvent.Section.cancelSpeed.stop.domId;
-                } else if (this.operation == OperationEvent.Switch.setSpeed.menu.operation) {
-                    /** 道岔设置限速*/
-                    return OperationEvent.Switch.setSpeed.stop.domId;
-                } else if (this.operation == OperationEvent.Switch.cancelSpeed.menu.operation) {
-                    /** 道岔取消限速*/
-                    return OperationEvent.Switch.cancelSpeed.stop.domId;
-                }
-            }
-            return null;
-        },
-        domIdClose() {
-            if (this.dialogShow) {
-                return OperationEvent.Command.close.menu.domId;
-            }
-            return null;
-        },
-        isCancelSpeed() {
-            return this.operation == OperationEvent.Section.cancelSpeed.menu.operation ||
-                    this.operation == OperationEvent.Switch.cancelSpeed.menu.operation;
-        }
-    },
-    watch: {
-        cmdDisabled: {
-            handler(val, oldVal) {
-                this.stpDisabled = true;
-                this.spdDisabled = false;
-                val.forEach((elem, index) => {
-                    // 取消操作禁止选择限速，并跳过该步骤
-                    if (elem == false && index >= 1 || this.isCancelSpeed) {
-                        this.spdDisabled = true;
-                    }
-
-                    // 在确定1之前的操作才可终止
-                    if (elem == false && index >= 1) {
-                        this.stpDisabled = false;
-                    }
-                });
-            },
-            deep: true
-        },
-        'speed': function (val) {
-            if (val) this.cmdDisabled[0] = false;
-        }
-    },
-    mounted() {
-        this.$nextTick(() => {
-            this.$store.dispatch('training/tipReload');
-        });
-        this.timer = setInterval(() => {
-            if (!this.$store.state.menuOperation.break) {
-                if (this.timeCountCommand > 0) {
-                    this.timeCountCommand--;
-                } else if (this.timeCountCommand == 0) {
-                    this.setButtonEnable({ step: 0 });
-                    this.timeCountCommand = -1;
-                }
-                if (this.timeCountConfirm > 0) {
-                    this.timeCountConfirm--;
-                } else if (this.timeCountConfirm == 0) {
-                    this.setButtonEnable({ step: 0 });
-                    this.timeCountConfirm = -1;
-                }
-            }
-        }, 1000);
-    },
-    beforeDestroy() {
-        clearInterval(this.timer);
-        this.timer = null;
-    },
-    methods: {
-        doShow(operate, selected, tempData) {
-            if (!this.dialogShow) {
-                this.name = '';
-                this.stationName = '';
-                if (selected) {
-                    if (operate.operation == OperationEvent.Section.setSpeed.menu.operation ||
-                            operate.operation == OperationEvent.Section.cancelSpeed.menu.operation) {
-                        if (selected && selected._type.toUpperCase() === 'Section'.toUpperCase()) {
-                            if (selected.type === '02') {
-                                const section = this.$store.getters['map/getDeviceByCode'](selected.parentCode);
-                                if (section) {
-                                    this.name += section.name;
-                                }
-                            }
-                            this.name += selected.name;
-                        }
-                    } else if (operate.operation == OperationEvent.Switch.setSpeed.menu.operation ||
-                            operate.operation == OperationEvent.Switch.cancelSpeed.menu.operation) {
-                        if (selected._type.toUpperCase() === 'Switch'.toUpperCase()) {
-                            this.name = selected.name;
-                        }
-                    }
-
-                    const station = this.$store.getters['map/getDeviceByCode'](selected.stationCode);
-                    if (station) {
-                        this.stationName = station.name;
-                    }
-
-                    this.speed = '';
-                    this.tableData = [];
-                    this.selected = selected;
-                    this.timeCountCommand = -1;
-                    this.timeCountConfirm = -1;
-                    this.cmdDisabled = [true, true, true];
-                    this.stpDisabled = true;
-                    this.order = 0;
-                    this.type = operate.type;
-                    this.operation = operate.operation;
-                    this.setMessage(this.$t('tip.selectSpeedLimitValueTip'));
-                    if (this.isCancelSpeed) {
-                        this.speed = `${tempData}`;
-                        this.spdDisabled = true;
-                        this.cmdDisabled = [false, true, true];
-                    }
-                }
-
-            }
-            this.dialogShow = true;
-            this.$nextTick(function () {
-                this.$store.dispatch('training/emitTipFresh');
-            });
-        },
-        doClose() {
-            this.dialogShow = false;
-            this.$store.dispatch('training/emitTipFresh');
-        },
-        speedSelectChange(val) {
-            const operate = {
-                type: this.type,
-                val: val
-            };
-
-            if (this.operation == OperationEvent.Section.setSpeed.menu.operation) {
-                /** 区段设置限速*/
-                operate.operation = OperationEvent.Section.setSpeed.choose.operation;
-            } else if (this.operation == OperationEvent.Switch.setSpeed.menu.operation) {
-                /** 道岔设置限速*/
-                operate.operation = OperationEvent.Switch.setSpeed.choose.operation;
-            }
-
-            this.setMessage(this.$t('tip.releaseTip'));
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                if (valid) {
-                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    this.setButtonEnable({ step: 0 });
-                }
-            });
-        },
-        command() {
-            const operate = {
-                type: this.type
-            };
-
-            if (this.operation == OperationEvent.Section.setSpeed.menu.operation) {
-                /** 区段设置限速*/
-                operate.operation = OperationEvent.Section.setSpeed.order.operation;
-                operate.message = this.$t('menu.in') + `【${this.name}】` + this.$t('menu.sectionSetLimitPrefix') + `${this.speed}` + this.$t('menu.sectionLimitSuffix');
-            } else if (this.operation == OperationEvent.Section.cancelSpeed.menu.operation) {
-                /** 区段取消限速*/
-                operate.operation = OperationEvent.Section.cancelSpeed.order.operation;
-                operate.message = this.$t('menu.in') + `【${this.name}】` + this.$t('menu.sectionCancelLimitPrefix') + `${this.speed}` + this.$t('menu.sectionLimitSuffix');
-            } else if (this.operation == OperationEvent.Switch.setSpeed.menu.operation) {
-                /** 道岔设置限速*/
-                operate.operation = OperationEvent.Switch.setSpeed.order.operation;
-                operate.message = this.$t('menu.in') + `【${this.name}】` + this.$t('menu.switchSetLimitPrefix') + `${this.speed}` + this.$t('menu.sectionLimitSuffix');
-            } else if (this.operation == OperationEvent.Switch.cancelSpeed.menu.operation) {
-                /** 道岔取消限速*/
-                operate.operation = OperationEvent.Switch.cancelSpeed.order.operation;
-                operate.message = this.$t('menu.in') + `【${this.name}】` + this.$t('menu.switchCancelLimitPrefix') + `${this.speed}` + this.$t('menu.sectionLimitSuffix');
-            }
-
-            this.setMessage(this.$t('tip.firstConfirmTip'));
-            this.writeRecord({ order: ++this.order, date: now(), context: this.$t('menu.clickReleaseCommand'), result: '' });
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                if (valid) {
-                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    this.editRecord({ order: this.order, date: now(), context: this.$t('menu.clickReleaseCommand'), result: this.$t('tip.executionSucceed') });
-                    this.$refs.confirmControlSpeed.doShow(operate, this.selected);
-                } else {
-                    this.editRecord({ order: this.order, date: now(), context: this.$t('menu.clickReleaseCommand'), result: this.$t('tip.executionFailed') });
-                }
-            }).catch(() => {
-                this.editRecord({ order: this.order, date: now(), context: this.$t('menu.clickReleaseCommand'), result: this.$t('tip.executionException') });
-            });
-        },
-        confirm1() {
-            const operate = {
-                type: this.type
-            };
-
-            if (this.operation == OperationEvent.Section.setSpeed.menu.operation) {
-                /** 区段设置限速*/
-                operate.operation = OperationEvent.Section.setSpeed.confirm1.operation;
-            } else if (this.operation == OperationEvent.Section.cancelSpeed.menu.operation) {
-                /** 区段取消限速*/
-                operate.operation = OperationEvent.Section.cancelSpeed.confirm1.operation;
-            } else if (this.operation == OperationEvent.Switch.setSpeed.menu.operation) {
-                /** 道岔设置限速*/
-                operate.operation = OperationEvent.Switch.setSpeed.confirm1.operation;
-            } else if (this.operation == OperationEvent.Switch.cancelSpeed.menu.operation) {
-                /** 道岔取消限速*/
-                operate.operation = OperationEvent.Switch.cancelSpeed.confirm1.operation;
-            }
-
-            this.setMessage(this.$t('tip.secondConfirmTip'));
-            this.writeRecord({ order: ++this.order, date: now(), context: this.$t('menu.clickFirstConfirm'), result: '' });
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                if (valid) {
-                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    this.timeCountCommand = -1;
-                    this.timeCountConfirm = 10;
-                    this.setButtonEnable({ step: 2 });
-                    this.editRecord({ order: this.order, date: now(), context: this.$t('menu.clickFirstConfirm'), result: this.$t('tip.executionSucceed') });
-                } else {
-                    this.editRecord({ order: this.order, date: now(), context: this.$t('menu.clickFirstConfirm'), result: this.$t('tip.executionFailed') });
-                }
-            }).catch(() => {
-                this.editRecord({ order: this.order, date: now(), context: this.$t('menu.clickFirstConfirm'), result: this.$t('tip.executionException') });
-            });
-        },
-        confirm2() {
-            const operate = {
-                send: true,
-                type: this.type,
-                val: this.speed
-            };
-
-            if (this.operation == OperationEvent.Section.setSpeed.menu.operation) {
-                /** 区段设置限速*/
-                operate.operation = OperationEvent.Section.setSpeed.confirm2.operation;
-            } else if (this.operation == OperationEvent.Section.cancelSpeed.menu.operation) {
-                /** 区段取消限速*/
-                operate.operation = OperationEvent.Section.cancelSpeed.confirm2.operation;
-            } else if (this.operation == OperationEvent.Switch.setSpeed.menu.operation) {
-                /** 道岔设置限速*/
-                operate.operation = OperationEvent.Switch.setSpeed.confirm2.operation;
-            } else if (this.operation == OperationEvent.Switch.cancelSpeed.menu.operation) {
-                /** 道岔取消限速*/
-                operate.operation = OperationEvent.Switch.cancelSpeed.confirm2.operation;
-            }
-
-            this.setMessage('');
-            this.writeRecord({ order: ++this.order, date: now(), context: this.$t('menu.clickSecondConfirm'), result: '' });
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                this.timeCountCommand = -1;
-                this.timeCountConfirm = -1;
-                this.setButtonEnable({ step: -1 });
-                if (valid) {
-                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    this.editRecord({ order: this.order, date: now(), context: this.$t('menu.clickSecondConfirm'), result: this.$t('tip.executionSucceed') });
-                } else {
-                    this.editRecord({ order: this.order, date: now(), context: this.$t('menu.clickSecondConfirm'), result: this.$t('tip.executionFailed') });
-                }
-            }).catch(() => {
-                this.timeCountCommand = -1;
-                this.timeCountConfirm = -1;
-                this.setButtonEnable({ step: -1 });
-                this.editRecord({ order: this.order, date: now(), context: this.$t('menu.clickSecondConfirm'), result: this.$t('tip.executionException') });
-            });
-        },
-        stop() {
-            const operate = {
-                type: this.type
-            };
-
-            if (this.operation == OperationEvent.Section.setSpeed.menu.operation) {
-                /** 区段设置限速*/
-                operate.operation = OperationEvent.Section.setSpeed.stop.operation;
-            } else if (this.operation == OperationEvent.Section.cancelSpeed.menu.operation) {
-                /** 区段取消限速*/
-                operate.operation = OperationEvent.Section.cancelSpeed.stop.operation;
-            } else if (this.operation == OperationEvent.Switch.setSpeed.menu.operation) {
-                /** 道岔设置限速*/
-                operate.operation = OperationEvent.Switch.setSpeed.stop.operation;
-            } else if (this.operation == OperationEvent.Switch.cancelSpeed.menu.operation) {
-                /** 道岔取消限速*/
-                operate.operation = OperationEvent.Switch.cancelSpeed.stop.operation;
-            }
-
-            this.writeRecord({ order: ++this.order, date: now(), context: this.$t('menu.clickSuspend'), result: '' });
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                if (valid) {
-                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    this.setButtonEnable({ step: 0 });
-                    this.editRecord({ order: this.order, date: now(), context: this.$t('menu.clickSuspend'), result: this.$t('tip.executionSucceed') });
-                } else {
-                    this.editRecord({ order: this.order, date: now(), context: this.$t('menu.clickSuspend'), result: this.$t('tip.executionFailed') });
-                }
-            }).catch(() => {
-                this.editRecord({ order: this.order, date: now(), context: this.$t('menu.clickSuspend'), result: this.$t('tip.executionException') });
-            });
-        },
-        close() {
-            const operate = {
-                type: this.type,
-                operation: OperationEvent.Command.close.menu.operation
-            };
-            this.writeRecord({ order: ++this.order, date: now(), context: this.$t('menu.clickToClose'), result: '' });
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                if (valid) {
-                    this.doClose();
-                }
-            }).catch(() => {
-                this.doClose();
-            });
-        },
-        getOperate(operate) {
-            if (operate.step) {
-                this.setButtonEnable({ step: operate.step });
-            }
-        },
-        setButtonEnable(param) {
-            this.cmdDisabled = [true, true, true];
-            if (param && param.step >= 0) {
-                this.cmdDisabled[param.step] = false;
-            }
-        },
-        setMessage(message) {
-            this.message = message;
-        },
-        writeRecord(param) {
-            this.tableData.push(param);
-        },
-        editRecord(param) {
-            this.tableData.forEach(elem => {
-                if (elem.order == param.order) {
-                    for (var prop in param) {
-                        elem[prop] = param[prop];
-                    }
-                }
-            });
-        }
-    }
-};
-</script>
diff --git a/src/jmap/theme/fuzhou_01/menus/dialog/standBackStrategy.vue b/src/jmap/theme/fuzhou_01/menus/dialog/standBackStrategy.vue
deleted file mode 100644
index e1f941d26..000000000
--- a/src/jmap/theme/fuzhou_01/menus/dialog/standBackStrategy.vue
+++ /dev/null
@@ -1,251 +0,0 @@
-<template>
-  <el-dialog
-    v-dialogDrag
-    class="fuzhou-01__systerm stand-run-level"
-    :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="10"><span>{{ $t('menu.stationName') }}</span></el-col>
-      <el-col :span="10" :offset="2"><span>{{ $t('menu.stationStandStatus') }}</span></el-col>
-    </el-row>
-    <el-row>
-      <el-col :span="10">
-        <el-input v-model="stationName" size="small" disabled />
-      </el-col>
-      <el-col :span="10" :offset="2">
-        <div style="height: 32px;">
-          <el-radio
-            v-model="standStatus"
-            label="02"
-            style="line-height: 32px;"
-            :style="{color: standStatus == '02' ? '' : 'red'}"
-            disabled
-          >{{ $t('menu.upDirection') }}</el-radio>
-          <el-radio
-            v-model="standStatus"
-            label="01"
-            style="line-height: 32px;"
-            :style="{color: standStatus == '01' ? '' : 'red'}"
-            disabled
-          >{{ $t('menu.downDirection') }}</el-radio>
-        </div>
-      </el-col>
-    </el-row>
-    <div class="table">
-      <span>{{ $t('menu.stationStandStatus') }}</span>
-      <el-table ref="tempData" :data="tempData" border style="width: 100%; height: 170px;" size="mini">
-        <el-table-column prop="name" :width="170" :label="this.$t('menu.switchbackStation')" />
-        <el-table-column prop="station" :label="this.$t('menu.switchbackPlatform')" />
-        <el-table-column prop="strategy" :label="this.$t('menu.switchbackStrategy')">
-          <template slot-scope="scope">
-            <el-select
-              :id="domIdChoose"
-              v-model="scope.row.strategy"
-              size="mini"
-              @change="strategySelectChange"
-            >
-              <el-option
-                v-for="item in strategyList"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
-              />
-            </el-select>
-          </template>
-        </el-table-column>
-      </el-table>
-    </div>
-    <el-row class="button-group">
-      <span v-if="isSelect && tempData.length">{{ $t('menu.switchbackStrategyTip') }}</span>
-      <span v-if="isConfirm && tempData.length">{{ $t('menu.setSwitchbackStrategyTipPrefix') + tempData[0].name + $t('menu.setSwitchbackStrategyTipSuffix') }}</span>
-    </el-row>
-    <el-row justify="center" class="button-group">
-      <el-col :span="10" :offset="2">
-        <el-button :id="domIdConfirm" type="primary" :loading="loading" :disabled="!isConfirm" @click="commit">
-          {{ $t('global.confirm') }}</el-button>
-      </el-col>
-      <el-col :span="8" :offset="4">
-        <el-button :id="domIdCancel" @click="cancel">{{ $t('global.cancel') }}</el-button>
-      </el-col>
-    </el-row>
-    <confirm-control ref="confirmControl" />
-    <notice-info ref="noticeInfo" />
-  </el-dialog>
-</template>
-
-<script>
-import ConfirmControl from './childDialog/confirmControl';
-import NoticeInfo from './childDialog/childDialog/noticeInfo';
-import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
-import { mapGetters } from 'vuex';
-
-export default {
-    name: 'StandBackStrategy',
-    components: {
-        ConfirmControl,
-        NoticeInfo
-    },
-    data() {
-        return {
-            dialogShow: false,
-            loading: false,
-            tempData: [],
-            strategyList: [
-                {
-                    value: '01',
-                    label: this.$t('menu.noSwitchback')
-                },
-                {
-                    value: '02',
-                    label: this.$t('menu.noOneSwitchback')
-                },
-                {
-                    value: '03',
-                    label: this.$t('menu.automaticChange')
-                },
-                {
-                    value: '04',
-                    label: this.$t('menu.default')
-                }
-            ],
-            stationName: '',
-            standStatus: '',
-            selection: [],
-            isSelect: true,
-            isConfirm: false,
-            strategy: ''
-        };
-    },
-    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.StationStand.setBackStrategy.menu.domId : '';
-        },
-        domIdChoose() {
-            return this.dialogShow ? OperationEvent.StationStand.setBackStrategy.choose.domId : '';
-        },
-        title() {
-            return this.$t('menu.setSwitchbackStrategy');
-        }
-    },
-    mounted() {
-        this.$nextTick(() => {
-            this.$store.dispatch('training/tipReload');
-        });
-    },
-    methods: {
-        loadInitData(selected, opts) {
-            this.tempData = [];
-            const station = this.stationList.find(n => n.code == selected.stationCode);
-            this.tempData.push({ name: station.name, station: selected.name, strategy: opts.reentryStrategy });
-        },
-        doShow(operate, selected, opts) {
-            if (!this.dialogShow) {
-                this.standStatus = '';
-                this.stationName = '';
-                if (selected && selected._type.toUpperCase() === 'StationStand'.toUpperCase()) {
-                    this.standStatus = selected.direction;
-                    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');
-            });
-        },
-        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.selection = selection;
-            }
-        },
-        strategySelectChange(strategy) {
-            const operate = {
-                type: MapDeviceType.StationStand.type,
-                operation: OperationEvent.StationStand.setBackStrategy.choose.operation,
-                val: `${strategy}`
-            };
-
-            this.strategy = strategy;
-            this.isSelect = false;
-            this.isConfirm = true;
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                if (valid) {
-                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                }
-            });
-        },
-        doClose() {
-            this.loading = false;
-            this.dialogShow = false;
-            this.$store.dispatch('training/emitTipFresh');
-        },
-        commit() {
-            if (this.isConfirm) {
-                const operate = {
-                    send: true,
-                    type: MapDeviceType.StationStand.type,
-                    operation: OperationEvent.StationStand.setBackStrategy.menu.operation,
-                    val: `${this.strategy}`
-                };
-
-                this.loading = true;
-                this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                    this.loading = false;
-                    if (valid) {
-                        this.doClose();
-                    }
-                }).catch(() => {
-                    this.loading = false;
-                    this.doClose();
-                    this.$refs.noticeInfo.doShow(operate);
-                });
-            } else {
-                this.doClose();
-            }
-        },
-        cancel() {
-            const operate = {
-                type: MapDeviceType.StationStand.type,
-                operation: OperationEvent.Command.cancel.menu.operation
-            };
-
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                if (valid) {
-                    this.doClose();
-                }
-            }).catch(() => {
-                this.doClose();
-            });
-        }
-    }
-};
-</script>
diff --git a/src/jmap/theme/fuzhou_01/menus/dialog/standControl.vue b/src/jmap/theme/fuzhou_01/menus/dialog/standControl.vue
deleted file mode 100644
index e98e938f1..000000000
--- a/src/jmap/theme/fuzhou_01/menus/dialog/standControl.vue
+++ /dev/null
@@ -1,270 +0,0 @@
-<template>
-  <el-dialog
-    v-dialogDrag
-    class="fuzhou-01__systerm stand-detain-train"
-    :title="title"
-    :visible.sync="show"
-    width="320px"
-    :before-close="doClose"
-    :z-index="2000"
-    :modal="false"
-    :close-on-click-modal="false"
-  >
-    <div class="context">
-      <span>{{ preContext }}{{ standName }}</span>
-    </div>
-    <el-row class="button-group">
-      <el-col :span="10" :offset="2">
-        <el-button :id="domIdConfirm" type="primary" :loading="loading" @click="commit">{{ $t('global.confirm') }}</el-button>
-      </el-col>
-      <el-col :span="8" :offset="4">
-        <el-button :id="domIdCancel" @click="cancel">{{ $t('global.cancel') }}</el-button>
-      </el-col>
-    </el-row>
-    <notice-info ref="noticeInfo" />
-  </el-dialog>
-</template>
-
-<script>
-import { MapDeviceType, OperationEvent, getDomIdByOperation } from '@/scripts/ConstDic';
-import NoticeInfo from './childDialog/childDialog/noticeInfo';
-
-export default {
-    name: 'StandDetainTrain',
-    components: {
-        NoticeInfo
-    },
-    data() {
-        return {
-            dialogShow: false,
-            loading: false,
-            standName: '',
-            selected: null,
-            operation: null
-        };
-    },
-    computed: {
-        show() {
-            return this.dialogShow && !this.$store.state.menuOperation.break;
-        },
-        domIdCancel() {
-            return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
-        },
-        domIdConfirm() {
-            return this.dialogShow ? getDomIdByOperation(this.operation) : '';
-        },
-        title() {
-            if (this.operation == OperationEvent.StationStand.setDetainTrain.menu.operation) {
-                return this.$t('menu.menuStationStand.detainTrain');
-            } else if (this.operation == OperationEvent.StationStand.cancelDetainTrain.menu.operation) {
-                return this.$t('menu.menuStationStand.cancelDetainTrain');
-            } else if (this.operation == OperationEvent.StationStand.cancelDetainTrainForce.menu.operation) {
-                return this.$t('menu.menuStationStand.cancelDetainTrainForce');
-            } else if (this.operation == OperationEvent.StationStand.earlyDeparture.menu.operation) {
-                return this.$t('menu.menuStationStand.earlyDeparture');
-            } else if (this.operation == OperationEvent.StationStand.setJumpStop.menu.operation) {
-                return this.$t('menu.menuStationStand.setJumpStop');
-            } else if (this.operation == OperationEvent.StationStand.cancelJumpStop.menu.operation) {
-                return this.$t('menu.menuStationStand.cancelJumpStop');
-            }
-            return '';
-        },
-        preContext() {
-            return this.title + ':';
-        }
-    },
-    mounted() {
-        this.$nextTick(() => {
-            this.$store.dispatch('training/tipReload');
-        });
-    },
-    methods: {
-        doShow(operate, selected) {
-            if (!this.dialogShow) {
-                this.standName = '';
-                if (selected) {
-                    this.standName = selected.name;
-                }
-
-                this.selected = selected;
-                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.StationStand.setDetainTrain.menu.operation) {
-                /** 设置扣车*/
-                this.setDetainTrain();
-            } else if (this.operation == OperationEvent.StationStand.cancelDetainTrain.menu.operation) {
-                /** 取消扣车*/
-                this.cancelDetainTrain();
-            } else if (this.operation == OperationEvent.StationStand.cancelDetainTrainForce.menu.operation) {
-                /** 强制取消扣车*/
-                this.cancelDetainTrainForce();
-            } else if (this.operation == OperationEvent.StationStand.earlyDeparture.menu.operation) {
-                /** 提前发车*/
-                this.earlyDeparture();
-            } else if (this.operation == OperationEvent.StationStand.setJumpStop.menu.operation) {
-                /** 设置跳停*/
-                this.setJumpStop();
-            } else if (this.operation == OperationEvent.StationStand.cancelJumpStop.menu.operation) {
-                /** 取消跳停*/
-                this.cancelJumpStop();
-            }
-        },
-        // 设置扣车
-        setDetainTrain() {
-            const operate = {
-                send: true,
-                type: MapDeviceType.StationStand.type,
-                operation: OperationEvent.StationStand.setDetainTrain.menu.operation
-            };
-
-            this.loading = true;
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                this.loading = false;
-                this.doClose();
-                if (!valid) {
-                    this.$refs.noticeInfo.doShow(operate);
-                }
-            }).catch(() => {
-                this.loading = false;
-                this.doClose();
-                this.$refs.noticeInfo.doShow(operate);
-            });
-        },
-        // 取消扣车
-        cancelDetainTrain() {
-            const operate = {
-                send: true,
-                type: MapDeviceType.StationStand.type,
-                operation: OperationEvent.StationStand.cancelDetainTrain.menu.operation
-            };
-
-            this.loading = true;
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                this.loading = false;
-                this.doClose();
-                if (!valid) {
-                    this.$refs.noticeInfo.doShow(operate);
-                }
-            }).catch(() => {
-                this.loading = false;
-                this.doClose();
-                this.$refs.noticeInfo.doShow(operate);
-            });
-        },
-        // 强制取消扣车
-        cancelDetainTrainForce() {
-            const operate = {
-                send: true,
-                type: MapDeviceType.StationStand.type,
-                operation: OperationEvent.StationStand.cancelDetainTrainForce.menu.operation
-            };
-
-            this.loading = true;
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                this.loading = false;
-                this.doClose();
-                if (!valid) {
-                    this.$refs.noticeInfo.doShow(operate);
-                }
-            }).catch(() => {
-                this.loading = false;
-                this.doClose();
-                this.$refs.noticeInfo.doShow(operate);
-            });
-        },
-        // 提前发车
-        earlyDeparture() {
-            const operate = {
-                send: true,
-                type: MapDeviceType.StationStand.type,
-                operation: OperationEvent.StationStand.earlyDeparture.menu.operation
-            };
-
-            this.loading = true;
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                this.loading = false;
-                if (valid) {
-                    this.doClose();
-                }
-            }).catch(() => {
-                this.loading = false;
-                this.doClose();
-                this.$refs.noticeInfo.doShow(operate);
-            });
-        },
-        // 设置跳停
-        setJumpStop() {
-            const operate = {
-                send: true,
-                type: MapDeviceType.StationStand.type,
-                operation: OperationEvent.StationStand.setJumpStop.menu.operation,
-                val: this.selected.direction // 站台的上下行方向, 01:下行 /02:上行
-            };
-
-            this.loading = true;
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                this.loading = false;
-                if (valid) {
-                    this.doClose();
-                }
-            }).catch(() => {
-                this.loading = false;
-                this.doClose();
-                this.$refs.noticeInfo.doShow(operate);
-            });
-        },
-        // 取消跳停
-        cancelJumpStop() {
-            const operate = {
-                send: true,
-                type: MapDeviceType.StationStand.type,
-                operation: OperationEvent.StationStand.cancelJumpStop.menu.operation,
-                val: this.selected.direction // 站台的上下行方向, 01:下行 /02:上行
-            };
-
-            this.loading = true;
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                this.loading = false;
-                if (valid) {
-                    this.doClose();
-                }
-            }).catch(() => {
-                this.loading = false;
-                this.doClose();
-                this.$refs.noticeInfo.doShow(operate);
-            });
-        },
-        cancel() {
-            const operate = {
-                type: MapDeviceType.StationStand.type,
-                operation: OperationEvent.Command.cancel.menu.operation
-            };
-
-            this.loading = false;
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                if (valid) {
-                    this.doClose();
-                }
-            }).catch(() => {
-                this.doClose();
-            });
-        }
-    }
-};
-</script>
-<style>
-    .stand-detain-train .context {
-        height: 80px !important;
-    }
-</style>
diff --git a/src/jmap/theme/fuzhou_01/menus/dialog/standDetail.vue b/src/jmap/theme/fuzhou_01/menus/dialog/standDetail.vue
deleted file mode 100644
index 04a74f495..000000000
--- a/src/jmap/theme/fuzhou_01/menus/dialog/standDetail.vue
+++ /dev/null
@@ -1,179 +0,0 @@
-<template>
-  <el-dialog
-    v-dialogDrag
-    class="fuzhou-01__systerm stand-detail"
-    :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="10"><span>{{ $t('menu.stationName') }}</span></el-col>
-      <el-col :span="10" :offset="2"><span>{{ $t('menu.platform') }}</span></el-col>
-    </el-row>
-    <el-row>
-      <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" size="small" disabled />
-      </el-col>
-    </el-row>
-    <div class="table">
-      <span>{{ $t('menu.stationStandStatus') }}</span>
-      <el-table ref="tempData" :data="tempData" border style="width: 100%" size="mini" highlight-current-row>
-        <el-table-column prop="item" :width="140" :label="this.$t('menu.item')" />
-        <el-table-column prop="status" :label="this.$t('global.status')" />
-      </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">{{ $t('global.confirm') }}</el-button>
-      </el-col>
-      <el-col :span="8" :offset="4">
-        <el-button :id="domIdCancel" @click="cancel">{{ $t('global.cancel') }}</el-button>
-      </el-col>
-    </el-row>
-    <notice-info ref="noticeInfo" />
-  </el-dialog>
-</template>
-
-<script>
-import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
-import NoticeInfo from './childDialog/childDialog/noticeInfo';
-import { mapGetters } from 'vuex';
-
-export default {
-    name: 'StandDetail',
-    components: {
-        NoticeInfo
-    },
-    data() {
-        return {
-            dialogShow: false,
-            loading: false,
-            tempData: [],
-            stationName: '',
-            standName: '',
-            strategyMap: {
-                '01': this.$t('menu.noSwitchback'),
-                '02': this.$t('menu.noOneSwitchback'),
-                '03': this.$t('menu.automaticChange'),
-                '04': this.$t('menu.default')
-            }
-        };
-    },
-    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.Command.close.confirm.domId : '';
-        },
-        title() {
-            return this.$t('menu.menuStationStand.getStationStandStatus');
-        }
-    },
-    mounted() {
-        this.$nextTick(() => {
-            this.$store.dispatch('training/tipReload');
-        });
-    },
-    methods: {
-        loadInitData(selected, opts) {
-            this.tempData = [];
-
-            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);
-                }
-            }
-
-            /** 01: 未设置扣车 02: 车站扣车 03: 中心扣车 04: 中心+车站扣车*/
-            this.tempData.push({ item: this.$t('menu.stationDetainTrain'), status: opts.holdStatus == '02' || opts.holdStatus == '04' ? this.$t('menu.hasBeenSet') : this.$t('menu.notSet') });
-            this.tempData.push({ item: this.$t('menu.centerDetainTrain'), status: opts.holdStatus == '03' || opts.holdStatus == '04' ? this.$t('menu.hasBeenSet') : this.$t('menu.notSet') });
-            this.tempData.push({ item: this.$t('menu.stopTime'), status: opts.parkingTime != -1 ? opts.parkingTime : this.$t('menu.automatic2') });
-            if (!stationStand || !station) {
-                this.tempData.push({ item: this.$t('menu.runLevel'), status: this.$t('menu.automatic2') });
-            } else {
-                this.tempData.push({ item: this.$t('menu.runLevel'), status: opts.intervalRunTime > 0 ? this.$t('menu.to') + station.name + stationStand.name + this.$t('global.colon') + this.$t('menu.artificial') : this.$t('menu.to') + station.name + stationStand.name + this.$t('menu.automatic2') });
-            }
-            this.tempData.push({ item: this.$t('menu.jumpStop'), status: opts.jumpStopStatus != '01' ? this.$t('menu.hasBeenSet') : this.$t('menu.notSet') });
-            this.tempData.push({ item: this.$t('menu.downSwitchbackStrategy'), status: this.strategyMap[opts.reentryStrategy] ? this.strategyMap[opts.reentryStrategy] : this.$t('menu.default') });
-        },
-        doShow(operate, selected, opts) {
-            if (!this.dialogShow) {
-                this.standName = '';
-                this.stationName = '';
-                if (selected && selected._type.toUpperCase() === 'StationStand'.toUpperCase()) {
-                    this.standName = selected.name;
-                    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 = {
-                type: MapDeviceType.StationStand.type,
-                operation: OperationEvent.Command.close.confirm.operation
-            };
-
-            this.loading = true;
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                this.loading = false;
-                if (valid) {
-                    this.doClose();
-                }
-            }).catch(() => {
-                this.loading = false;
-                this.doClose();
-            });
-        },
-        cancel() {
-            const operate = {
-                type: MapDeviceType.StationStand.type,
-                operation: OperationEvent.Command.cancel.menu.operation
-            };
-
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                if (valid) {
-                    this.doClose();
-                }
-            }).catch(() => {
-                this.doClose();
-            });
-        }
-    }
-};
-</script>
diff --git a/src/jmap/theme/fuzhou_01/menus/dialog/standDetainTrainAll.vue b/src/jmap/theme/fuzhou_01/menus/dialog/standDetainTrainAll.vue
deleted file mode 100644
index 6bb042531..000000000
--- a/src/jmap/theme/fuzhou_01/menus/dialog/standDetainTrainAll.vue
+++ /dev/null
@@ -1,191 +0,0 @@
-<template>
-  <el-dialog
-    v-dialogDrag
-    class="fuzhou-01__systerm stand-detain-train-all"
-    :title="title"
-    :visible.sync="show"
-    width="390px"
-    :before-close="doClose"
-    :z-index="2000"
-    :modal="false"
-    :close-on-click-modal="false"
-  >
-    <el-radio-group style="padding: 10px 20px; border: 1px double lightgray;width:100%;">
-      <span class="base-label" style="font-size:14px;">{{ $t('menu.range') }}</span>
-      <el-row>
-        <el-radio-group v-model="upDown" style="width:100%;" @change="choose">
-          <el-col :span="11">
-            <el-radio :id="upDown == '01' ? domIdChoose : ''" label="02">{{ $t('menu.uplinkBroadly') }}</el-radio>
-          </el-col>
-          <el-col :span="11" :offset="1">
-            <el-radio :id="upDown == '02' ? domIdChoose : ''" label="01">{{ $t('menu.downlinkBroadly') }}</el-radio>
-          </el-col>
-        </el-radio-group>
-      </el-row>
-    </el-radio-group>
-
-    <div class="table">
-      <span>{{ $t('menu.detainTrainStationList') }}</span>
-      <el-table
-        ref="tempData"
-        :data="tempData"
-        border
-        style="width: 100%"
-        size="mini"
-        :empty-text="this.$t('menu.allStationsHaveNoDetainTrainStatus')"
-        height="160"
-        highlight-current-row
-      >
-        <el-table-column prop="stationName" :label="this.$t('menu.stationName')" />
-        <el-table-column prop="standName" :width="140" :label="this.$t('menu.detainTrainStation')" />
-      </el-table>
-    </div>
-    <el-row justify="center" class="button-group">
-      <el-col :span="10" :offset="2">
-        <el-button :id="domIdConfirm" type="primary" :loading="loading" :disabled="disabled" @click="commit">{{ $t('global.confirm') }}
-        </el-button>
-      </el-col>
-      <el-col :span="8" :offset="4">
-        <el-button :id="domIdCancel" @click="cancel">{{ $t('global.cancel') }}</el-button>
-      </el-col>
-    </el-row>
-    <notice-info ref="noticeInfo" />
-  </el-dialog>
-</template>
-
-<script>
-import { mapGetters } from 'vuex';
-import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
-import NoticeInfo from './childDialog/childDialog/noticeInfo';
-
-export default {
-    name: 'StandDetainTrainAll',
-    components: {
-        NoticeInfo
-    },
-    data() {
-        return {
-            dialogShow: false,
-            loading: false,
-            upDown: '01',
-            tempData: [],
-            disabled: true,
-            operation: ''
-        };
-    },
-    computed: {
-        ...mapGetters('map', [
-            'stationStandList'
-        ]),
-        show() {
-            return this.dialogShow && !this.$store.state.menuOperation.break;
-        },
-        domIdCancel() {
-            return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
-        },
-        domIdChoose() {
-            return this.dialogShow ? OperationEvent.StationStand.cancelDetainTrainAll.choose.domId : '';
-        },
-        domIdConfirm() {
-            return this.dialogShow ? OperationEvent.StationStand.cancelDetainTrainAll.menu.domId : '';
-        },
-        title() {
-            if (this.operation == OperationEvent.StationStand.cancelDetainTrainAll.menu.operation) {
-                return this.$t('menu.menuStationStand.cancelDetainTrainAll');
-            } else {
-                return this.$t('menu.menuStationStand.cancelJumpStopAll');
-            }
-        }
-    },
-    mounted() {
-        this.$nextTick(() => {
-            this.$store.dispatch('training/tipReload');
-        });
-    },
-    methods: {
-        loadTableData() {
-            this.tempData = [];
-            this.stationStandList.forEach(elem => {
-                /** status 01: 未扣车*/
-                const stand = (this.$store.getters['map/getDeviceByCode'](elem.code) || {}).status;
-                const station = (this.$store.getters['map/getDeviceByCode'](elem.stationCode) || {});
-                if (station && stand && stand.holdStatus != '01' && Number(elem.direction) == Number(this.upDown)) {
-                    this.tempData.push({ stationName: station.name, standName: elem.name });
-                }
-            });
-
-            // 如果存在未扣车的情况，才可以做此操作
-            if (this.tempData.length > 0) {
-                this.disabled = false;
-            }
-        },
-        doShow(operate, selected) {
-            // 不是断点激活的菜单应该将状态初始化
-            if (!this.dialogShow) {
-                this.loading = false;
-                this.upDown = selected.direction;
-                this.loadTableData();
-                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');
-        },
-        choose(upDown) {
-            // 重新设置扣车站台
-            this.loadTableData();
-            const operate = {
-                type: MapDeviceType.StationStand.type,
-                operation: OperationEvent.StationStand.cancelDetainTrainAll.choose.operation,
-                val: `${upDown}`
-            };
-
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                if (valid) {
-                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                }
-            });
-        },
-        commit() {
-            const operate = {
-                send: true,
-                type: MapDeviceType.StationStand.type,
-                operation: OperationEvent.StationStand.cancelDetainTrainAll.menu.operation,
-                val: this.upDown
-            };
-
-            this.loading = true;
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                this.loading = false;
-                if (valid) {
-                    this.doClose();
-                }
-            }).catch(() => {
-                this.loading = false;
-                this.doClose();
-                this.$refs.noticeInfo.doShow(operate);
-            });
-        },
-        cancel() {
-            const operate = {
-                type: MapDeviceType.StationStand.type,
-                operation: OperationEvent.Command.cancel.menu.operation
-            };
-
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                if (valid) {
-                    this.doClose();
-                }
-            }).catch(() => {
-                this.doClose();
-            });
-        }
-    }
-};
-</script>
diff --git a/src/jmap/theme/fuzhou_01/menus/dialog/standRunLevel.vue b/src/jmap/theme/fuzhou_01/menus/dialog/standRunLevel.vue
deleted file mode 100644
index e0d40525b..000000000
--- a/src/jmap/theme/fuzhou_01/menus/dialog/standRunLevel.vue
+++ /dev/null
@@ -1,269 +0,0 @@
-<template>
-  <el-dialog
-    v-dialogDrag
-    class="fuzhou-01__systerm stand-run-level"
-    :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="10"><span>{{ $t('menu.stationName') }}</span></el-col>
-      <el-col :span="10" :offset="2"><span>{{ $t('menu.platform') }}</span></el-col>
-    </el-row>
-    <el-row>
-      <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" size="small" disabled />
-      </el-col>
-    </el-row>
-    <div class="table">
-      <span>{{ $t('menu.stationStandStatus') }}</span>
-      <el-table ref="tempData" :data="tempData" border style="width: 100%; height: 170px;" size="mini">
-        <el-table-column prop="name" :width="210" :label="this.$t('menu.nextPlatform')" />
-        <el-table-column prop="time" :label="this.$t('menu.intervalRunningTime')">
-          <template slot-scope="scope">
-            <el-select :id="domIdChoose" v-model="scope.row.time" size="mini" @change="timeSelectChange">
-              <el-option
-                v-for="item in timeList"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
-              />
-            </el-select>
-          </template>
-        </el-table-column>
-        <el-table-column prop="check" :label="this.$t('menu.alwaysEffective')">
-          <template slot-scope="scope">
-            <el-checkbox :id="domIdCheck" ref="check" v-model="scope.row.check" @change="checkChange" />
-          </template>
-        </el-table-column>
-      </el-table>
-    </div>
-    <el-row class="button-group">
-      <span v-if="isSelect && tempData.length">{{ $t('menu.setRunLevelTip') }}</span>
-      <span v-if="isConfirm && tempData.length">{{ $t('menu.setRunLevelStationTip') + tempData[0].name }}</span>
-    </el-row>
-    <el-row justify="center" class="button-group">
-      <el-col :span="10" :offset="2">
-        <el-button :id="domIdConfirm" type="primary" :loading="loading" :disabled="!isConfirm" @click="commit">
-          {{ $t('global.confirm') }}</el-button>
-      </el-col>
-      <el-col :span="8" :offset="4">
-        <el-button :id="domIdCancel" @click="cancel">{{ $t('global.cancel') }}</el-button>
-      </el-col>
-    </el-row>
-    <confirm-control ref="confirmControl" />
-  </el-dialog>
-</template>
-
-<script>
-import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
-import ConfirmControl from './childDialog/confirmControl';
-import { mapGetters } from 'vuex';
-
-export default {
-    name: 'StandRunLevel',
-    components: {
-        ConfirmControl
-    },
-    data() {
-        return {
-            dialogShow: false,
-            loading: false,
-            tempData: [],
-            maxRunLevel: 300,
-            stationName: '',
-            standName: '',
-            selection: [],
-            isSelect: true,
-            isConfirm: false,
-            time: ''
-        };
-    },
-    watch: {
-        // 深度数据状态
-        tempData: {
-            handler(val, oldVal) {
-                this.checkTableDataSelction(val);
-            },
-            deep: true
-        }
-    },
-    computed: {
-        ...mapGetters('map', [
-            'stationList',
-            'stationStandList'
-        ]),
-        show() {
-            return this.dialogShow && !this.$store.state.menuOperation.break;
-        },
-        domIdCancel() {
-            return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
-        },
-        domIdConfirm() {
-            return this.dialogShow ? OperationEvent.StationStand.setRunLevel.menu.domId : '';
-        },
-        domIdChoose() {
-            return this.dialogShow ? OperationEvent.StationStand.setRunLevel.choose.domId : '';
-        },
-        domIdCheck() {
-            return this.dialogShow ? OperationEvent.StationStand.setRunLevel.check.domId : '';
-        },
-        title() {
-            return this.$t('menu.menuStationStand.setRunLevel');
-        },
-        timeList() {
-            const list = [
-                { value: 0, label: this.$t('menu.automatic2') },
-                { value: 1, label: '1' }
-            ];
-            for (var i = 60; i <= this.maxRunLevel; i++) {
-                list.push({ value: i, label: `${i}` });
-            }
-
-            return list;
-        }
-    },
-    mounted() {
-        this.$nextTick(() => {
-            this.$store.dispatch('training/tipReload');
-        });
-    },
-    methods: {
-        loadInitData(selected, opts) {
-            this.tempData = [];
-            const index = this.stationList.findIndex(n => n.code == selected.stationCode);
-            if (selected.direction == '01') { // 下行
-                // 下行时，此站不是最后一站
-                if (index != 0) {
-                    const stationStand = this.$store.getters['map/getDeviceByCode'](this.stationStandList[index + 1].code);
-                    const station = this.$store.getters['map/getDeviceByCode'](stationStand.stationCode);
-                    this.tempData.push({ name: `${stationStand.name}(${station.name})`, time: opts.intervalRunTime ? opts.intervalRunTime : 0, check: opts.intervalRunTimeValidStatus });
-                }
-            } else {
-                // 上行时，此站不是最后一站
-                if (index != this.stationList.length) {
-                    const stationStand = this.$store.getters['map/getDeviceByCode'](this.stationStandList[index + 1].code);
-                    const station = this.$store.getters['map/getDeviceByCode'](stationStand.stationCode);
-                    this.tempData.push({ name: `${stationStand.name}(${station.name})`, time: opts.intervalRunTime ? opts.intervalRunTime : 0, check: opts.intervalRunTimeValidStatus });
-                }
-            }
-        },
-        doShow(operate, selected, opts) {
-            // 如果不是断点激活窗口，而是第一次显示窗口时，需要初始化窗口数据
-            if (!this.dialogShow) {
-                this.standName = '';
-                this.stationName = '';
-                if (selected && selected._type.toUpperCase() === 'StationStand'.toUpperCase()) {
-                    this.standName = selected.name;
-                    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');
-            });
-        },
-        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.selection = selection;
-            }
-        },
-        timeSelectChange(time) {
-            const operate = {
-                type: MapDeviceType.StationStand.type,
-                operation: OperationEvent.StationStand.setRunLevel.choose.operation,
-                val: time.toString()
-            };
-
-            this.time = time.toString();
-            this.isSelect = false;
-            this.isConfirm = true;
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                if (valid) {
-                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                }
-            });
-        },
-        checkChange(check) {
-            const operate = {
-                type: MapDeviceType.StationStand.type,
-                operation: OperationEvent.StationStand.setRunLevel.check.operation,
-                val: check.toString()
-            };
-
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                if (valid) {
-                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                }
-            });
-        },
-        doClose() {
-            this.loading = false;
-            this.dialogShow = false;
-            this.$store.dispatch('training/emitTipFresh');
-        },
-        commit() {
-            if (this.isConfirm) {
-                const forver = !!this.tempData[0].check;
-                const operate = {
-                    type: MapDeviceType.StationStand.type,
-                    operation: OperationEvent.StationStand.setRunLevel.menu.operation,
-                    messages: [`${this.$t('menu.menuStationStand.setRunLevel')}${this.$t('global.colon')}${this.tempData[0].name}-${this.standName},${this.tempData[0].time == 0 ? this.$t('menu.runTimeAutomatically') : `${this.$t('menu.runningTimeIs')}${this.tempData[0].time}s`},${this.$t('menu.effectiveFrequencyIs')}${this.tempData[0].check ? this.$t('menu.alwaysEffective') : this.$t('menu.onceEffective')}`],
-                    val: [this.time, forver].join('::')
-                };
-
-                this.loading = true;
-                this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                    this.loading = false;
-                    if (valid) {
-                        this.doClose();
-                        this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                        this.$refs.confirmControl.doShow(operate);
-                    }
-                }).catch(() => {
-                    this.loading = false;
-                    this.doClose();
-                });
-            } else {
-                this.doClose();
-            }
-        },
-        cancel() {
-            const operate = {
-                type: MapDeviceType.StationStand.type,
-                operation: OperationEvent.Command.cancel.menu.operation
-            };
-
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                if (valid) {
-                    this.doClose();
-                }
-            }).catch(() => {
-                this.doClose();
-            });
-        }
-    }
-};
-</script>
diff --git a/src/jmap/theme/fuzhou_01/menus/dialog/standStopTime.vue b/src/jmap/theme/fuzhou_01/menus/dialog/standStopTime.vue
deleted file mode 100644
index 9ade50cee..000000000
--- a/src/jmap/theme/fuzhou_01/menus/dialog/standStopTime.vue
+++ /dev/null
@@ -1,255 +0,0 @@
-<template>
-  <el-dialog
-    v-dialogDrag
-    class="fuzhou-01__systerm stand-stop-time"
-    :title="title"
-    :visible.sync="show"
-    width="430px"
-    :before-close="doClose"
-    :z-index="2000"
-    :modal="false"
-    :close-on-click-modal="false"
-  >
-    <el-row class="header">
-      <el-col :span="11"><span>{{ $t('menu.stationName') }}</span></el-col>
-      <el-col :span="11" :offset="2"><span>{{ $t('menu.platformName') }}</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="standName" size="small" disabled />
-      </el-col>
-    </el-row>
-    <div style="padding: 10px 15px; border: 1px double lightgray; margin: 20px 0px; height: 60px;">
-      <span class="base-label">{{ $t('menu.controlMode') }}</span>
-      <div style=" position: relative; top:-10px;">
-        <el-radio-group v-model="control" @change="chooseControl">
-          <el-radio :id="control === '01'? '': domIdChoose1" label="01">{{ $t('menu.automatic2') }}</el-radio>
-          <el-radio :id="control === '02'? '': domIdChoose1" label="02">{{ $t('menu.artificial') }}</el-radio>
-        </el-radio-group>
-        <el-input-number
-          :id="domIdInput"
-          v-model="time"
-          :disabled="disabledInput"
-          controls-position="right"
-          :min="0"
-          size="mini"
-          style="width: 125px; padding-left:25px"
-          @change="inputTime"
-        /><span>&nbsp;{{ $t('global.second') }}</span>
-      </div>
-    </div>
-    <div style="padding: 0px 15px;  height: 30px;">
-      <div style=" position: relative; top:-5px;">
-        <el-radio-group v-model="direction">
-          <el-radio label="02" :disabled="disabledUp">{{ $t('menu.upDirection') }}</el-radio>
-          <el-radio label="01" :disabled="disabledDown">{{ $t('menu.downDirection') }}</el-radio>
-        </el-radio-group>
-      </div>
-    </div>
-    <div style="padding: 10px 15px; border: 1px double lightgray;  height: 60px;">
-      <span class="base-label">{{ $t('menu.effectiveNumber') }}</span>
-      <div style=" position: relative; top:-10px;">
-        <el-radio-group v-model="effective" :disabled="disabledTime" @change="chooseEffective">
-          <el-radio :id="effective === false? '': domIdChoose2" :label="false">{{ $t('menu.onceEffective') }}</el-radio>
-          <el-radio :id="effective === true? '': domIdChoose2" :label="true">{{ $t('menu.alwaysEffective') }}</el-radio>
-        </el-radio-group>
-      </div>
-    </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('global.confirm') }}</el-button>
-      </el-col>
-      <el-col :span="8" :offset="4">
-        <el-button :id="domIdCancel" @click="cancel">{{ $t('global.cancel') }}</el-button>
-      </el-col>
-    </el-row>
-    <confirm-control ref="confirmControl" />
-    <notice-info ref="noticeInfo" />
-  </el-dialog>
-</template>
-
-<script>
-import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
-import ConfirmControl from './childDialog/confirmControl';
-import NoticeInfo from './childDialog/childDialog/noticeInfo';
-
-export default {
-    name: 'StandStopTime',
-    components: {
-        ConfirmControl,
-        NoticeInfo
-    },
-    data() {
-        return {
-            dialogShow: false,
-            loading: false,
-            time: 0,
-            control: '01',
-            direction: '01',
-            effective: false,
-            selected: null,
-            standName: '',
-            stationName: ''
-        };
-    },
-    computed: {
-        show() {
-            return this.dialogShow && !this.$store.state.menuOperation.break;
-        },
-        domIdCancel() {
-            return this.dialogShow ? OperationEvent.Command.close.menu.domId : '';
-        },
-        domIdConfirm() {
-            return this.dialogShow ? OperationEvent.StationStand.setStopTime.menu.domId : '';
-        },
-        domIdChoose1() {
-            return this.dialogShow ? OperationEvent.StationStand.setStopTime.choose1.domId : '';
-        },
-        domIdChoose2() {
-            return this.dialogShow ? OperationEvent.StationStand.setStopTime.choose2.domId : '';
-        },
-        domIdInput() {
-            return this.dialogShow ? OperationEvent.StationStand.setStopTime.input.domId : '';
-        },
-        disabledUp() {
-            if (this.selected) {
-                return this.selected.direction !== '02';
-            }
-            return true;
-        },
-        disabledDown() {
-            if (this.selected) {
-                return this.selected.direction !== '01';
-            }
-            return true;
-        },
-        disabledInput() {
-            return this.control === '01'; // 如果是自动则不可以设置
-        },
-        disabledTime() {
-            return this.control === '01'; // 如果是自动则不可以设置
-        },
-        title() {
-            return this.$t('menu.stopTime');
-        }
-    },
-    mounted() {
-        this.$nextTick(() => {
-            this.$store.dispatch('training/tipReload');
-        });
-    },
-    methods: {
-        doShow(operate, selected, tempDate) {
-            // 如果不是断点激活，则需要对初始值进行初始化
-            if (!this.dialogShow) {
-                this.standName = '';
-                this.stationName = '';
-                if (selected && selected._type.toUpperCase() === 'StationStand'.toUpperCase()) {
-                    this.standName = selected.name;
-                    const station = this.$store.getters['map/getDeviceByCode'](selected.stationCode);
-                    if (station) {
-                        this.stationName = station.name;
-                    }
-                }
-
-                this.control = Number(tempDate.parkingTime) === -1 ? '01' : '02';
-                this.time = Number(tempDate.parkingTime) === -1 ? 15 : Number(tempDate.parkingTime);
-                this.effective = !!tempDate.parkingValidStatus;
-                this.direction = selected.direction;
-                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');
-        },
-        chooseControl(control) {
-            /** 自动时的默认时间*/
-            if (control == '01') {
-                this.inputTime = 15;
-                this.effective = true;
-            }
-
-            const operate = {
-                type: MapDeviceType.StationStand.type,
-                operation: OperationEvent.StationStand.setStopTime.choose1.operation,
-                val: `${control}`
-            };
-
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                if (valid) {
-                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                }
-            });
-        },
-        chooseEffective(effective) {
-            const operate = {
-                type: MapDeviceType.StationStand.type,
-                operation: OperationEvent.StationStand.setStopTime.choose2.operation,
-                val: `${effective}`
-            };
-
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                if (valid) {
-                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                }
-            });
-        },
-        inputTime(time) {
-            const operate = {
-                repeat: true,
-                type: MapDeviceType.StationStand.type,
-                operation: OperationEvent.StationStand.setStopTime.input.operation,
-                val: `${time}`
-            };
-
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                if (valid) {
-                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                }
-            });
-        },
-        commit() {
-            const operate = {
-                type: MapDeviceType.StationStand.type,
-                operation: OperationEvent.StationStand.setStopTime.menu.operation,
-                val: [`${this.control}`, this.time, this.effective].join('::'),
-                messages: [`${this.$t('menu.stopTime') + this.$t('global.colon') + this.stationName} - ${this.standName}, ${this.$t('menu.stopTimeIs')}${this.control == '01' ? this.$t('menu.automatic2') : this.time + this.$t('global.second')}, ${this.$t('menu.effectiveFrequencyIs')}${this.effective == false ? this.$t('menu.alwaysEffective') : this.$t('menu.onceEffective')}`]
-            };
-
-            this.loading = true;
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                this.loading = false;
-                if (valid) {
-                    this.doClose();
-                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    this.$refs.confirmControl.doShow(operate);
-                }
-            }).catch(() => {
-                this.loading = false;
-                this.doClose();
-            });
-        },
-        cancel() {
-            const operate = {
-                type: MapDeviceType.StationStand.type,
-                operation: OperationEvent.Command.close.menu.operation
-            };
-
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                if (valid) {
-                    this.doClose();
-                }
-            }).catch(() => { this.doClose(); });
-        }
-    }
-};
-</script>
diff --git a/src/jmap/theme/fuzhou_01/menus/dialog/stationCmdControl.vue b/src/jmap/theme/fuzhou_01/menus/dialog/stationCmdControl.vue
deleted file mode 100644
index 49224d1fa..000000000
--- a/src/jmap/theme/fuzhou_01/menus/dialog/stationCmdControl.vue
+++ /dev/null
@@ -1,409 +0,0 @@
-<template>
-  <div>
-    <el-dialog
-      v-dialogDrag
-      class="fuzhou-01__systerm station-cmd-control"
-      :title="title"
-      :visible.sync="show"
-      width="840px"
-      :before-close="doClose"
-      :z-index="2000"
-      :modal="false"
-      :close-on-click-modal="false"
-    >
-      <div style="padding: 10px 20px; border: 1px solid lightgray;">
-        <span class="base-label">{{ $t('menu.commandInformation') }}</span>
-        <el-form label-position="center" size="mini">
-          <el-row>
-            <el-col :span="11">
-              <el-form-item :label="this.$t('menu.type')" label-width="40px">
-                <el-select v-model="operation" size="small" disabled style="width:230px">
-                  <el-option
-                    v-for="option in typeList"
-                    :key="option.code"
-                    :label="option.name"
-                    :value="option.code"
-                  />
-                </el-select>
-              </el-form-item>
-            </el-col>
-            <el-col :span="11">
-              <el-form-item :label="this.$t('menu.stationName')" label-width="100px">
-                <el-input v-model="stationName" size="small" disabled />
-              </el-form-item>
-            </el-col>
-          </el-row>
-        </el-form>
-      </div>
-      <el-table
-        ref="tempData"
-        class="table"
-        :data="tempData"
-        border
-        style="width: 100%"
-        size="mini"
-        highlight-current-row
-        height="200"
-      >
-        <el-table-column prop="order" :width="110" :label="this.$t('menu.serialNumber2')" />
-        <el-table-column prop="date" :width="160" :label="this.$t('menu.time')" />
-        <el-table-column prop="context" :width="180" :label="this.$t('menu.implementationProcess')" />
-        <el-table-column prop="result" :label="this.$t('menu.executionResult')" />
-      </el-table>
-      <span class="notice">{{ message }}</span>
-      <el-row class="button-group">
-        <el-col :span="2" :offset="3">
-          <el-button :id="domIdCommand" type="primary" :disabled="cmdDisabled[0]" @click="command">{{ $t('menu.release') }}<span
-            v-show="timeCountCommand>0"
-          >({{ timeCountCommand }})</span></el-button>
-        </el-col>
-        <el-col :span="2" :offset="1">
-          <el-button :id="domIdConfirm1" type="primary" style="width:120px;" :disabled="cmdDisabled[1]" @click="confirm1">{{ $t('menu.firstConfirm') }}
-          </el-button>
-        </el-col>
-        <el-col :span="2" :offset="2">
-          <el-button :id="domIdConfirm2" type="primary" style="width:120px;" :disabled="cmdDisabled[2]" @click="confirm2">{{ $t('menu.secondConfirm') }}<span
-            v-show="timeCountConfirm>0"
-          >({{ timeCountConfirm }})</span></el-button>
-        </el-col>
-        <el-col :span="2" :offset="2">
-          <el-button :id="domIdStop" type="primary" :disabled="stpDisabled" @click="stop">{{ $t('menu.suspend') }}</el-button>
-        </el-col>
-        <el-col :span="2" :offset="1">
-          <el-button :id="domIdClose" @click="close">{{ $t('global.close') }}</el-button>
-        </el-col>
-      </el-row>
-    </el-dialog>
-  </div>
-</template>
-<script>
-import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
-import { now } from '@/utils/date';
-
-export default {
-    name: 'StationCmdControl',
-    data() {
-        return {
-            dialogShow: false,
-            backOperate: '',
-            order: 0,
-            row: null,
-            timer: null,
-            operation: '',
-            cmdDisabled: [true, true, true],
-            stpDisabled: true,
-            tempData: [],
-            message: '',
-            timeCountCommand: -1,
-            timeCountConfirm: -1,
-            stationName: ''
-        };
-    },
-    computed: {
-        typeList() {
-            return [
-                { code: OperationEvent.Station.powerUnLock.menu.operation, name: this.$t('menu.menuStation.powerUnLock') },
-                { code: OperationEvent.Station.execKeyOperationTest.menu.operation, name: this.$t('menu.menuStation.execKeyOperationTest') }
-            ];
-        },
-        show() {
-            return this.dialogShow && !this.$store.state.menuOperation.break;
-        },
-        domIdCommand() {
-            if (this.dialogShow) {
-                if (this.operation == OperationEvent.Station.powerUnLock.menu.operation) {
-                    /** 上电解锁*/
-                    return OperationEvent.Station.powerUnLock.order.domId;
-                } else if (this.operation == OperationEvent.Station.execKeyOperationTest.menu.operation) {
-                    /** 执行关键操作测试*/
-                    return OperationEvent.Station.execKeyOperationTest.order.domId;
-                }
-            }
-            return '';
-        },
-        domIdConfirm1() {
-            if (this.dialogShow) {
-                if (this.operation == OperationEvent.Station.powerUnLock.menu.operation) {
-                    /** 上电解锁*/
-                    return OperationEvent.Station.powerUnLock.confirm1.domId;
-                } else if (this.operation == OperationEvent.Station.execKeyOperationTest.menu.operation) {
-                    /** 执行关键操作测试*/
-                    return OperationEvent.Station.execKeyOperationTest.confirm1.domId;
-                }
-            }
-            return '';
-        },
-        domIdConfirm2() {
-            if (this.dialogShow) {
-                if (this.operation == OperationEvent.Station.powerUnLock.menu.operation) {
-                    /** 上电解锁*/
-                    return OperationEvent.Station.powerUnLock.confirm2.domId;
-                } else if (this.operation == OperationEvent.Station.execKeyOperationTest.menu.operation) {
-                    /** 执行关键操作测试*/
-                    return OperationEvent.Station.execKeyOperationTest.confirm2.domId;
-                }
-            }
-            return '';
-        },
-        domIdStop() {
-            if (this.dialogShow) {
-                if (this.operation == OperationEvent.Station.powerUnLock.menu.operation) {
-                    /** 上电解锁*/
-                    return OperationEvent.Station.powerUnLock.stop.domId;
-                } else if (this.operation == OperationEvent.Station.execKeyOperationTest.menu.operation) {
-                    /** 执行关键操作测试*/
-                    return OperationEvent.Station.execKeyOperationTest.stop.domId;
-                }
-            }
-            return '';
-        },
-        domIdClose() {
-            if (this.dialogShow) {
-                return OperationEvent.Command.close.menu.domId;
-            }
-            return '';
-        },
-        title() {
-            if (this.dialogShow) {
-                if (this.operation == OperationEvent.Station.powerUnLock.menu.operation) {
-                    return this.$t('menu.signalDeblocking');
-                } else if (this.operation == OperationEvent.Station.execKeyOperationTest.menu.operation) {
-                    return this.$t('menu.menuStation.execKeyOperationTest');
-                }
-            }
-            return '';
-        }
-    },
-    watch: {
-        cmdDisabled: {
-            handler(val, oldVal) {
-                this.stpDisabled = true;
-                val.forEach((elem, index) => {
-                    // 在确定1之前的操作才可以终止
-                    if (elem == false && index >= 1 && index <= 2) {
-                        this.stpDisabled = false;
-                    }
-                });
-            },
-            deep: true
-        }
-    },
-    mounted() {
-        this.$nextTick(() => {
-            this.$store.dispatch('training/tipReload');
-        });
-        this.timer = setInterval(() => {
-            if (!this.$store.state.menuOperation.break) {
-                if (this.timeCountCommand > 0) {
-                    this.timeCountCommand--;
-                } else if (this.timeCountCommand == 0) {
-                    this.setButtonEnable({ step: 0 });
-                    this.timeCountCommand = -1;
-                }
-                if (this.timeCountConfirm > 0) {
-                    this.timeCountConfirm--;
-                } else if (this.timeCountConfirm == 0) {
-                    this.setButtonEnable({ step: 0 });
-                    this.timeCountConfirm = -1;
-                }
-            }
-        }, 1000);
-    },
-    beforeDestroy() {
-        clearInterval(this.timer);
-        this.timer = null;
-    },
-    methods: {
-        doShow(operate, selected) {
-            if (!this.dialogShow) {
-                this.stationName = '';
-                if (selected && selected._type.toUpperCase() === 'Station'.toUpperCase()) {
-                    this.stationName = selected.name;
-                }
-
-                this.order = 0;
-                this.operation = operate.operation;
-                this.tempData = [];
-                this.timeCountCommand = -1;
-                this.timeCountConfirm = -1;
-                this.cmdDisabled = [false, true, true];
-            }
-            this.stpDisabled = true;
-            this.dialogShow = true;
-            this.setMessage(this.$t('tip.releaseTip'));
-            this.$nextTick(function () {
-                this.$store.dispatch('training/emitTipFresh');
-            });
-        },
-        doClose() {
-            this.dialogShow = false;
-            this.$store.dispatch('training/emitTipFresh');
-        },
-        command() {
-            if (this.operation == OperationEvent.Station.powerUnLock.menu.operation ||
-                    this.operation == OperationEvent.Station.execKeyOperationTest.menu.operation) {
-                /** 第一步不带弹框处理*/
-                this.commandNoPopUp();
-            } else {
-                /** 第一步带弹框处理*/
-                this.commandHasPopUp();
-            }
-        },
-        commandHasPopUp() {
-        },
-        commandNoPopUp() {
-            const operate = {
-                type: MapDeviceType.Station.type
-            };
-
-            if (this.operation == OperationEvent.Station.powerUnLock.menu.operation) {
-                /** 上电解锁*/
-                operate.operation = OperationEvent.Station.powerUnLock.order.operation;
-            } else if (this.operation == OperationEvent.Station.execKeyOperationTest.menu.operation) {
-                /** 执行关键操作测试*/
-                operate.operation = OperationEvent.Station.execKeyOperationTest.order.operation;
-            }
-
-            this.setMessage(this.$t('tip.firstConfirmTip'));
-            this.writeRecord({ order: ++this.order, date: now(), context: this.$t('menu.clickReleaseCommand'), result: '' });
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                if (valid) {
-                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    this.setButtonEnable({ step: 1 });
-                    this.editRecord({ order: this.order, date: now(), context: this.$t('menu.clickReleaseCommand'), result: this.$t('tip.executionSucceed') });
-                } else {
-                    this.editRecord({ order: this.order, date: now(), context: this.$t('menu.clickReleaseCommand'), result: this.$t('tip.executionFailed') });
-                }
-            }).catch(() => {
-                this.editRecord({ order: this.order, date: now(), context: this.$t('menu.clickReleaseCommand'), result: this.$t('tip.executionException') });
-            });
-        },
-        confirm1() {
-            const operate = {
-                type: MapDeviceType.Station.type
-            };
-
-            if (this.operation == OperationEvent.Station.powerUnLock.menu.operation) {
-                /** 上电解锁*/
-                operate.operation = OperationEvent.Station.powerUnLock.confirm1.operation;
-            } else if (this.operation == OperationEvent.Station.execKeyOperationTest.menu.operation) {
-                /** 执行关键操作测试*/
-                operate.operation = OperationEvent.Station.execKeyOperationTest.confirm1.operation;
-            }
-
-            this.setMessage(this.$t('tip.secondConfirmTip'));
-            this.writeRecord({ order: ++this.order, date: now(), context: this.$t('menu.clickFirstConfirm'), result: '' });
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                if (valid) {
-                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    this.timeCountCommand = -1;
-                    this.timeCountConfirm = 10;
-                    this.setButtonEnable({ step: 2 });
-                    this.editRecord({ order: this.order, date: now(), context: this.$t('menu.clickFirstConfirm'), result: this.$t('tip.executionSucceed') });
-                } else {
-                    this.editRecord({ order: this.order, date: now(), context: this.$t('menu.clickFirstConfirm'), result: this.$t('tip.executionFailed') });
-                }
-            }).catch(() => {
-                this.editRecord({ order: this.order, date: now(), context: this.$t('menu.clickFirstConfirm'), result: this.$t('tip.executionException') });
-            });
-        },
-        confirm2() {
-            const operate = {
-                send: true,
-                type: MapDeviceType.Station.type
-            };
-
-            if (this.operation == OperationEvent.Station.powerUnLock.menu.operation) {
-                /** 上电解锁*/
-                operate.operation = OperationEvent.Station.powerUnLock.confirm2.operation;
-            } else if (this.operation == OperationEvent.Station.execKeyOperationTest.menu.operation) {
-                /** 执行关键操作测试*/
-                operate.operation = OperationEvent.Station.execKeyOperationTest.confirm2.operation;
-            }
-
-            this.setMessage('');
-            this.writeRecord({ order: ++this.order, date: now(), context: this.$t('menu.clickSecondConfirm'), result: '' });
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                this.timeCountCommand = -1;
-                this.timeCountConfirm = -1;
-                this.setButtonEnable({ step: -1 });
-                if (valid) {
-                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    this.editRecord({ order: this.order, date: now(), context: this.$t('menu.clickSecondConfirm'), result: this.$t('tip.executionSucceed') });
-                } else {
-                    this.editRecord({ order: this.order, date: now(), context: this.$t('menu.clickSecondConfirm'), result: this.$t('tip.executionFailed') });
-                }
-            }).catch(() => {
-                this.timeCountCommand = -1;
-                this.timeCountConfirm = -1;
-                this.setButtonEnable({ step: -1 });
-                this.editRecord({ order: this.order, date: now(), context: this.$t('menu.clickSecondConfirm'), result: this.$t('tip.executionException') });
-            });
-        },
-        stop() {
-            const operate = {
-                type: MapDeviceType.Station.type
-            };
-
-            if (this.operation == OperationEvent.Station.powerUnLock.menu.operation) {
-                /** 上电解锁*/
-                operate.operation = OperationEvent.Station.powerUnLock.stop.operation;
-            } else if (this.operation == OperationEvent.Station.execKeyOperationTest.menu.operation) {
-                /** 执行关键操作测试*/
-                operate.operation = OperationEvent.Station.execKeyOperationTest.stop.operation;
-            }
-
-            this.writeRecord({ order: ++this.order, date: now(), context: this.$t('menu.clickSuspend'), result: '' });
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                if (valid) {
-                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    this.setButtonEnable({ step: 0 });
-                    this.editRecord({ order: this.order, date: now(), context: this.$t('menu.clickSuspend'), result: this.$t('tip.executionSucceed') });
-                } else {
-                    this.editRecord({ order: this.order, date: now(), context: this.$t('menu.clickSuspend'), result: this.$t('tip.executionFailed') });
-                }
-            }).catch(() => {
-                this.editRecord({ order: this.order, date: now(), context: this.$t('menu.clickSuspend'), result: this.$t('tip.executionException') });
-            });
-        },
-        close() {
-            const operate = {
-                type: MapDeviceType.Station.type,
-                operation: OperationEvent.Command.close.menu.operation
-            };
-
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                if (valid) {
-                    this.doClose();
-                }
-            }).catch(() => {
-                this.doClose();
-            });
-        },
-        getOperate(operate) {
-            /** 弹框返回值处理*/
-        },
-        setButtonEnable(param) {
-            this.cmdDisabled = [true, true, true];
-            if (param && param.step >= 0) {
-                this.cmdDisabled[param.step] = false;
-            }
-        },
-        setMessage(message) {
-            this.message = message;
-        },
-        writeRecord(param) {
-            this.tempData.push(param);
-        },
-        editRecord(param) {
-            this.tempData.forEach(elem => {
-                if (elem.order == param.order) {
-                    for (var prop in param) {
-                        elem[prop] = param[prop];
-                    }
-                }
-            });
-        }
-    }
-};
-</script>
diff --git a/src/jmap/theme/fuzhou_01/menus/dialog/stationHumanControlAll.vue b/src/jmap/theme/fuzhou_01/menus/dialog/stationHumanControlAll.vue
deleted file mode 100644
index 743cad27c..000000000
--- a/src/jmap/theme/fuzhou_01/menus/dialog/stationHumanControlAll.vue
+++ /dev/null
@@ -1,124 +0,0 @@
-<template>
-  <el-dialog
-    v-dialogDrag
-    class="fuzhou-01__systerm station-human-control-all"
-    :title="title"
-    :visible.sync="show"
-    width="430px"
-    :before-close="doClose"
-    :z-index="2000"
-    :modal="false"
-    :close-on-click-modal="false"
-    append-to-body
-  >
-    <div class="context">
-      <span>{{ title }}</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('global.confirm') }}</el-button>
-      </el-col>
-      <el-col :span="8" :offset="4">
-        <el-button :id="domIdCancel" @click="cancel">{{ $t('global.cancel') }}</el-button>
-      </el-col>
-    </el-row>
-    <notice-info ref="noticeInfo" />
-  </el-dialog>
-</template>
-
-<script>
-import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
-import NoticeInfo from './childDialog/childDialog/noticeInfo';
-
-export default {
-    name: 'StationHumanControlAll',
-    components: {
-        NoticeInfo
-    },
-    data() {
-        return {
-            dialogShow: false,
-            loading: false,
-            operation: null
-        };
-    },
-    computed: {
-        show() {
-            return this.dialogShow && !this.$store.state.menuOperation.break;
-        },
-        title() {
-            return this.$t('menu.fullConcentrationStationAccessManualControl');
-        },
-        domIdCancel() {
-            return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
-        },
-        domIdConfirm() {
-            return this.dialogShow ? OperationEvent.Station.humanControlALL.menu.domId : '';
-        }
-    },
-    mounted() {
-        this.$nextTick(() => {
-            this.$store.dispatch('training/tipReload');
-        });
-    },
-    methods: {
-        doShow(operate) {
-            if (!this.dialogShow) {
-                this.loading = false;
-                this.operation = operate.operation;
-            }
-
-            this.dialogShow = true;
-            this.$nextTick(function () {
-                this.$store.dispatch('training/emitTipFresh');
-            });
-        },
-        doClose() {
-            this.loading = false;
-            this.dialogShow = false;
-            this.$store.dispatch('training/emitTipFresh');
-        },
-        commit() {
-            const operate = {
-                send: true,
-                type: MapDeviceType.Station.type,
-                label: MapDeviceType.Station.label,
-                operation: OperationEvent.Station.humanControlALL.menu.operation
-            };
-
-            this.loading = true;
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                this.loading = false;
-                if (valid) {
-                    this.doClose();
-                }
-            }).catch(() => {
-                this.loading = false;
-                this.doClose();
-                this.$refs.noticeInfo.doShow(operate);
-            });
-        },
-        cancel() {
-            const operate = {
-                type: MapDeviceType.Station.type,
-                operation: OperationEvent.Command.cancel.menu.operation
-            };
-
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                if (valid) {
-                    this.doClose();
-                }
-            }).catch(() => {
-                this.doClose();
-            });
-        }
-    }
-};
-
-</script>
-<style>
-    .station-human-control-all .context {
-        padding-bottom: 40px !important;
-        border: 1px solid lightgray;
-    }
-</style>
diff --git a/src/jmap/theme/fuzhou_01/menus/dialog/stationSetRouteControlAll.vue b/src/jmap/theme/fuzhou_01/menus/dialog/stationSetRouteControlAll.vue
deleted file mode 100644
index 02267fc87..000000000
--- a/src/jmap/theme/fuzhou_01/menus/dialog/stationSetRouteControlAll.vue
+++ /dev/null
@@ -1,143 +0,0 @@
-<template>
-  <el-dialog
-    v-dialogDrag
-    class="fuzhou-01__systerm station-set-route-control-all"
-    :title="title"
-    :visible.sync="show"
-    width="450px"
-    :before-close="doClose"
-    :z-index="2000"
-    :modal="false"
-    :close-on-click-modal="false"
-    append-to-body
-  >
-    <div style="padding: 0px 10px">
-      <el-form ref="form" size="small" label-width="110px" label-position="left">
-        <el-form-item :label="this.$t('menu.concentratedStationName')" prop="stationName">
-          <el-input v-model="stationName" size="small" disabled />
-        </el-form-item>
-      </el-form>
-      <el-radio-group v-model="mode">
-        <el-row>
-          <el-radio :label="true">{{ $t('menu.checkConflict') }}</el-radio>
-        </el-row>
-        <el-row style="margin-top: 20px">
-          <el-radio :label="false">{{ $t('menu.notCheckConflict') }}</el-radio>
-        </el-row>
-      </el-radio-group>
-    </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('global.confirm') }}</el-button>
-      </el-col>
-      <el-col :span="8" :offset="4">
-        <el-button :id="domIdCancel" @click="cancel">{{ $t('global.cancel') }}</el-button>
-      </el-col>
-    </el-row>
-    <notice-info ref="noticeInfo" />
-  </el-dialog>
-</template>
-
-<script>
-import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
-import NoticeInfo from './childDialog/childDialog/noticeInfo';
-
-export default {
-    name: 'StationSetRouteControlAll',
-    components: {
-        NoticeInfo
-    },
-    data() {
-        return {
-            dialogShow: false,
-            loading: false,
-            operation: null,
-            stationName: '',
-            mode: true
-        };
-    },
-    computed: {
-        show() {
-            return this.dialogShow && !this.$store.state.menuOperation.break;
-        },
-        title() {
-            return this.$t('menu.fullConcentrationStationSettingAccessControlMode');
-        },
-        domIdCancel() {
-            return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
-        },
-        domIdConfirm() {
-            return this.dialogShow ? OperationEvent.Station.atsAutoControlALL.menu.domId : '';
-        }
-    },
-    mounted() {
-        this.$nextTick(() => {
-            this.$store.dispatch('training/tipReload');
-        });
-    },
-    methods: {
-        doShow(operate, selected) {
-            if (!this.dialogShow) {
-                this.loading = false;
-                this.operation = operate.operation;
-                this.stationName = '';
-                if (selected) {
-                    this.stationName = selected.name;
-                }
-            }
-
-            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 = {
-                send: true,
-                type: MapDeviceType.Station.type,
-                label: MapDeviceType.Station.label,
-                operation: OperationEvent.Station.atsAutoControlALL.menu.operation,
-                val: this.mode
-            };
-
-            this.loading = true;
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                this.loading = false;
-                if (valid) {
-                    this.doClose();
-                }
-            }).catch(() => {
-                this.loading = false;
-                this.doClose();
-                this.$refs.noticeInfo.doShow(operate);
-            });
-        },
-        cancel() {
-            const operate = {
-                type: MapDeviceType.Station.type,
-                operation: OperationEvent.Command.cancel.menu.operation
-            };
-
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                if (valid) {
-                    this.doClose();
-                }
-            }).catch(() => {
-                this.doClose();
-            });
-        }
-    }
-};
-
-</script>
-<style>
-    .station-set-route-control-all .context {
-        padding-bottom: 40px !important;
-        border: 1px solid lightgray;
-    }
-</style>
diff --git a/src/jmap/theme/fuzhou_01/menus/dialog/switchCmdControl.vue b/src/jmap/theme/fuzhou_01/menus/dialog/switchCmdControl.vue
deleted file mode 100644
index 297349843..000000000
--- a/src/jmap/theme/fuzhou_01/menus/dialog/switchCmdControl.vue
+++ /dev/null
@@ -1,481 +0,0 @@
-<template>
-  <div>
-    <el-dialog
-      v-dialogDrag
-      class="fuzhou-01__systerm switch-cmd-control"
-      :title="title"
-      :visible.sync="show"
-      width="840px"
-      :before-close="doClose"
-      :z-index="2000"
-      :modal="false"
-      :close-on-click-modal="false"
-    >
-      <div style="padding: 10px 20px; border: 1px solid lightgray;">
-        <span class="base-label">{{ $t('menu.commandInformation') }}</span>
-        <el-form label-position="center" size="mini">
-          <el-row>
-            <el-col :span="8">
-              <el-form-item :label="this.$t('menu.type')" label-width="40px">
-                <el-select v-model="operation" size="small" disabled>
-                  <el-option
-                    v-for="option in typeList"
-                    :key="option.code"
-                    :label="option.name"
-                    :value="option.code"
-                  />
-                </el-select>
-              </el-form-item>
-            </el-col>
-            <el-col :span="8">
-              <el-form-item :label="this.$t('menu.stationName')" label-width="80px">
-                <el-input v-model="stationName" size="small" disabled />
-              </el-form-item>
-            </el-col>
-            <el-col :span="8">
-              <el-form-item :label="this.$t('menu.switchName')" label-width="80px">
-                <el-input v-model="switchName" size="small" disabled />
-              </el-form-item>
-            </el-col>
-          </el-row>
-        </el-form>
-      </div>
-      <el-table
-        ref="tempData"
-        class="table"
-        :data="tempData"
-        border
-        style="width: 100%"
-        size="mini"
-        highlight-current-row
-        height="200"
-      >
-        <el-table-column prop="order" :width="110" :label="this.$t('menu.serialNumber2')" />
-        <el-table-column prop="date" :width="160" :label="this.$t('menu.time')" />
-        <el-table-column prop="context" :width="180" :label="this.$t('menu.implementationProcess')" />
-        <el-table-column prop="result" :label="this.$t('menu.executionResult')" />
-      </el-table>
-      <span class="notice">{{ message }}</span>
-      <el-row class="button-group">
-        <el-col :span="2" :offset="3">
-          <el-button :id="domIdCommand" type="primary" :disabled="cmdDisabled[0]" @click="command">{{ $t('menu.release') }}<span
-            v-show="timeCountCommand>0"
-          >({{ timeCountCommand }})</span></el-button>
-        </el-col>
-        <el-col :span="2" :offset="1">
-          <el-button :id="domIdConfirm1" type="primary" style="width:120px;" :disabled="cmdDisabled[1]" @click="confirm1">{{ $t('menu.firstConfirm') }}
-          </el-button>
-        </el-col>
-        <el-col :span="2" :offset="2">
-          <el-button :id="domIdConfirm2" type="primary" style="width:120px;" :disabled="cmdDisabled[2]" @click="confirm2">{{ $t('menu.secondConfirm') }}<span
-            v-show="timeCountConfirm>0"
-          >({{ timeCountConfirm }})</span></el-button>
-        </el-col>
-        <el-col :span="2" :offset="2">
-          <el-button :id="domIdStop" type="primary" :disabled="stpDisabled" @click="stop">{{ $t('menu.suspend') }}</el-button>
-        </el-col>
-        <el-col :span="2" :offset="1">
-          <el-button :id="domIdClose" @click="close">{{ $t('global.close') }}</el-button>
-        </el-col>
-      </el-row>
-    </el-dialog>
-  </div>
-</template>
-<script>
-import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
-import { now } from '@/utils/date';
-
-export default {
-    name: 'SwitchCmdControl',
-    data() {
-        return {
-            dialogShow: false,
-            backOperate: '',
-            selected: '',
-            order: 0,
-            row: null,
-            timer: null,
-            operation: '',
-            cmdDisabled: [true, true, true],
-            stpDisabled: true,
-            tempData: [],
-            message: '',
-            timeCountCommand: -1,
-            timeCountConfirm: -1,
-            stationName: '',
-            switchName: ''
-        };
-    },
-    computed: {
-        typeList() {
-            return [
-                { code: OperationEvent.Switch.unlock.menu.operation, name: this.$t('menu.menuSwitch.switchUnlock') },
-                { code: OperationEvent.Switch.unblock.menu.operation, name: this.$t('menu.menuSwitch.switchSectionUnblock') },
-                { code: OperationEvent.Switch.fault.menu.operation, name: this.$t('menu.menuSwitch.switchMalfunctionUnlock') },
-                { code: OperationEvent.Switch.axlePreReset.menu.operation, name: this.$t('menu.menuSwitch.switchSectionAxisPreReset') }
-            ];
-        },
-        show() {
-            return this.dialogShow && !this.$store.state.menuOperation.break;
-        },
-        domIdCommand() {
-            if (this.dialogShow) {
-                if (this.operation == OperationEvent.Switch.unlock.menu.operation) {
-                    /** 道岔单解*/
-                    return OperationEvent.Switch.unlock.order.domId;
-                } else if (this.operation == OperationEvent.Switch.unblock.menu.operation) {
-                    /** 道岔解封*/
-                    return OperationEvent.Switch.unblock.order.domId;
-                } else if (this.operation == OperationEvent.Switch.fault.menu.operation) {
-                    /** 道岔故障解锁*/
-                    return OperationEvent.Switch.fault.order.domId;
-                } else if (this.operation == OperationEvent.Switch.axlePreReset.menu.operation) {
-                    /** 道岔计轴复位*/
-                    return OperationEvent.Switch.axlePreReset.order.domId;
-                }
-            }
-            return '';
-        },
-        domIdConfirm1() {
-            if (this.dialogShow) {
-                if (this.operation == OperationEvent.Switch.unlock.menu.operation) {
-                    /** 道岔单解*/
-                    return OperationEvent.Switch.unlock.confirm1.domId;
-                } else if (this.operation == OperationEvent.Switch.unblock.menu.operation) {
-                    /** 道岔解封*/
-                    return OperationEvent.Switch.unblock.confirm1.domId;
-                } else if (this.operation == OperationEvent.Switch.fault.menu.operation) {
-                    /** 道岔故障解锁*/
-                    return OperationEvent.Switch.fault.confirm1.domId;
-                } else if (this.operation == OperationEvent.Switch.axlePreReset.menu.operation) {
-                    /** 道岔计轴复位*/
-                    return OperationEvent.Switch.axlePreReset.confirm1.domId;
-                }
-            }
-            return '';
-        },
-        domIdConfirm2() {
-            if (this.dialogShow) {
-                if (this.operation == OperationEvent.Switch.unlock.menu.operation) {
-                    /** 道岔单解*/
-                    return OperationEvent.Switch.unlock.confirm2.domId;
-                } else if (this.operation == OperationEvent.Switch.unblock.menu.operation) {
-                    /** 道岔解封*/
-                    return OperationEvent.Switch.unblock.confirm2.domId;
-                } else if (this.operation == OperationEvent.Switch.fault.menu.operation) {
-                    /** 道岔故障解锁*/
-                    return OperationEvent.Switch.fault.confirm2.domId;
-                } else if (this.operation == OperationEvent.Switch.axlePreReset.menu.operation) {
-                    /** 道岔计轴复位*/
-                    return OperationEvent.Switch.axlePreReset.confirm2.domId;
-                }
-            }
-            return '';
-        },
-        domIdStop() {
-            if (this.dialogShow) {
-                if (this.operation == OperationEvent.Switch.unlock.menu.operation) {
-                    /** 道岔单解*/
-                    return OperationEvent.Switch.unlock.stop.domId;
-                } else if (this.operation == OperationEvent.Switch.unblock.menu.operation) {
-                    /** 道岔解封*/
-                    return OperationEvent.Switch.unblock.stop.domId;
-                } else if (this.operation == OperationEvent.Switch.fault.menu.operation) {
-                    /** 道岔故障解锁*/
-                    return OperationEvent.Switch.fault.stop.domId;
-                } else if (this.operation == OperationEvent.Switch.axlePreReset.menu.operation) {
-                    /** 道岔计轴复位*/
-                    return OperationEvent.Switch.axlePreReset.stop.domId;
-                }
-            }
-            return '';
-        },
-        domIdClose() {
-            if (this.dialogShow) {
-                return OperationEvent.Command.close.menu.domId;
-            }
-            return '';
-        },
-        title() {
-            if (this.dialogShow) {
-                if (this.operation == OperationEvent.Switch.unlock.menu.operation) {
-                    return '道岔单解';
-                } else if (this.operation == OperationEvent.Switch.unblock.menu.operation) {
-                    return '道岔解封';
-                } else if (this.operation == OperationEvent.Switch.fault.menu.operation) {
-                    return '道岔故障解锁';
-                } else if (this.operation == OperationEvent.Switch.axlePreReset.menu.operation) {
-                    return '道岔计轴复位';
-                }
-            }
-            return '';
-        }
-    },
-    watch: {
-        cmdDisabled: {
-            handler(val, oldVal) {
-                this.stpDisabled = true;
-                val.forEach((elem, index) => {
-                    // 在确定1之前的操作才可以终止
-                    if (elem == false && index >= 1 && index <= 2) {
-                        this.stpDisabled = false;
-                    }
-                });
-            },
-            deep: true
-        }
-    },
-    mounted() {
-        this.$nextTick(() => {
-            this.$store.dispatch('training/tipReload');
-        });
-        this.timer = setInterval(() => {
-            if (!this.$store.state.menuOperation.break) {
-                if (this.timeCountCommand > 0) {
-                    this.timeCountCommand--;
-                } else if (this.timeCountCommand == 0) {
-                    this.setButtonEnable({ step: 0 });
-                    this.timeCountCommand = -1;
-                }
-                if (this.timeCountConfirm > 0) {
-                    this.timeCountConfirm--;
-                } else if (this.timeCountConfirm == 0) {
-                    this.setButtonEnable({ step: 0 });
-                    this.timeCountConfirm = -1;
-                }
-            }
-        }, 1000);
-    },
-    beforeDestroy() {
-        clearInterval(this.timer);
-        this.timer = null;
-    },
-    methods: {
-        doShow(operate, selected) {
-            if (!this.dialogShow) {
-                this.switchName = '';
-                this.stationName = '';
-                if (selected && selected._type.toUpperCase() === 'Switch'.toUpperCase()) {
-                    this.switchName = selected.name;
-                    const station = this.$store.getters['map/getDeviceByCode'](selected.stationCode);
-                    if (station) {
-                        this.stationName = station.name;
-                    }
-                    this.selected = selected;
-                }
-
-                this.order = 0;
-                this.operation = operate.operation;
-                this.dialogShow = true;
-                this.tempData = [];
-                this.timeCountCommand = -1;
-                this.timeCountConfirm = -1;
-                this.cmdDisabled = [false, true, true];
-            }
-            this.stpDisabled = true;
-            this.setMessage(this.$t('tip.releaseTip'));
-            this.$nextTick(function () {
-                this.$store.dispatch('training/emitTipFresh');
-            });
-        },
-        doClose() {
-            this.dialogShow = false;
-            this.$store.dispatch('training/emitTipFresh');
-        },
-        command() {
-            /** 道岔单解/道岔解封/道岔故障解锁/道岔计轴复位*/
-            if (this.operation == OperationEvent.Switch.unlock.menu.operation ||
-                    this.operation == OperationEvent.Switch.unblock.menu.operation ||
-                    this.operation == OperationEvent.Switch.fault.menu.operation ||
-                    this.operation == OperationEvent.Switch.axlePreReset.menu.operation ||
-                    this.operation == OperationEvent.Switch.cancelSpeed.menu.operation) {
-                /** 第一步不带弹框处理*/
-                this.commandNoPopUp();
-            } else {
-                /** 第一步带弹框处理*/
-                this.commandHasPopUp();
-            }
-        },
-        commandHasPopUp() {
-
-        },
-        commandNoPopUp() {
-            const operate = {
-                type: MapDeviceType.Switch.type
-            };
-
-            if (this.operation == OperationEvent.Switch.unlock.menu.operation) {
-                /** 道岔单解*/
-                operate.operation = OperationEvent.Switch.unlock.order.operation;
-            } else if (this.operation == OperationEvent.Switch.unblock.menu.operation) {
-                /** 道岔解封*/
-                operate.operation = OperationEvent.Switch.unblock.order.operation;
-            } else if (this.operation == OperationEvent.Switch.fault.menu.operation) {
-                /** 道岔故障解锁*/
-                operate.operation = OperationEvent.Switch.fault.order.operation;
-            } else if (this.operation == OperationEvent.Switch.axlePreReset.menu.operation) {
-                /** 道岔计轴复位*/
-                operate.operation = OperationEvent.Switch.axlePreReset.order.operation;
-            }
-
-            this.setMessage(this.$t('tip.firstConfirmTip'));
-            this.writeRecord({ order: ++this.order, date: now(), context: this.$t('menu.clickReleaseCommand'), result: '' });
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                if (valid) {
-                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    this.setButtonEnable({ step: 1 });
-                    this.editRecord({ order: this.order, date: now(), context: this.$t('menu.clickReleaseCommand'), result: this.$t('tip.executionSucceed') });
-                } else {
-                    this.editRecord({ order: this.order, date: now(), context: this.$t('menu.clickReleaseCommand'), result: this.$t('tip.executionFailed') });
-                }
-            }).catch(() => {
-                this.editRecord({ order: this.order, date: now(), context: this.$t('menu.clickReleaseCommand'), result: this.$t('tip.executionException') });
-            });
-        },
-        confirm1() {
-            const operate = {
-                type: MapDeviceType.Switch.type
-            };
-
-            if (this.operation == OperationEvent.Switch.unlock.menu.operation) {
-                /** 道岔单解*/
-                operate.operation = OperationEvent.Switch.unlock.confirm1.operation;
-            } else if (this.operation == OperationEvent.Switch.unblock.menu.operation) {
-                /** 道岔解封*/
-                operate.operation = OperationEvent.Switch.unblock.confirm1.operation;
-            } else if (this.operation == OperationEvent.Switch.fault.menu.operation) {
-                /** 道岔故障解锁*/
-                operate.operation = OperationEvent.Switch.fault.confirm1.operation;
-            } else if (this.operation == OperationEvent.Switch.axlePreReset.menu.operation) {
-                /** 道岔计轴复位*/
-                operate.operation = OperationEvent.Switch.axlePreReset.confirm1.operation;
-            }
-
-            this.setMessage(this.$t('tip.secondConfirmTip'));
-            this.writeRecord({ order: ++this.order, date: now(), context: this.$t('menu.clickFirstConfirm'), result: '' });
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                if (valid) {
-                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    this.timeCountCommand = -1;
-                    this.timeCountConfirm = 10;
-                    this.setButtonEnable({ step: 2 });
-                    this.editRecord({ order: this.order, date: now(), context: this.$t('menu.clickFirstConfirm'), result: this.$t('tip.executionSucceed') });
-                } else {
-                    this.editRecord({ order: this.order, date: now(), context: this.$t('menu.clickFirstConfirm'), result: this.$t('tip.executionFailed') });
-                }
-            }).catch(() => {
-                this.editRecord({ order: this.order, date: now(), context: this.$t('menu.clickFirstConfirm'), result: this.$t('tip.executionException') });
-            });
-        },
-        confirm2() {
-            const operate = {
-                send: true,
-                type: MapDeviceType.Switch.type
-            };
-
-            if (this.operation == OperationEvent.Switch.unlock.menu.operation) {
-                /** 道岔单解*/
-                operate.operation = OperationEvent.Switch.unlock.confirm2.operation;
-            } else if (this.operation == OperationEvent.Switch.unblock.menu.operation) {
-                /** 道岔解封*/
-                operate.operation = OperationEvent.Switch.unblock.confirm2.operation;
-            } else if (this.operation == OperationEvent.Switch.fault.menu.operation) {
-                /** 道岔故障解锁*/
-                operate.operation = OperationEvent.Switch.fault.confirm2.operation;
-            } else if (this.operation == OperationEvent.Switch.axlePreReset.menu.operation) {
-                /** 道岔计轴复位*/
-                operate.operation = OperationEvent.Switch.axlePreReset.confirm2.operation;
-            }
-
-            this.setMessage('');
-            this.writeRecord({ order: ++this.order, date: now(), context: this.$t('menu.clickSecondConfirm'), result: '' });
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                this.timeCountCommand = -1;
-                this.timeCountConfirm = -1;
-                this.setButtonEnable({ step: -1 });
-                if (valid) {
-                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    this.editRecord({ order: this.order, date: now(), context: this.$t('menu.clickSecondConfirm'), result: this.$t('tip.executionSucceed') });
-                } else {
-                    this.editRecord({ order: this.order, date: now(), context: this.$t('menu.clickSecondConfirm'), result: this.$t('tip.executionFailed') });
-                }
-            }).catch(() => {
-                this.timeCountCommand = -1;
-                this.timeCountConfirm = -1;
-                this.setButtonEnable({ step: -1 });
-                this.editRecord({ order: this.order, date: now(), context: this.$t('menu.clickSecondConfirm'), result: this.$t('tip.executionException') });
-            });
-        },
-        stop() {
-            const operate = {
-                type: MapDeviceType.Switch.type
-            };
-
-            if (this.operation == OperationEvent.Switch.unlock.menu.operation) {
-                /** 道岔单解*/
-                operate.operation = OperationEvent.Switch.unlock.stop.operation;
-            } else if (this.operation == OperationEvent.Switch.unblock.menu.operation) {
-                /** 道岔解封*/
-                operate.operation = OperationEvent.Switch.unblock.stop.operation;
-            } else if (this.operation == OperationEvent.Switch.fault.menu.operation) {
-                /** 道岔故障解锁*/
-                operate.operation = OperationEvent.Switch.fault.stop.operation;
-            } else if (this.operation == OperationEvent.Switch.axlePreReset.menu.operation) {
-                /** 道岔计轴复位*/
-                operate.operation = OperationEvent.Switch.axlePreReset.stop.operation;
-            }
-
-            this.writeRecord({ order: ++this.order, date: now(), context: this.$t('menu.clickSuspend'), result: '' });
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                if (valid) {
-                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    this.setButtonEnable({ step: 0 });
-                    this.editRecord({ order: this.order, date: now(), context: this.$t('menu.clickSuspend'), result: this.$t('tip.executionSucceed') });
-                } else {
-                    this.editRecord({ order: this.order, date: now(), context: this.$t('menu.clickSuspend'), result: this.$t('tip.executionFailed') });
-                }
-            }).catch(() => {
-                this.editRecord({ order: this.order, date: now(), context: this.$t('menu.clickSuspend'), result: this.$t('tip.executionException') });
-            });
-        },
-        close() {
-            const operate = {
-                type: MapDeviceType.Switch.type,
-                operation: OperationEvent.Command.close.menu.operation
-            };
-
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                if (valid) {
-                    this.doClose();
-                }
-            }).catch(() => {
-                this.doClose();
-            });
-        },
-        getOperate(operate) {
-            /** 弹框返回值处理*/
-        },
-        setButtonEnable(param) {
-            this.cmdDisabled = [true, true, true];
-            if (param && param.step >= 0) {
-                this.cmdDisabled[param.step] = false;
-            }
-        },
-        setMessage(message) {
-            this.message = message;
-        },
-        writeRecord(param) {
-            this.tempData.push(param);
-        },
-        editRecord(param) {
-            this.tempData.forEach(elem => {
-                if (elem.order == param.order) {
-                    for (var prop in param) {
-                        elem[prop] = param[prop];
-                    }
-                }
-            });
-        }
-    }
-};
-</script>
diff --git a/src/jmap/theme/fuzhou_01/menus/dialog/switchControl.vue b/src/jmap/theme/fuzhou_01/menus/dialog/switchControl.vue
deleted file mode 100644
index 1de0cba4d..000000000
--- a/src/jmap/theme/fuzhou_01/menus/dialog/switchControl.vue
+++ /dev/null
@@ -1,285 +0,0 @@
-<template>
-  <el-dialog
-    v-dialogDrag
-    class="fuzhou-01__systerm switch-control"
-    :title="title"
-    :visible.sync="show"
-    width="300px"
-    :before-close="doClose"
-    :z-index="2000"
-    :modal="false"
-    :close-on-click-modal="false"
-  >
-    <el-row class="header">
-      <el-col :span="11"><span>{{ $t('menu.stationName') }}</span></el-col>
-      <el-col :span="11" :offset="2"><span>{{ $t('menu.switch') }}</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="switchName" size="small" disabled />
-      </el-col>
-    </el-row>
-    <el-row v-if="activeShow" style="margin-top: 10px;">
-      <el-col :span="11">
-        <el-radio v-model="radio" label="1" :disabled="radio == 2" style="display: block; text-align: center;">
-          {{ $t('menu.activation') }}</el-radio>
-      </el-col>
-      <el-col :span="11" :offset="2">
-        <el-radio v-model="radio" label="2" :disabled="radio == 1" style="display: block; text-align: center;">
-          {{ $t('menu.resection') }}</el-radio>
-      </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">{{ $t('global.confirm') }}</el-button>
-      </el-col>
-      <el-col :span="8" :offset="4">
-        <el-button :id="domIdCancel" @click="cancel">{{ $t('global.cancel') }}</el-button>
-      </el-col>
-    </el-row>
-    <notice-info ref="noticeInfo" />
-  </el-dialog>
-</template>
-
-<script>
-import { MapDeviceType, OperationEvent, getDomIdByOperation } from '@/scripts/ConstDic';
-import NoticeInfo from './childDialog/childDialog/noticeInfo';
-
-export default {
-    name: 'SwitchControl',
-    components: {
-        NoticeInfo
-    },
-    data() {
-        return {
-            dialogShow: false,
-            loading: false,
-            operation: '',
-            stationName: '',
-            switchName: '',
-            radio: 1,
-            activeShow: false
-        };
-    },
-    computed: {
-        show() {
-            return this.dialogShow && !this.$store.state.menuOperation.break;
-        },
-        domIdCancel() {
-            return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
-        },
-        domIdConfirm() {
-            return this.dialogShow ? getDomIdByOperation(this.operation) : '';
-        },
-        title() {
-            if (this.operation == OperationEvent.Switch.lock.menu.operation) {
-                return this.$t('menu.menuSwitch.switchLock');
-            } else if (this.operation == OperationEvent.Switch.block.menu.operation) {
-                return this.$t('menu.menuSwitch.switchBlockade');
-            } else if (this.operation == OperationEvent.Switch.turnout.menu.operation) {
-                return this.$t('menu.menuSwitch.switchTurnout');
-            } else if (this.operation == OperationEvent.Switch.turnoutForce.menu.operation) {
-                return this.$t('menu.menuSwitch.switchForcedPull');
-            } else if (this.operation == OperationEvent.Switch.split.menu.operation) {
-                return this.$t('menu.menuSwitch.sectionResection');
-            } else if (this.operation == OperationEvent.Switch.active.menu.operation) {
-                return this.$t('menu.menuSwitch.sectionActive');
-            }
-            return '';
-        }
-    },
-    mounted() {
-        this.$nextTick(() => {
-            this.$store.dispatch('training/tipReload');
-        });
-    },
-    methods: {
-        doShow(operate, selected) {
-            if (!this.dialogShow) {
-                this.switchName = '';
-                this.stationName = '';
-                if (selected && selected._type.toUpperCase() === 'Switch'.toUpperCase()) {
-                    this.switchName = selected.name;
-                    const station = this.$store.getters['map/getDeviceByCode'](selected.stationCode);
-                    if (station) {
-                        this.stationName = station.name;
-                    }
-                }
-
-                this.operation = operate.operation;
-                if (this.operation == OperationEvent.Switch.split.menu.operation) {
-                    this.activeShow = true;
-                    this.radio = '2';
-                } else if (this.operation == OperationEvent.Switch.active.menu.operation) {
-                    this.activeShow = true;
-                    this.radio = '1';
-                }
-            }
-            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.Switch.lock.menu.operation) {
-                /** 道岔单锁*/
-                this.lock();
-            } else if (this.operation == OperationEvent.Switch.block.menu.operation) {
-                /** 道岔封锁*/
-                this.block();
-            } else if (this.operation == OperationEvent.Switch.turnout.menu.operation) {
-                /** 道岔转动*/
-                this.turnout(this.operation);
-            } else if (this.operation == OperationEvent.Switch.turnoutForce.menu.operation) {
-                /** 道岔强扳*/
-                this.turnoutForce();
-            } else if (this.operation == OperationEvent.Switch.split.menu.operation) {
-                /** 区段激活*/
-                this.split();
-            } else if (this.operation == OperationEvent.Switch.active.menu.operation) {
-                /** 区段激活*/
-                this.active();
-            }
-        },
-        // 道岔单锁
-        lock() {
-            const operate = {
-                send: true,
-                type: MapDeviceType.Switch.type,
-                operation: OperationEvent.Switch.lock.menu.operation
-            };
-
-            this.loading = true;
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                this.loading = false;
-                if (valid) {
-                    this.doClose();
-                }
-            }).catch(() => {
-                this.loading = false;
-                this.doClose();
-                this.$refs.noticeInfo.doShow(operate);
-            });
-        },
-        // 道岔封锁
-        block() {
-            const operate = {
-                send: true,
-                type: MapDeviceType.Switch.type,
-                operation: OperationEvent.Switch.block.menu.operation
-            };
-
-            this.loading = true;
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                this.loading = false;
-                if (valid) {
-                    this.doClose();
-                }
-            }).catch(() => {
-                this.loading = false;
-                this.doClose();
-                this.$refs.noticeInfo.doShow(operate);
-            });
-        },
-        // 道岔转动
-        turnout(operation) {
-            const operate = {
-                send: true,
-                type: MapDeviceType.Switch.type,
-                operation: OperationEvent.Switch.turnout.menu.operation
-            };
-
-            this.loading = true;
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                this.loading = false;
-                if (valid) {
-                    this.doClose();
-                }
-            }).catch(() => {
-                this.loading = false;
-                this.doClose();
-                this.$refs.noticeInfo.doShow(operate);
-            });
-        },
-        // 道岔强扮
-        turnoutForce() {
-            const operate = {
-                send: true,
-                type: MapDeviceType.Switch.type,
-                operation: OperationEvent.Switch.turnoutForce.menu.operation
-            };
-            this.loading = true;
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                this.loading = false;
-                if (valid) {
-                    this.doClose();
-                }
-            }).catch(() => {
-                this.loading = false;
-                this.doClose();
-                this.$refs.noticeInfo.doShow(operate);
-            });
-        },
-        // 区段切除
-        split() {
-            const operate = {
-                send: true,
-                type: MapDeviceType.Switch.type,
-                operation: OperationEvent.Switch.split.menu.operation
-            };
-            this.loading = true;
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                this.loading = false;
-                if (valid) {
-                    this.doClose();
-                }
-            }).catch(() => {
-                this.loading = false;
-                this.doClose();
-                this.$refs.noticeInfo.doShow(operate);
-            });
-        },
-        // 区段激活
-        active() {
-            const operate = {
-                send: true,
-                type: MapDeviceType.Switch.type,
-                operation: OperationEvent.Switch.active.menu.operation
-            };
-            this.loading = true;
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                this.loading = false;
-                if (valid) {
-                    this.doClose();
-                }
-            }).catch(() => {
-                this.loading = false;
-                this.doClose();
-                this.$refs.noticeInfo.doShow(operate);
-            });
-        },
-        cancel() {
-            const operate = {
-                type: MapDeviceType.Switch.type,
-                operation: OperationEvent.Command.cancel.menu.operation
-            };
-
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                if (valid) {
-                    this.doClose();
-                }
-            }).catch(() => {
-                this.doClose();
-            });
-        }
-    }
-};
-</script>
diff --git a/src/jmap/theme/fuzhou_01/menus/dialog/trainControl.vue b/src/jmap/theme/fuzhou_01/menus/dialog/trainControl.vue
deleted file mode 100644
index 9d28dc08d..000000000
--- a/src/jmap/theme/fuzhou_01/menus/dialog/trainControl.vue
+++ /dev/null
@@ -1,467 +0,0 @@
-<template>
-  <el-dialog v-dialogDrag class="fuzhou-01__systerm train-control" :title="title" :visible.sync="show" width="370px" :before-close="doClose" :z-index="2000" :modal="false" :close-on-click-modal="false">
-    <el-form ref="form" size="small" label-width="120px" :model="formModel" :rules="rules">
-      <el-form-item :label="this.$t('menu.groupNumber')+this.$t('global.colon')" prop="groupNumber">
-        <el-select
-          :id="domIdTrainNumber"
-          v-model="formModel.groupNumber"
-          filterable
-          :disabled="trainNumberIsDisabled"
-          @change="trainNumberChange"
-        >
-          <el-option
-            v-for="train in trainList"
-            :key="train.groupNumber"
-            :label="train.groupNumber"
-            :value="train.groupNumber"
-          />
-        </el-select>
-      </el-form-item>
-      <el-form-item prop="trainType" label-width="0px">
-        <el-radio-group
-          :id="domIdTrainType"
-          v-model="formModel.trainType"
-          style="margin-left: 15px;"
-          @change="trainTypeChange"
-        >
-          <el-radio :label="'01'">{{ $t('menu.planTrain') }}</el-radio>
-          <el-radio :label="'02'">{{ $t('menu.headCodeTrain') }}</el-radio>
-          <el-radio :label="'03'" style="margin-top:5px;">{{ $t('menu.artificialTrain') }}</el-radio>
-        </el-radio-group>
-      </el-form-item>
-      <el-form-item v-if="formModel.trainType == '01'" prop="serviceNumber">
-        <span slot="label">{{ $t('menu.serviceNumber') }}</span>
-        <el-input
-          :id="domIdServerNo"
-          v-model="formModel.serviceNumber"
-          :disabled="serverNoIsDisabled"
-        />
-      </el-form-item>
-      <el-form-item v-if="formModel.trainType == '01'" :label="this.$t('menu.tripNumber')+this.$t('global.colon')" prop="tripNumber">
-        <el-input
-          :id="domIdTrainNo"
-          v-model="formModel.tripNumber"
-          :disabled="trainNoIsDisabled"
-          maxlength="4"
-        />
-      </el-form-item>
-      <el-form-item v-if="formModel.trainType == '01'" :label="this.$t('menu.targetCode')+this.$t('global.colon')" prop="targetCode">
-        <el-input
-          :id="domIdTargetCode"
-          v-model="formModel.targetCode"
-          :disabled="targetCodeIsDisabled"
-        />
-      </el-form-item>
-      <el-form-item v-if="formModel.trainType == '03'" :label="this.$t('menu.category')+this.$t('global.colon')" prop="category">
-        <el-select
-          :id="domIdTrainNumber"
-          v-model="formModel.category"
-          filterable
-          :disabled="true"
-        >
-          <el-option
-            v-for="item in categoryList"
-            :key="item.value"
-            :label="item.name"
-            :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 :id="domIdConfirm" type="primary" :loading="loading" :disabled="istargetCode" @click="commit">{{ $t('global.confirm') }}</el-button>
-      </el-col>
-      <el-col :span="8" :offset="4">
-        <el-button :id="domIdCancel" @click="cancel">{{ $t('global.cancel') }}</el-button>
-      </el-col>
-    </el-row>
-    <confirm-train ref="confirmTrain" />
-    <notice-info ref="noticeInfo" />
-  </el-dialog>
-</template>
-
-<script>
-import { mapGetters } from 'vuex';
-import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
-import ConfirmTrain from './childDialog/confirmTrain';
-import NoticeInfo from './childDialog/childDialog/noticeInfo';
-import OperateHandler from '@/scripts/plugin/OperateHandler';
-
-export default {
-    name: 'TrainControl',
-    components: {
-        ConfirmTrain,
-        NoticeInfo
-    },
-    data() {
-        return {
-            trainList: [],
-            categoryList: [
-                { name: 'MM', value: '01' }
-            ],
-            formModel: {
-                tripNumber: '',
-                groupNumber: '',
-                trainType: '01',
-                serviceNumber: '',
-                targetCode: '',
-                category: 'MM'
-            },
-
-            rules: {
-                groupNumber: [
-                    { required: true, message: this.$t('rules.selectGroupNumber'), trigger: 'change' }
-                ],
-                trainType: [
-                    { required: true, message: this.$t('rules.selectATrainType'), trigger: 'change' }
-                ],
-                serviceNumber: [
-                    { required: true, message: this.$t('rules.enterTheServiceNumber'), trigger: 'blur' }
-                ],
-                tripNumber: [
-                    { required: true, message: this.$t('rules.enterTheTripNumber'), trigger: 'blur' }
-                ],
-                targetCode: [
-                    { required: true, message: this.$t('rules.enterTheTargetCode'), trigger: 'blur' }
-                ]
-            },
-            operation: null,
-            dialogShow: false,
-            loading: false,
-            direction: 0
-        };
-    },
-    computed: {
-        ...mapGetters('map', [
-            'map'
-        ]),
-        trainNoIsDisabled() {
-            return false;
-        },
-        serverNoIsDisabled() {
-            return true;
-        },
-        targetCodeIsDisabled() {
-            return true;
-        },
-        trainNumberIsDisabled() {
-            if (this.operation != OperationEvent.Train.addTrainId.menu.operation) {
-                return true;
-            }
-            return '';
-        },
-        // trainTypeIsDisabled() {
-        // 	if (this.operation != OperationEvent.Train.addTrainId.menu.operation) {
-        // 		return true;
-        // 	}
-        // 	return '';
-        // },
-        show() {
-            return this.dialogShow && !this.$store.state.menuOperation.break;
-        },
-        domIdTrainNumber() {
-            if (this.dialogShow) {
-                if (this.operation == OperationEvent.Train.addTrainId.menu.operation) {
-                    /** 添加列车识别号*/
-                    return OperationEvent.Train.addTrainId.trainNumberChange.domId;
-                } else if (this.operation == OperationEvent.Train.editTrainId.menu.operation) {
-                    /** 修改列车识别号*/
-                    return OperationEvent.Train.editTrainId.trainNumberChange.domId;
-                }
-            }
-            return '';
-        },
-        domIdTrainNo() {
-            if (this.dialogShow) {
-                if (this.operation == OperationEvent.Train.addTrainId.menu.operation) {
-                    /** 添加列车识别号*/
-                    return OperationEvent.Train.addTrainId.trainNoChange.domId;
-                } else if (this.operation == OperationEvent.Train.editTrainId.menu.operation) {
-                    /** 修改列车识别号*/
-                    return OperationEvent.Train.editTrainId.trainNoChange.domId;
-                }
-            }
-            return '';
-        },
-        domIdTrainType() {
-            if (this.dialogShow) {
-                if (this.operation == OperationEvent.Train.addTrainId.menu.operation) {
-                    /** 添加列车识别号*/
-                    return OperationEvent.Train.addTrainId.trainTypeChange.domId;
-                } else if (this.operation == OperationEvent.Train.editTrainId.menu.operation) {
-                    /** 修改列车识别号*/
-                    return OperationEvent.Train.editTrainId.trainTypeChange.domId;
-                }
-            }
-            return '';
-        },
-        domIdServerNo() {
-            if (this.dialogShow) {
-                if (this.operation == OperationEvent.Train.addTrainId.menu.operation) {
-                    /** 添加列车识别号*/
-                    return OperationEvent.Train.addTrainId.serverNoChange.domId;
-                } else if (this.operation == OperationEvent.Train.editTrainId.menu.operation) {
-                    /** 修改列车识别号*/
-                    return OperationEvent.Train.editTrainId.serverNoChange.domId;
-                }
-            }
-            return '';
-        },
-        domIdTargetCode() {
-            if (this.dialogShow) {
-                if (this.operation == OperationEvent.Train.addTrainId.menu.operation) {
-                    /** 添加列车识别号*/
-                    return OperationEvent.Train.addTrainId.targetCodeChange.domId;
-                } else if (this.operation == OperationEvent.Train.editTrainId.menu.operation) {
-                    /** 修改列车识别号*/
-                    return OperationEvent.Train.editTrainId.targetCodeChange.domId;
-                }
-            }
-            return '';
-        },
-        domIdConfirm() {
-            if (this.dialogShow) {
-                if (this.operation == OperationEvent.Train.addTrainId.menu.operation) {
-                    /** 添加列车识别号*/
-                    return OperationEvent.Train.addTrainId.menu.domId;
-                } else if (this.operation == OperationEvent.Train.editTrainId.menu.operation) {
-                    /** 修改列车识别号*/
-                    return OperationEvent.Train.editTrainId.menu.domId;
-                }
-            }
-            return '';
-        },
-        domIdCancel() {
-            return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
-        },
-        title() {
-            if (this.operation == OperationEvent.Train.addTrainId.menu.operation) {
-                return this.$t('menu.menuTrain.addTrainId');
-            } else if (this.operation == OperationEvent.Train.editTrainId.menu.operation) {
-                return this.$t('menu.menuTrain.editTrainId');
-            }
-            return '';
-        },
-        istargetCode() {
-            if (this.formModel.serviceNumber && this.formModel.targetCode) {
-                return false;
-            }
-            return true;
-        }
-    },
-    watch: {
-        'formModel.tripNumber': function(val) {
-            if (val.length == 4) {
-                this.trainNoChange(val);
-            } else {
-                this.formModel = {
-                    groupNumber: this.formModel.groupNumber,
-                    tripNumber: val,
-                    trainType: this.formModel.trainType,
-                    serviceNumber: '',
-                    targetCode: '',
-                    category: 'MM'
-                };
-            }
-        }
-    },
-    mounted() {
-        this.$nextTick(() => {
-            this.$store.dispatch('training/tipReload');
-        });
-    },
-    methods: {
-        loadInitData(map) {},
-        doShow(operate, selected) {
-            // 如果不是断点激活，则需要对初始值进行初始化
-            if (!this.dialogShow) {
-                this.operation = operate.operation;
-            }
-            const model = this.$store.getters['map/getDeviceByCode'](selected.code);
-            this.formModel = {
-                groupNumber: model.groupNumber,
-                tripNumber: `${model.directionCode}${model.tripNumber}`,
-                trainType: model.type,
-                serviceNumber: model.serviceNumber,
-                targetCode: model.targetCode,
-                category: 'MM'
-            };
-
-            /** 加载列车数据*/
-            this.loadInitData(this.map);
-            this.dialogShow = true;
-            this.$nextTick(function () {
-                this.$store.dispatch('training/emitTipFresh');
-            });
-        },
-        doClose() {
-            this.loading = false;
-            this.dialogShow = false;
-            this.$store.dispatch('training/emitTipFresh');
-            this.$store.dispatch('map/setTrainWindowShow', false);
-        },
-        trainNumberChange(groupNumber) {
-            const operate = {
-                type: MapDeviceType.Train.type,
-                val: `${groupNumber}`,
-                operation: ''
-            };
-
-            if (this.operation == OperationEvent.Train.addTrainId.menu.operation) {
-                operate.operation = OperationEvent.Train.addTrainId.trainNumberChange.operation;
-            } else if (this.operation == OperationEvent.Train.editTrainId.menu.operation) {
-                operate.operation = OperationEvent.Train.editTrainId.trainNumberChange.operation;
-            }
-
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                if (valid) {
-                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                }
-            });
-        },
-        trainTypeChange(trainType) {
-            const operate = {
-                type: MapDeviceType.Train.type,
-                val: `${trainType}`,
-                operation: ''
-            };
-
-            if (this.operation == OperationEvent.Train.addTrainId.menu.operation) {
-                operate.operation = OperationEvent.Train.addTrainId.trainTypeChange.operation;
-            } else if (this.operation == OperationEvent.Train.editTrainId.menu.operation) {
-                operate.operation = OperationEvent.Train.editTrainId.trainTypeChange.operation;
-            }
-
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                if (valid) {
-                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                }
-            });
-        },
-        trainNoChange(tripNumber) {
-            const operate = {
-                send: true,
-                type: MapDeviceType.Train.type,
-                val: tripNumber,
-                operation: ''
-            };
-
-            if (this.operation == OperationEvent.Train.addTrainId.menu.operation) {
-                operate.operation = OperationEvent.Train.addTrainId.trainNoChange.operation;
-            } else if (this.operation == OperationEvent.Train.editTrainId.menu.operation) {
-                operate.operation = OperationEvent.Train.editTrainId.trainNoChange.operation;
-            }
-            OperateHandler.backStep(1);
-            this.$store.dispatch('training/next', operate).then(({ valid, response }) => {
-                if (valid) {
-                    if (response.data) {
-                        this.formModel = {
-                            groupNumber: this.formModel.groupNumber,
-                            tripNumber: tripNumber,
-                            trainType: this.formModel.trainType,
-                            serviceNumber: response.data.serviceNumber,
-                            targetCode: response.data.targetCode,
-                            category: 'MM'
-                        };
-                        this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    } else {
-                        this.formModel = {
-                            groupNumber: this.formModel.groupNumber,
-                            tripNumber: tripNumber,
-                            trainType: this.formModel.trainType,
-                            serviceNumber: '',
-                            targetCode: '',
-                            category: 'MM'
-                        };
-                    }
-                }
-            });
-        },
-        commit() {
-            if (this.operation == OperationEvent.Train.addTrainId.menu.operation) {
-                /** 增加列车识别号*/
-                this.addTrainId();
-            } else if (this.operation == OperationEvent.Train.editTrainId.menu.operation) {
-                /** 修改列车识别号*/
-                this.editTrainId();
-            }
-        },
-        // 增加列车识别号
-        addTrainId() {
-            this.$refs['form'].validate((valid) => {
-                if (valid) {
-                    const model = this.formModel;
-                    const operate = {
-                        send: true,
-                        type: MapDeviceType.Train.type,
-                        operation: OperationEvent.Train.addTrainId.menu.operation,
-                        messages: [this.$t('tip.addTrainIdTip')],
-                        val: `${model.groupNumber}::${model.trainType}::${model.serviceNumber}::${model.tripNumber}::${model.targetCode}`
-                    };
-
-                    this.loading = true;
-                    this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                        this.loading = false;
-                        if (valid) {
-                            this.doClose();
-                            this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                            this.$refs.confirmTrain.doShow(operate);
-                        }
-                    }).catch(() => {
-                        this.loading = false;
-                        this.doClose();
-                        this.$refs.noticeInfo.doShow(operate);
-                    });
-                } else {
-                    return false;
-                }
-            });
-        },
-        // 修改列车识别号
-        editTrainId() {
-            this.$refs['form'].validate((valid) => {
-                if (valid) {
-                    const operate = {
-                        send: true,
-                        type: MapDeviceType.Train.type,
-                        operation: OperationEvent.Train.editTrainId.menu.operation,
-                        messages: [this.$t('tip.editTrainIdTip')],
-                        val: `${this.formModel.trainType}::${this.formModel.tripNumber}`
-                    };
-
-                    this.loading = true;
-                    this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                        this.loading = false;
-                        if (valid) {
-                            this.doClose();
-                            this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                            this.$refs.confirmTrain.doShow(operate);
-                        }
-                    }).catch(() => {
-                        this.loading = false;
-                        this.doClose();
-                        this.$refs.noticeInfo.doShow(operate);
-                    });
-                } else {
-                    return false;
-                }
-            });
-        },
-        cancel() {
-            const operate = {
-                type: MapDeviceType.Train.type,
-                operation: OperationEvent.Command.cancel.menu.operation
-            };
-
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                if (valid) {
-                    this.doClose();
-                }
-            }).catch(() => {
-                this.doClose();
-            });
-        }
-    }
-};
-</script>
diff --git a/src/jmap/theme/fuzhou_01/menus/dialog/trainCreate.vue b/src/jmap/theme/fuzhou_01/menus/dialog/trainCreate.vue
deleted file mode 100644
index 46c366226..000000000
--- a/src/jmap/theme/fuzhou_01/menus/dialog/trainCreate.vue
+++ /dev/null
@@ -1,153 +0,0 @@
-<template>
-  <el-dialog v-dialogDrag class="fuzhou-01__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="this.$t('menu.train')+this.$t('global.colon')" prop="trainCode">
-          <el-select v-model="trainCode" filterable :placeholder="this.$t('menu.train')">
-            <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="tripNumber">
-                    <el-select v-model="tripNumber" filterable placeholder="列车车次">
-                        <el-option v-for="no in trainNoList" :key="no" :label="no" :value="no"></el-option>
-                    </el-select>
-                    <div style="font-size: 12px;">(上行路线车次号选择偶数，下行路线车次号选择基数)</div>
-                </el-form-item> -->
-        <el-form-item :label="this.$t('menu.trainDirection')+this.$t('global.colon')" prop="direction">
-          <el-select v-model="direction" filterable :placeholder="this.$t('menu.trainDirection')">
-            <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">{{ this.$t('global.confirm') }}</el-button>
-          <el-button :id="domIdCancel" @click="cancel">{{ this.$t('global.cancel') }}</el-button>
-        </el-col>
-      </el-row>
-    </div>
-    <notice-info ref="noticeInfo" />
-  </el-dialog>
-</template>
-
-<script>
-import { mapGetters } from 'vuex';
-import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
-import NoticeInfo from './childDialog/childDialog/noticeInfo';
-
-export default {
-    name: 'RouteCreate',
-    components: {
-        NoticeInfo
-    },
-    data() {
-        return {
-            dialogShow: false,
-            loading: false,
-            trainList: [],
-            trainNoList: [],
-            directionList: [
-                {
-                    value: '2',
-                    label: this.$t('menu.up')
-                },
-                {
-                    value: '1',
-                    label: this.$t('menu.down')
-                }
-            ],
-            trainCode: '',
-            tripNumber: '',
-            direction: '',
-            selected: null
-        };
-    },
-    computed: {
-        ...mapGetters('map', [
-            'map'
-        ]),
-        show() {
-            return this.dialogShow && !this.$store.state.menuOperation.break;
-        },
-        domIdCancel() {
-            return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
-        },
-        domIdConfirm() {
-            return OperationEvent.Section.newtrain.menu.domId;
-        },
-        title() {
-            return this.$t('menu.settingTrain');
-        }
-    },
-    mounted() {
-        this.$nextTick(() => {
-            this.$store.dispatch('training/tipReload');
-        });
-    },
-    methods: {
-        loadInitData(map) {
-            if (map.trainList.length) {
-                this.trainList = map.trainList;
-            } else {
-                this.$messageBox(this.$t('error.getTrainListFailed'));
-            }
-        },
-        doShow(operate, selected) {
-            this.dialogShow = true;
-            this.selected = selected;
-            /** 加载列车数据*/
-            this.loadInitData(this.map);
-
-            this.$nextTick(function () {
-                this.$store.dispatch('training/emitTipFresh');
-            });
-        },
-        doClose() {
-            this.trainCode = '';
-            this.direction = '';
-            this.loading = false;
-            this.dialogShow = false;
-            this.$store.dispatch('training/emitTipFresh');
-        },
-        commit() {
-            const operate = {
-                send: true,
-                type: MapDeviceType.Section.type,
-                operation: OperationEvent.Section.newtrain.menu.operation,
-                val: '' + this.direction + '::' + this.trainCode
-            };
-            this.loading = true;
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                this.loading = false;
-                if (valid) {
-                    this.doClose();
-                }
-            }).catch(() => {
-                this.loading = false;
-                this.doClose();
-                this.$refs.noticeInfo.doShow(operate);
-            });
-        },
-        cancel() {
-            const operate = {
-                type: MapDeviceType.Section.type,
-                operation: OperationEvent.Command.cancel.menu.operation
-            };
-
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                if (valid) {
-                    this.doClose();
-                }
-            }).catch(() => {
-                this.doClose();
-            });
-        }
-    }
-};
-</script>
diff --git a/src/jmap/theme/fuzhou_01/menus/dialog/trainEditNumber.vue b/src/jmap/theme/fuzhou_01/menus/dialog/trainEditNumber.vue
deleted file mode 100644
index 441427f74..000000000
--- a/src/jmap/theme/fuzhou_01/menus/dialog/trainEditNumber.vue
+++ /dev/null
@@ -1,136 +0,0 @@
-<template>
-  <el-dialog
-    v-dialogDrag
-    class="fuzhou-01__systerm stand-stop-time"
-    :title="title"
-    :visible.sync="show"
-    width="320px"
-    :before-close="doClose"
-    :z-index="2000"
-    :modal="false"
-    :close-on-click-modal="false"
-  >
-    <el-form ref="form" size="small" label-width="120px" :model="addModel" :rules="rules">
-      <el-form-item :label="this.$t('menu.groupNumber')+this.$t('global.colon')" label-width="120px" prop="tripNumber">
-        <el-input v-model="addModel.tripNumber" />
-      </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">{{ $t('global.confirm') }}</el-button>
-      </el-col>
-      <el-col :span="8" :offset="4">
-        <el-button :id="domIdCancel" @click="cancel">{{ $t('global.cancel') }}</el-button>
-      </el-col>
-    </el-row>
-  </el-dialog>
-</template>
-
-<script>
-import { mapGetters } from 'vuex';
-import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
-
-export default {
-    name: 'TrainMove',
-    components: {
-    },
-    data() {
-        return {
-            trainNoList: [],
-            addModel: {
-                tripNumber: ''
-            },
-
-            rules: {
-                tripNumber: [
-                    { required: true, message: this.$t('rules.selectGroupNumber'), 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 this.$t('menu.menuTrain.editTrainNo');
-        }
-    },
-    mounted() {
-        this.$nextTick(() => {
-            this.$store.dispatch('training/tipReload');
-        });
-    },
-    methods: {
-        doShow(operate, selected) {
-            this.dialogShow = true;
-            this.$nextTick(function () {
-                this.$store.dispatch('training/emitTipFresh');
-            });
-        },
-        doClose() {
-            this.loading = false;
-            this.dialogShow = false;
-            this.$store.dispatch('training/emitTipFresh');
-            this.$store.dispatch('map/setTrainWindowShow', false);
-        },
-        commit() {
-            this.$refs['form'].validate((valid) => {
-                if (valid) {
-                    const operate = {
-                        send: true,
-                        type: MapDeviceType.Train.type,
-                        operation: OperationEvent.Train.editTrainNo.menu.operation
-                    };
-
-                    this.loading = true;
-                    this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                        this.loading = false;
-                        if (valid) {
-                            this.doClose();
-                        }
-                    }).catch(() => {
-                        this.loading = false;
-                        this.doClose();
-                    });
-                } else {
-                    return false;
-                }
-            });
-        },
-        cancel() {
-            const operate = {
-                type: MapDeviceType.Train.type,
-                operation: OperationEvent.Command.cancel.menu.operation
-            };
-
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                if (valid) {
-                    this.doClose();
-                }
-            }).catch(() => { this.doClose(); });
-        }
-    }
-};
-</script>
-<style scoped>
-    .fuzhou-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/jmap/theme/fuzhou_01/menus/dialog/trainMove.vue b/src/jmap/theme/fuzhou_01/menus/dialog/trainMove.vue
deleted file mode 100644
index 5a3bff7cb..000000000
--- a/src/jmap/theme/fuzhou_01/menus/dialog/trainMove.vue
+++ /dev/null
@@ -1,199 +0,0 @@
-<template>
-  <el-dialog
-    v-dialogDrag
-    class="fuzhou-01__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="this.$t('menu.groupNumber')+this.$t('global.colon')" 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">{{ $t('menu.sourceTrainWindow') }}</span>
-          <div style="position: relative; top:-10px;">
-            <el-form-item prop="stationStandSource">
-              <span slot="label">{{ $t('menu.station') + $t('global.colon') }}</span>
-              <el-select v-model="addModel.stationStandSource" filterable :placeholder="this.$t('global.choose')">
-                <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="this.$t('menu.trainWindow')+this.$t('global.colon')" 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">{{ $t('menu.targetTrainWindow') }}</span>
-          <div style="position: relative; top:-10px;">
-            <el-form-item prop="stationStandGoal">
-              <span slot="label">{{ $t('menu.station') + $t('global.colon') }}</span>
-              <el-select v-model="addModel.stationStandGoal" filterable :placeholder="this.$t('global.choose')">
-                <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="this.$t('menu.trainWindow')+this.$t('global.colon')" 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">{{ $t('global.confirm') }}</el-button>
-      </el-col>
-      <el-col :span="8" :offset="4">
-        <el-button :id="domIdCancel" @click="cancel">{{ $t('global.cancel') }}</el-button>
-      </el-col>
-    </el-row>
-  </el-dialog>
-</template>
-
-<script>
-import { mapGetters } from 'vuex';
-import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
-
-export default {
-    name: 'TrainMove',
-    components: {
-    },
-    data() {
-        return {
-            trainNoList: [],
-            addModel: {
-                tripNumber: '',
-                trainSource: '',
-                stationStandSource: '',
-                trainGoal: '',
-                stationStandGoal: ''
-            },
-
-            rules: {
-                tripNumber: [
-                    { required: true, message: this.$t('rules.selectGroupNumber'), trigger: 'blur' }
-                ],
-                trainSource: [
-                    { required: true, message: this.$t('rules.enterTheTripNumber'), trigger: 'blur' }
-                ],
-                stationStandSource: [
-                    { required: true, message: this.$t('rules.selectStation'), trigger: 'change' }
-                ],
-                trainGoal: [
-                    { required: true, message: this.$t('rules.enterTheTripNumber'), trigger: 'blur' }
-                ],
-                stationStandGoal: [
-                    { required: true, message: this.$t('rules.selectStation'), trigger: 'change' }
-                ]
-            },
-            dialogShow: false,
-            loading: false
-        };
-    },
-    computed: {
-        ...mapGetters('map', [
-            'stationStandList'
-        ]),
-        show() {
-            return this.dialogShow && !this.$store.state.menuOperation.break;
-        },
-        domIdCancel() {
-            return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
-        },
-        domIdConfirm() {
-            return this.dialogShow ? OperationEvent.Train.moveTrainId.menu.domId : '';
-        },
-        title() {
-            return this.$t('menu.menuTrain.moveTrainId');
-        }
-    },
-    mounted() {
-        this.$nextTick(() => {
-            this.$store.dispatch('training/tipReload');
-        });
-    },
-    methods: {
-        doShow(operate, selected) {
-            this.dialogShow = true;
-            this.$nextTick(function () {
-                this.$store.dispatch('training/emitTipFresh');
-            });
-        },
-        doClose() {
-            this.loading = false;
-            this.dialogShow = false;
-            this.$store.dispatch('training/emitTipFresh');
-            this.$store.dispatch('map/setTrainWindowShow', false);
-        },
-        commit() {
-            this.$refs['form'].validate((valid) => {
-                if (valid) {
-                    const operate = {
-                        send: true,
-                        type: MapDeviceType.Train.type,
-                        operation: OperationEvent.Train.moveTrainId.menu.operation
-                    };
-
-                    this.loading = true;
-                    this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                        this.loading = false;
-                        if (valid) {
-                            this.doClose();
-                        }
-                    }).catch(() => {
-                        this.loading = false;
-                        this.doClose();
-                        // this.$refs.noticeInfo.doShow(operate);
-                    });
-                } else {
-                    return false;
-                }
-            });
-        },
-        cancel() {
-            const operate = {
-                type: MapDeviceType.Train.type,
-                operation: OperationEvent.Command.cancel.menu.operation
-            };
-
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                if (valid) {
-                    this.doClose();
-                }
-            }).catch(() => { this.doClose(); });
-        }
-    }
-};
-</script>
-<style scoped>
-    .fuzhou-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/jmap/theme/fuzhou_01/menus/dialog/trainSwitch.vue b/src/jmap/theme/fuzhou_01/menus/dialog/trainSwitch.vue
deleted file mode 100644
index 90174fdbc..000000000
--- a/src/jmap/theme/fuzhou_01/menus/dialog/trainSwitch.vue
+++ /dev/null
@@ -1,204 +0,0 @@
-<template>
-  <el-dialog
-    v-dialogDrag
-    class="fuzhou-01__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">{{ $t('menu.sourceTrainWindow') }}</span>
-          <div style="position: relative; top:-10px;">
-            <el-form-item :label="this.$t('menu.groupNumber')+this.$t('global.colon')" prop="trainNumberSource">
-              <el-input v-model="addModel.trainNumberSource" />
-            </el-form-item>
-            <el-form-item prop="stationStandSource">
-              <span slot="label">{{ $t('menu.station') + $t('global.colon') }}</span>
-              <el-select v-model="addModel.stationStandSource" filterable :placeholder="this.$t('global.choose')">
-                <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="this.$t('menu.trainWindow')+this.$t('global.colon')" 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">{{ $t('menu.targetTrainWindow') }}</span>
-          <div style="position: relative; top:-10px;">
-            <el-form-item :label="this.$t('menu.groupNumber')+this.$t('global.colon')" prop="trainNumberGoal">
-              <el-input v-model="addModel.trainNumberGoal" />
-            </el-form-item>
-            <el-form-item prop="stationStandGoal">
-              <span slot="label">{{ $t('menu.station') + $t('global.colon') }}</span>
-              <el-select v-model="addModel.stationStandGoal" filterable :placeholder="this.$t('global.choose')">
-                <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="this.$t('menu.trainWindow')+this.$t('global.colon')" 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">{{ $t('global.confirm') }}</el-button>
-      </el-col>
-      <el-col :span="8" :offset="4">
-        <el-button :id="domIdCancel" @click="cancel">{{ $t('global.cancel') }}</el-button>
-      </el-col>
-    </el-row>
-  </el-dialog>
-</template>
-
-<script>
-import { mapGetters } from 'vuex';
-import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
-
-export default {
-    name: 'TrainSwitch',
-    components: {
-    },
-    data() {
-        return {
-            trainNoList: [],
-            addModel: {
-                trainNumberSource: '',
-                trainSource: '',
-                stationStandSource: '',
-                trainGoal: '',
-                stationStandGoal: '',
-                trainNumberGoal: ''
-            },
-
-            rules: {
-                trainNumberSource: [
-                    { required: true, message: this.$t('rules.selectGroupNumber'), trigger: 'blur' }
-                ],
-                trainSource: [
-                    { required: true, message: this.$t('rules.enterTheTripNumber'), trigger: 'blur' }
-                ],
-                stationStandSource: [
-                    { required: true, message: this.$t('rules.selectStation'), trigger: 'change' }
-                ],
-                trainNumberGoal: [
-                    { required: true, message: this.$t('rules.selectGroupNumber'), trigger: 'blur' }
-                ],
-                trainGoal: [
-                    { required: true, message: this.$t('rules.enterTheTripNumber'), trigger: 'blur' }
-                ],
-                stationStandGoal: [
-                    { required: true, message: this.$t('rules.selectStation'), trigger: 'change' }
-                ]
-            },
-            dialogShow: false,
-            loading: false
-        };
-    },
-    computed: {
-        ...mapGetters('map', [
-            'stationStandList'
-        ]),
-        show() {
-            return this.dialogShow && !this.$store.state.menuOperation.break;
-        },
-        domIdCancel() {
-            return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
-        },
-        domIdConfirm() {
-            return this.dialogShow ? OperationEvent.Train.moveTrainId.menu.domId : '';
-        },
-        title() {
-            return this.$t('menu.menuTrain.switchTrainId');
-        }
-    },
-    mounted() {
-        this.$nextTick(() => {
-            this.$store.dispatch('training/tipReload');
-        });
-    },
-    methods: {
-        doShow(operate, selected) {
-            this.dialogShow = true;
-            this.$nextTick(function () {
-                this.$store.dispatch('training/emitTipFresh');
-            });
-        },
-        doClose() {
-            this.loading = false;
-            this.dialogShow = false;
-            this.$store.dispatch('training/emitTipFresh');
-            this.$store.dispatch('map/setTrainWindowShow', false);
-        },
-        commit() {
-            this.$refs['form'].validate((valid) => {
-                if (valid) {
-                    const operate = {
-                        send: true,
-                        type: MapDeviceType.Train.type,
-                        operation: OperationEvent.Train.moveTrainId.menu.operation
-                    };
-
-                    this.loading = true;
-                    this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                        this.loading = false;
-                        if (valid) {
-                            this.doClose();
-                        }
-                    }).catch(() => {
-                        this.loading = false;
-                        this.doClose();
-                        // this.$refs.noticeInfo.doShow(operate);
-                    });
-                } else {
-                    return false;
-                }
-            });
-        },
-        cancel() {
-            const operate = {
-                type: MapDeviceType.Train.type,
-                operation: OperationEvent.Command.cancel.menu.operation
-            };
-
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                if (valid) {
-                    this.doClose();
-                }
-            }).catch(() => { this.doClose(); });
-        }
-    }
-};
-</script>
-<style scoped>
-    .fuzhou-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/jmap/theme/fuzhou_01/menus/menuBar.vue b/src/jmap/theme/fuzhou_01/menus/menuBar.vue
deleted file mode 100644
index 322e3c49f..000000000
--- a/src/jmap/theme/fuzhou_01/menus/menuBar.vue
+++ /dev/null
@@ -1,827 +0,0 @@
-<template>
-  <div id="menuBar">
-    <div class="nav">
-      <template v-for="(item,i) in menu">
-        <template v-if="noShowingChildren(item.children)">
-          <li :id="item.operate.domId" :key="i" class="nav-li" @click="hookClick(item)">
-            <span class="nav-li-text">{{ item.title }}</span>
-          </li>
-        </template>
-        <template v-else>
-          <li :id="item.operate.domId" :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&&hasShowingChildren(child.children)"
-                >
-                  <li
-                    :id="child.operate.domId"
-                    :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.show"
-                          :id="grandchild.operate.domId"
-                          :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.show"
-                    :id="child.operate.domId"
-                    :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-convert ref="stationControlConvert" />
-    <password-box ref="passwordBox" @setLoginResult="getLoginResult" />
-    <view-train-id ref="viewTrainId" />
-    <view-name ref="viewName" />
-    <view-device ref="viewDevice" />
-    <notice-info ref="noticeInfo" />
-    <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, OperationEvent } from '@/scripts/ConstDic';
-// import { OperateMode } from '@/scripts/ConstDic';
-import { menuBarConvert, SystemType } from './utils/menuItemStatus';
-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 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 NoticeInfo from './dialog/childDialog/childDialog/noticeInfo';
-import { EventBus } from '@/scripts/event-bus';
-
-export default {
-    name: 'MenuBar',
-    components: {
-        NoticeInfo,
-        StationControlConvert,
-        PasswordBox,
-        ViewTrainId,
-        ViewName,
-        ViewDevice,
-        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: 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,
-                                froce: 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
-                            }
-                        ]
-                    }
-                ],
-                central: [
-                    {
-                        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,
-                                froce: true
-                            },
-                            {
-                                title: this.$t('menu.menuBar.forcedStationControl'),
-                                click: this.mandatoryStationControl,
-                                operate: OperationEvent.StationControl.forcedStationControl.password,
-                                froce: 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('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: {
-        initMenu(menu) {
-            this.menu = menuBarConvert(this.menuNormal[SystemType[this.$store.state.training.prdType]], this.$store.state.training.operatemode);
-            this.clickEvent();
-            this.closeMenu(true);
-        },
-        clickEvent() {
-            const self = this;
-            window.onclick = function (e) {
-                if (document.getElementById('menuBar')) {
-                    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(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/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('training/next', operate).then(({ valid }) => {
-                if (valid) {
-                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                }
-            });
-        },
-        // 转为站控
-        turnToStationControl(order) {
-            const operate = {
-                type: 'bar',
-                operation: order.operation
-            };
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                if (valid) {
-                    this.closeMenu(true);
-                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    this.$refs.stationControlConvert.doShow(operate);
-                }
-            });
-        },
-        // 强制转为站控
-        mandatoryStationControl(order) {
-            const operate = {
-                type: 'bar',
-                operation: order.operation
-            };
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                if (valid) {
-                    this.closeMenu(true);
-                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    this.$refs.passwordBox.doShow(operate);
-                }
-            });
-        },
-        // 请求中控
-        conterStationControl(order) {
-            const operate = {
-                type: 'bar',
-                operation: order.operation
-            };
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                if (valid) {
-                    this.closeMenu(true);
-                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    this.$refs.stationControlConvert.doShow(operate);
-                }
-            });
-        },
-        // 设置列车识别号显示
-        setTrainIdDisplay(order) {
-            const operate = {
-                type: 'bar',
-                operation: order.operation
-            };
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                if (valid) {
-                    this.closeMenu(true);
-                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    this.$refs.viewTrainId.doShow(operate);
-                }
-            });
-        },
-        // 设置设备显示
-        setNameDisplay(order) {
-            const operate = {
-                type: 'bar',
-                operation: order.operation
-            };
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                if (valid) {
-                    this.closeMenu(true);
-                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    this.$refs.viewName.doShow(operate);
-                }
-            });
-        },
-        // 设置名称显示
-        setDeviceDisplay(order) {
-            const operate = {
-                type: 'bar',
-                operation: order.operation
-            };
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                if (valid) {
-                    this.closeMenu(true);
-                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    this.$refs.viewDevice.doShow(operate);
-                }
-            });
-        },
-        // 添加计划车
-        addPlanTrain(order) {
-            const operate = {
-                type: 'bar',
-                operation: order.operation
-            };
-            this.$store.dispatch('training/next', 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/next', 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/next', 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/next', 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/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');
-        },
-        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(this.$t('menu.menuBar.implemented'), this.$t('global.tips'), {
-                confirmButtonText: this.$t('global.confirm'),
-                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: 190px;
-    $menuItemPadding: 5px;
-
-    #menuBar {
-        z-index: 10;
-        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;
-    }
-
-    .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;
-    }
-</style>
diff --git a/src/jmap/theme/fuzhou_01/menus/menuDialog/childDialog/twoConfirmation.vue b/src/jmap/theme/fuzhou_01/menus/menuDialog/childDialog/twoConfirmation.vue
deleted file mode 100644
index d7a64af6b..000000000
--- a/src/jmap/theme/fuzhou_01/menus/menuDialog/childDialog/twoConfirmation.vue
+++ /dev/null
@@ -1,142 +0,0 @@
-<template>
-  <el-dialog
-    v-dialogDrag
-    class="fuzhou-01__systerm two-confirmation"
-    :title="$t('menu.menuChildDialog.secondaryConfirmation')"
-    :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">{{ $t('menu.menuChildDialog.confirm') }}</el-button>
-      </el-col>
-      <el-col :span="6" :offset="4">
-        <el-button :id="domIdCancel" @click="cancel">{{ $t('menu.menuChildDialog.close') }}</el-button>
-      </el-col>
-    </el-row>
-    <notice-info ref="noticeInfo" />
-  </el-dialog>
-</template>
-
-<script>
-import { OperationEvent, checkOperationIsCurrentOperate } from '@/scripts/ConstDic';
-import NoticeInfo from '../../dialog/childDialog/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 [];
-        }
-    },
-    mounted() {
-        this.$nextTick(() => {
-            this.$store.dispatch('training/tipReload');
-        });
-    },
-    methods: {
-        doShow(operate) {
-            this.domIdConfirm = '';
-            if (checkOperationIsCurrentOperate(operate.operation, OperationEvent.StationControl.forcedStationControl)) {
-                this.domIdConfirm = OperationEvent.StationControl.forcedStationControl.confirm.domId;
-            } else if (checkOperationIsCurrentOperate(operate.operation, OperationEvent.StationControl.requestStationControl)) {
-                this.domIdConfirm = OperationEvent.StationControl.requestStationControl.confirm.domId;
-            } else if (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/next', operate).then(({ valid }) => {
-                if (valid) {
-                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    this.doClose();
-                }
-            });
-        },
-        forEachDoHandler(selection, handler) {
-            selection.forEach(elem => {
-                handler(elem);
-            });
-        },
-        commit() {
-            if (this.operate) {
-                this.loading = true;
-                this.forEachDoHandler(this.operate.selection || [], elem => {
-                    const operate = {
-                        send: true,
-                        type: this.operate.type,
-                        val: elem.code
-                    };
-
-                    if (checkOperationIsCurrentOperate(this.operate.operation, OperationEvent.StationControl.forcedStationControl)) {
-                        operate.operation = OperationEvent.StationControl.forcedStationControl.confirm.operation;
-                    } else if (checkOperationIsCurrentOperate(this.operate.operation, OperationEvent.StationControl.requestStationControl)) {
-                        operate.operation = OperationEvent.StationControl.requestStationControl.confirm.operation;
-                    } else if (checkOperationIsCurrentOperate(this.operate.operation, OperationEvent.StationControl.requestCentralControl)) {
-                        operate.operation = OperationEvent.StationControl.requestCentralControl.confirm.operation;
-                    }
-
-                    this.doClose();
-                    this.$emit('setOperate', { selection: this.operate.selection, commit: true });
-                    this.$store.dispatch('training/next', operate).then(({ valid, response }) => {
-                        if (valid) {
-                            this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                        }
-                    }).catch(() => {
-                        this.$refs.noticeInfo.doShow(operate);
-                    });
-                });
-                this.loading = false;
-            }
-        }
-    }
-};
-</script>
diff --git a/src/jmap/theme/fuzhou_01/menus/menuDialog/childDialog/userAdd.vue b/src/jmap/theme/fuzhou_01/menus/menuDialog/childDialog/userAdd.vue
deleted file mode 100644
index 81009d4c1..000000000
--- a/src/jmap/theme/fuzhou_01/menus/menuDialog/childDialog/userAdd.vue
+++ /dev/null
@@ -1,172 +0,0 @@
-<template>
-  <el-dialog
-    v-dialogDrag
-    class="fuzhou-01__systerm user-add"
-    :title="title"
-    :visible.sync="show"
-    width="420px"
-    :before-close="doClose"
-    :z-index="2000"
-    :modal="false"
-    :close-on-click-modal="false"
-    append-to-body
-  >
-    <div style="padding: 15px 40px; border: 1px double lightgray; margin: 20px 10px; ">
-      <el-form ref="form" size="small" label-width="90px" :model="model" label-position="left" :rules="rules">
-        <el-form-item :label="$t('menu.menuChildDialog.jobNumber')" prop="jobNumber">
-          <el-input v-model="model.jobNumber" />
-        </el-form-item>
-        <el-form-item :label="$t('menu.menuChildDialog.userName')" prop="userName">
-          <el-input v-model="model.userName" />
-        </el-form-item>
-        <el-form-item :label="$t('menu.menuChildDialog.password')" prop="password">
-          <el-input v-model="model.password" type="password" />
-        </el-form-item>
-        <el-form-item :label="$t('menu.menuChildDialog.confirmPassword')" prop="confirm">
-          <el-input v-model="model.confirm" type="password" />
-        </el-form-item>
-
-      </el-form>
-    </div>
-    <el-row justify="center" class="button-group">
-      <el-col :span="8" :offset="6">
-        <el-button :id="domIdConfirm" type="primary" :loading="loading" @click="commit">{{ $t('menu.menuChildDialog.determine') }}</el-button>
-      </el-col>
-      <el-col :span="8" :offset="0">
-        <el-button :id="domIdCancel" @click="cancel">{{ $t('menu.menuChildDialog.cancel') }}</el-button>
-      </el-col>
-    </el-row>
-  </el-dialog>
-</template>
-
-<script>
-import { mapGetters } from 'vuex';
-import { OperationEvent } from '@/scripts/ConstDic';
-
-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: this.$t('menu.menuChildDialog.inputJobNumber'), trigger: 'blur' }
-                ],
-                userName: [
-                    { required: true, message: this.$t('menu.menuChildDialog.inputUserName'), trigger: 'blur' }
-                ],
-                password: [
-                    { required: true, message: this.$t('menu.menuChildDialog.inputPassword'), trigger: 'change' }
-                ],
-                confirm: [
-                    { required: true, message: this.$t('menu.menuChildDialog.inputPasswordAgain'), 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 this.$t('menu.menuChildDialog.addUser');
-        }
-    },
-    mounted() {
-        this.$nextTick(() => {
-            this.$store.dispatch('training/tipReload');
-        });
-    },
-    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) {
-                    const operate = {
-                        type: this.operate.type,
-                        operation: OperationEvent.Command.close.confirm.operation
-                    };
-
-                    this.loading = true;
-                    this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                        this.loading = false;
-                        if (valid) {
-                            if (this.model.password === this.model.confirm) {
-                                this.doClose();
-                                this.$emit('operateUser', this.model);
-                            } else {
-                                this.$messageBox(this.$t('menu.menuChildDialog.passwordInconsistent'));
-                            }
-                        }
-                    });
-                } else {
-                    return false;
-                }
-            });
-        },
-        cancel() {
-            const operate = {
-                type: this.operate.type,
-                operation: OperationEvent.Command.cancel.menu.operation
-            };
-
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                if (valid) {
-                    this.doClose();
-                }
-            }).catch(() => { this.doClose(); this.model; });
-        }
-    }
-};
-</script>
-<style scoped>
-    .fuzhou-01__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/jmap/theme/fuzhou_01/menus/menuDialog/childDialog/userDelete.vue b/src/jmap/theme/fuzhou_01/menus/menuDialog/childDialog/userDelete.vue
deleted file mode 100644
index 7e07a21db..000000000
--- a/src/jmap/theme/fuzhou_01/menus/menuDialog/childDialog/userDelete.vue
+++ /dev/null
@@ -1,143 +0,0 @@
-<template>
-  <el-dialog
-    v-dialogDrag
-    class="fuzhou-01__systerm user-delete"
-    :title="title"
-    :visible.sync="show"
-    width="260px"
-    :before-close="doClose"
-    :z-index="2000"
-    :modal="false"
-    :close-on-click-modal="false"
-    append-to-body
-  >
-    <div style="padding-left: 10px; padding-bottom: 10px">
-      <i class="el-icon-info" />
-      <template v-for="(message,index) in messages">
-        <span :key="index">{{ message }}</span>
-      </template>
-    </div>
-    <el-row justify="center" class="button-group">
-      <el-col :span="8" :offset="3">
-        <el-button :id="domIdConfirm" type="primary" :loading="loading" @click="commit">{{ $t('menu.menuChildDialog.determine') }}</el-button>
-      </el-col>
-      <el-col :span="8" :offset="2">
-        <el-button :id="domIdCancel" @click="cancel">{{ $t('menu.menuChildDialog.cancel') }}</el-button>
-      </el-col>
-    </el-row>
-  </el-dialog>
-</template>
-<script>
-import { mapGetters } from 'vuex';
-import { OperationEvent } from '@/scripts/ConstDic';
-
-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 this.$t('menu.menuChildDialog.deleteUser');
-        }
-    },
-    mounted() {
-        this.$nextTick(() => {
-            this.$store.dispatch('training/tipReload');
-        });
-    },
-    methods: {
-        doShow(operate, selected) {
-            // 非断电激活时设置初始值
-            if (!this.dialogShow) {
-                this.loading = false;
-                this.operate = operate || {};
-                this.operation = operate.operation;
-                this.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) {
-                const operate = {
-                    type: this.operate.type,
-                    operation: OperationEvent.Command.close.confirm.operation
-                };
-
-                this.loading = true;
-                this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                    this.loading = false;
-                    if (valid) {
-                        this.doClose();
-                        this.$emit('operateUser', this.model);
-                    }
-                });
-            } else {
-                this.$messageBox(this.$t('menu.menuChildDialog.selectTips'));
-            }
-        },
-        cancel() {
-            const operate = {
-                type: this.operate.type,
-                operation: OperationEvent.Command.cancel.menu.operation
-            };
-
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                if (valid) {
-                    this.doClose();
-                }
-            }).catch(() => { this.doClose(); });
-        }
-    }
-};
-</script>
-<style scoped>
-    .fuzhou-01__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/jmap/theme/fuzhou_01/menus/menuDialog/childDialog/userEdit.vue b/src/jmap/theme/fuzhou_01/menus/menuDialog/childDialog/userEdit.vue
deleted file mode 100644
index 6e3bf3039..000000000
--- a/src/jmap/theme/fuzhou_01/menus/menuDialog/childDialog/userEdit.vue
+++ /dev/null
@@ -1,189 +0,0 @@
-<template>
-  <el-dialog
-    v-dialogDrag
-    class="fuzhou-01__systerm user-edit"
-    :title="title"
-    :visible.sync="show"
-    width="420px"
-    :before-close="doClose"
-    :z-index="2000"
-    :modal="false"
-    :close-on-click-modal="false"
-    append-to-body
-  >
-    <div style="padding: 15px 40px; border: 1px double lightgray; margin: 20px 10px; ">
-      <el-form ref="form" size="small" label-width="90px" :model="model" label-position="left" :rules="rules">
-        <el-form-item :label="$t('menu.menuChildDialog.jobNumber')" prop="jobNumber">
-          <el-input v-model="model.jobNumber" disabled />
-        </el-form-item>
-        <el-form-item :label="$t('menu.menuChildDialog.userName')" prop="userName">
-          <el-input v-model="model.userName" disabled />
-        </el-form-item>
-        <el-form-item :label="$t('menu.menuChildDialog.originalPassword')" prop="oldPassword">
-          <el-input v-model="model.oldPassword" type="password" />
-        </el-form-item>
-        <el-form-item :label="$t('menu.menuChildDialog.password')" prop="password">
-          <el-input v-model="model.password" type="password" />
-        </el-form-item>
-        <el-form-item :label="$t('menu.menuChildDialog.confirmPassword')" prop="confirm">
-          <el-input v-model="model.confirm" type="password" />
-        </el-form-item>
-
-      </el-form>
-    </div>
-    <el-row justify="center" class="button-group">
-      <el-col :span="8" :offset="6">
-        <el-button :id="domIdConfirm" type="primary" :loading="loading" @click="commit">{{ $t('menu.menuChildDialog.determine') }}</el-button>
-      </el-col>
-      <el-col :span="8" :offset="0">
-        <el-button :id="domIdCancel" @click="cancel">{{ $t('menu.menuChildDialog.cancel') }}</el-button>
-      </el-col>
-    </el-row>
-  </el-dialog>
-</template>
-
-<script>
-import { mapGetters } from 'vuex';
-import { OperationEvent } from '@/scripts/ConstDic';
-
-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: this.$t('menu.menuChildDialog.inputJobNumber'), trigger: 'blur' }
-                ],
-                userName: [
-                    { required: true, message: this.$t('menu.menuChildDialog.inputUserName'), trigger: 'blur' }
-                ],
-                oldPassword: [
-                    { required: true, message: this.$t('menu.menuChildDialog.inputOriginal'), trigger: 'change' }
-                ],
-                password: [
-                    { required: true, message: this.$t('menu.menuChildDialog.inputNewPassword'), trigger: 'change' }
-                ],
-                confirm: [
-                    { required: true, message: this.$t('menu.menuChildDialog.inputNewAgain'), 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 this.$t('menu.menuChildDialog.userEditPage');
-        }
-    },
-    mounted() {
-        this.$nextTick(() => {
-            this.$store.dispatch('training/tipReload');
-        });
-    },
-    methods: {
-        doShow(operate, selected) {
-            // 非断电激活时设置初始值
-            if (!this.dialogShow) {
-                this.loading = false;
-                this.operate = operate || {};
-                this.operation = operate.operation;
-                this.$nextTick(() => {
-                    this.$refs.form.resetFields();
-                    this.selected = selected;
-                    if (selected) {
-                        this.model.jobNumber = selected.jobNumber;
-                        this.model.userName = selected.userName;
-                    }
-                });
-            }
-
-            this.dialogShow = true;
-            this.$nextTick(function () {
-                this.$store.dispatch('training/emitTipFresh');
-            });
-        },
-        doClose() {
-            this.loading = false;
-            this.dialogShow = false;
-            this.$store.dispatch('training/emitTipFresh');
-        },
-        commit() {
-            this.$refs['form'].validate((valid) => {
-                if (valid) {
-                    const operate = {
-                        type: this.operate.type,
-                        operation: OperationEvent.Command.close.confirm.operation
-                    };
-
-                    this.loading = true;
-                    this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                        this.loading = false;
-                        if (valid) {
-                            if (this.selected.password !== this.model.oldPassword) {
-                                this.$messageBox(this.$t('menu.menuChildDialog.originalPasswordError'));
-                            } else if (this.model.password !== this.model.confirm) {
-                                this.$messageBox(this.$t('menu.menuChildDialog.passwordError'));
-                            } else if (this.model.oldPassword === this.model.password) {
-                                this.$messageBox(this.$t('menu.menuChildDialog.passwordSame'));
-                            } else {
-                                this.doClose();
-                                this.$emit('operateUser', this.model);
-                            }
-                        }
-                    });
-                } else {
-                    return false;
-                }
-            });
-        },
-        cancel() {
-            const operate = {
-                type: this.operate.type,
-                operation: OperationEvent.Command.cancel.menu.operation
-            };
-
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                if (valid) {
-                    this.doClose();
-                }
-            }).catch(() => { this.doClose(); });
-        }
-    }
-};
-</script>
-<style scoped>
-    .fuzhou-01__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/jmap/theme/fuzhou_01/menus/menuDialog/helpAbout.vue b/src/jmap/theme/fuzhou_01/menus/menuDialog/helpAbout.vue
deleted file mode 100644
index f19854741..000000000
--- a/src/jmap/theme/fuzhou_01/menus/menuDialog/helpAbout.vue
+++ /dev/null
@@ -1,140 +0,0 @@
-<template>
-  <el-dialog
-    v-dialogDrag
-    class="fuzhou-01__systerm manage-user"
-    :title="title"
-    :visible.sync="show"
-    width="600px"
-    :before-close="doClose"
-    :z-index="2000"
-    :modal="false"
-    :close-on-click-modal="false"
-  >
-    <div style="height: 70px;">
-      <div style="position: relative; left: 10px;" />
-      <div style="position: relative; left: 80px;">
-        <div style="width:100%">
-          <span style="padding-left: 60px">{{ $t('menu.menuDialog.versionName') }}</span>
-          <el-button
-            :id="domIdConfirm"
-            style="position: absolute; right: 95px;"
-            type="primary"
-            :loading="loading"
-            @click="commit"
-          >{{ $t('menu.menuDialog.confirm') }}</el-button>
-        </div>
-        <div style="width:100%; padding-top: 20px">
-          <span> {{ $t('menu.menuDialog.copyright') }}</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="$t('menu.menuDialog.moduleName')" width="180" />
-        <el-table-column prop="version" :label="$t('menu.menuDialog.version')" width="180" />
-        <el-table-column prop="updateDate" :label="$t('menu.menuDialog.modifyDate')" />
-      </el-table>
-    </div>
-  </el-dialog>
-</template>
-<script>
-import { OperationEvent } from '@/scripts/ConstDic';
-
-export default {
-    name: 'ManageUser',
-    data() {
-        return {
-            tableData: [
-                {
-                    moduleName: this.$t('menu.menuDialog.mainProgramVersion'),
-                    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 this.$t('menu.menuDialog.about');
-        }
-    },
-    mounted() {
-        this.$nextTick(() => {
-            this.$store.dispatch('training/tipReload');
-        });
-    },
-    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() {
-            const operate = {
-                type: this.operate.type,
-                operation: OperationEvent.Command.close.menu.operation
-            };
-
-            this.loading = true;
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                this.loading = false;
-                if (valid) {
-                    this.doClose();
-                }
-            }).catch(() => {
-                this.loading = false;
-                this.doClose();
-            });
-        },
-        cancel() {
-            const operate = {
-                type: this.operate.type,
-                operation: OperationEvent.Command.cancel.menu.operation
-            };
-
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                if (valid) {
-                    this.doClose();
-                }
-            }).catch(() => { this.doClose(); });
-        }
-    }
-};
-</script>
-<style scoped>
-    .fuzhou-01__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/jmap/theme/fuzhou_01/menus/menuDialog/manageUser.vue b/src/jmap/theme/fuzhou_01/menus/menuDialog/manageUser.vue
deleted file mode 100644
index c1b8e15a0..000000000
--- a/src/jmap/theme/fuzhou_01/menus/menuDialog/manageUser.vue
+++ /dev/null
@@ -1,309 +0,0 @@
-<template>
-  <el-dialog
-    v-dialogDrag
-    class="fuzhou-01__systerm manage-user"
-    :title="title"
-    :visible.sync="show"
-    width="420px"
-    :before-close="doClose"
-    :z-index="2000"
-    :modal="false"
-    :close-on-click-modal="false"
-  >
-    <div style="padding: 5px 5px; border: 1px double lightgray; margin: 20px 0px; ">
-      <span class="base-label">{{ $t('menu.menuDialog.userList') }}</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="$t('menu.menuDialog.jobNumber')" width="120">
-              <template slot-scope="scope">
-                <span>{{ scope.row.jobNumber }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column prop="userName" :label="$t('menu.menuDialog.userName')">
-              <template slot-scope="scope">
-                <span>{{ scope.row.userName }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column width="20" />
-          </el-table>
-        </el-col>
-        <el-col :span="4">
-          <el-button :id="domIdFreshUser" style="margin-top: 140px; margin-left: 10px;" @click="freshUser">{{ $t('menu.menuDialog.refresh') }}
-          </el-button>
-          <el-button :id="domIdAddUser" style="margin-top: 30px; margin-left: 10px;" @click="addUser">{{ $t('menu.menuDialog.add') }}
-          </el-button>
-          <el-button :id="domIdEditUser" style="margin-top: 30px; margin-left: 10px;" @click="editUser">{{ $t('menu.menuDialog.modify') }}
-          </el-button>
-          <el-button :id="domIdDelUser" style="margin-top: 30px; margin-left: 10px;" @click="delUser">{{ $t('menu.menuDialog.delete') }}
-          </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">{{ $t('menu.menuDialog.confirm') }}</el-button>
-      </el-col>
-      <el-col :span="8" :offset="0">
-        <el-button :id="domIdCancel" @click="cancel">{{ $t('menu.menuDialog.cancel') }}</el-button>
-      </el-col>
-    </el-row>
-    <user-add ref="userAdd" @operateUser="operateUser" />
-    <user-edit ref="userEdit" @operateUser="operateUser" />
-    <user-delete ref="userDelete" @operateUser="operateUser" />
-  </el-dialog>
-</template>
-
-<script>
-import { mapGetters } from 'vuex';
-import UserAdd from './childDialog/userAdd';
-import UserEdit from './childDialog/userEdit';
-import UserDelete from './childDialog/userDelete';
-import { OperationEvent } from '@/scripts/ConstDic';
-
-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 this.$t('menu.menuDialog.userManage');
-        }
-    },
-    mounted() {
-        this.$nextTick(() => {
-            this.$store.dispatch('training/tipReload');
-        });
-    },
-    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() {
-            const operate = {
-                type: this.operate.type,
-                operation: OperationEvent.Command.manage.addUser.operation
-            };
-
-            this.loading = true;
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                this.loading = false;
-                if (valid) {
-                    this.$refs.userAdd.doShow(operate);
-                }
-            }).catch(() => {
-                this.loading = false;
-            });
-        },
-        // 编辑用户
-        editUser() {
-            if (this.selected) {
-                const operate = {
-                    type: this.operate.type,
-                    operation: OperationEvent.Command.manage.editUser.operation
-                };
-
-                this.loading = true;
-                this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                    this.loading = false;
-                    if (valid) {
-                        this.$refs.userEdit.doShow(operate, this.selected);
-                    }
-                }).catch(() => {
-                    this.loading = false;
-                });
-            } else {
-                this.$messageBox(this.$t('menu.menuDialog.selectUser'));
-            }
-        },
-        // 删除用户
-        delUser() {
-            if (this.selected) {
-                const operate = {
-                    type: this.operate.type,
-                    operation: OperationEvent.Command.manage.delUser.operation,
-                    messages: [`${this.$t('menu.menuDialog.deleteMessageOne')} ${this.selected.userName} ${this.$t('menu.menuDialog.deleteMessageTwo')}`]
-                };
-
-                this.loading = true;
-                this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                    this.loading = false;
-                    if (valid) {
-                        this.$refs.userDelete.doShow(operate, this.selected);
-                    }
-                }).catch(() => {
-                    this.loading = false;
-                });
-            } else {
-                this.$messageBox(this.$t('menu.menuDialog.selectUser'));
-            }
-        },
-        // 刷新用户
-        freshUser() {
-            const operate = {
-                type: this.operate.type,
-                operation: OperationEvent.Command.manage.freshUser.operation
-            };
-
-            this.loading = true;
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                this.loading = false;
-            }).catch(() => {
-                this.loading = false;
-            });
-        },
-        // 选择用户
-        chooseUser(row) {
-            const operate = {
-                type: this.operate.type,
-                operation: OperationEvent.Command.manage.chooseUser.operation
-            };
-
-            this.loading = true;
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                this.loading = false;
-                this.selected = row;
-            }).catch(() => {
-                this.loading = false;
-            });
-        },
-        commit() {
-            const operate = {
-                type: this.operate.type,
-                operation: OperationEvent.Command.close.menu.operation
-            };
-
-            this.loading = true;
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                this.loading = false;
-                if (valid) {
-                    this.doClose();
-                }
-            }).catch(() => {
-                this.loading = false;
-                this.doClose();
-            });
-        },
-        cancel() {
-            const operate = {
-                type: this.operate.type,
-                operation: OperationEvent.Command.cancel.menu.operation
-            };
-
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                if (valid) {
-                    this.doClose();
-                }
-            }).catch(() => { this.doClose(); });
-        },
-        // 增删改函数处理
-        operateUser(data) {
-            if (data && data.type === 'ADD') {
-                const index = this.tableData.indexOf(this.tableData.find(elem => { return elem.jobNumber === data.jobNumber; }));
-                if (index < 0) {
-                    this.tableData.push({
-                        jobNumber: data.jobNumber,
-                        userName: data.userName,
-                        password: data.password
-                    });
-                } else {
-                    this.$messageBox(this.$t('menu.menuDialog.addFail'));
-                }
-            } else if (data && data.type === 'EDIT') {
-                const index = this.tableData.indexOf(this.tableData.find(elem => { return elem.jobNumber === data.jobNumber; }));
-                if (index >= 0) {
-                    this.tableData[index].password = data.password;
-                    this.tableData[index].userName = data.userName;
-                } else {
-                    this.$messageBox(this.$t('menu.menuDialog.modifyFail'));
-                }
-            } else if (data && data.type === 'DELETE') {
-                const index = this.tableData.indexOf(this.tableData.find(elem => { return elem.jobNumber === data.jobNumber; }));
-                if (index >= 0) {
-                    this.tableData.splice(index, 1);
-                    this.selected = null;
-                } else {
-                    this.$messageBox(this.$t('menu.menuDialog.deleteFail'));
-                }
-            }
-        }
-    }
-};
-</script>
-<style scoped>
-    .fuzhou-01__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/jmap/theme/fuzhou_01/menus/menuDialog/passwordBox.vue b/src/jmap/theme/fuzhou_01/menus/menuDialog/passwordBox.vue
deleted file mode 100644
index c349ac7cd..000000000
--- a/src/jmap/theme/fuzhou_01/menus/menuDialog/passwordBox.vue
+++ /dev/null
@@ -1,229 +0,0 @@
-<template>
-  <el-dialog
-    v-dialogDrag
-    class="fuzhou-01__systerm password-box"
-    :title="$t('menu.menuDialog.passwordBox')"
-    :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">{{ $t('menu.menuDialog.userNameLabel') }}</span>
-          <el-input v-model="model.username" disabled />
-        </el-form-item>
-        <el-form-item prop="password">
-          <span slot="label">{{ $t('menu.menuDialog.password') }}</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">{{ $t('menu.menuDialog.back') }}</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">{{ $t('menu.menuDialog.clear') }}</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">{{ $t('menu.menuDialog.confirm') }}</el-button>
-      </el-col>
-      <el-col :span="6" :offset="4">
-        <el-button :id="domIdCancel" @click="cancel">{{ $t('menu.menuDialog.cancel') }}</el-button>
-      </el-col>
-    </el-row>
-    <notice-info ref="noticeInfo" />
-  </el-dialog>
-</template>
-
-<script>
-import { OperationEvent, checkOperationIsCurrentOperate } from '@/scripts/ConstDic';
-import NoticeInfo from '../dialog/childDialog/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 (this.dialogShow) {
-                if (checkOperationIsCurrentOperate(this.operation, OperationEvent.StationControl.forcedStationControl)) {
-                    /** 强制站控*/
-                    return OperationEvent.StationControl.forcedStationControl.passwordConfirm.domId;
-                }
-            }
-            return '';
-        }
-    },
-    mounted() {
-        this.$nextTick(() => {
-            this.$store.dispatch('training/tipReload');
-        });
-    },
-    methods: {
-        loadInitData(operate) {
-            this.model.username = '';
-            this.model.password = '';
-            this.operate = operate || {};
-            this.operation = operate.operation;
-            this.model.username = this.$store.state.user.nickname;
-        },
-        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/next', operate).then(({ valid }) => {
-                if (valid) {
-                    this.doClose();
-                }
-            });
-        },
-        commit() {
-            const operate = {
-                type: this.operate.type
-            };
-
-            if (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/next', 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(operate, [this.$t('menu.menuDialog.IncorrectPassword')]);
-
-            }
-        },
-        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/jmap/theme/fuzhou_01/menus/menuDialog/stationControlConvert.vue b/src/jmap/theme/fuzhou_01/menus/menuDialog/stationControlConvert.vue
deleted file mode 100644
index 9fa2d1bcf..000000000
--- a/src/jmap/theme/fuzhou_01/menus/menuDialog/stationControlConvert.vue
+++ /dev/null
@@ -1,472 +0,0 @@
-<template>
-  <el-dialog
-    v-dialogDrag
-    class="fuzhou-01__systerm station-control-convert"
-    :title="$t('menu.menuDialog.controlModeConversion')"
-    :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="$t('menu.menuDialog.select')" 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="$t('menu.menuDialog.operatingArea')" 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="$t('menu.menuDialog.controlMode')" 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="$t('menu.menuDialog.centerStationCommunicationStatus')" 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="$t('menu.menuDialog.transferExecutionStatus')">
-        <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" class="control_button">
-        <el-button v-if="isFork" :id="domIdFork" :disabled="disabledCommit" @click="forkCommit">{{ $t('menu.menuDialog.forcedStationControl') }}</el-button>
-        <el-button v-if="isRequest" :id="domIdRequest" :disabled="disabledCommit" @click="requestCommit">{{ $t('menu.menuDialog.requestStationControl') }}
-        </el-button>
-        <el-button v-if="isConter" :id="domIdConter" :disabled="disabledCommit" @click="conterCommit">{{ $t('menu.menuDialog.requestInTheControl') }}
-        </el-button>
-      </el-col>
-      <el-col :span="6" :offset="4">
-        <el-button :id="domIdCancel" :disabled="disabledClose" @click="cancel">{{ $t('menu.menuDialog.close') }}
-        </el-button>
-      </el-col>
-    </el-row>
-    <two-confirmation ref="twoConfirmation" @setOperate="getOperate" />
-  </el-dialog>
-</template>
-
-<script>
-import { mapGetters } from 'vuex';
-import { MapDeviceType, OperationEvent, checkOperationIsCurrentOperate } from '@/scripts/ConstDic';
-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': this.$t('menu.menuDialog.inTheControl'),
-                '02': this.$t('menu.menuDialog.stationControl')
-            },
-            selection: [],
-            tableData: [],
-            timer: null,
-            count: 0,
-            flagListBit: [],
-            backOperate: '',
-            timeout: 61,
-            counts: 0
-        };
-    },
-    computed: {
-        ...mapGetters('map', [
-            'stationList',
-            'stationControlList'
-        ]),
-        ...mapGetters('training', [
-            'mode',
-            'started'
-        ]),
-        disabledCommit() {
-            return this.disabledSend || this.disabledSure;
-        },
-        show() {
-            return this.dialogShow && !this.$store.state.menuOperation.break;
-        },
-        isFork() {
-            if (this.dialogShow) {
-                return checkOperationIsCurrentOperate(this.operation, OperationEvent.StationControl.forcedStationControl);
-            }
-            return false;
-        },
-        isRequest() {
-            if (this.dialogShow) {
-                return checkOperationIsCurrentOperate(this.operation, OperationEvent.StationControl.requestStationControl);
-            }
-            return false;
-        },
-        isConter() {
-            if (this.dialogShow) {
-                return checkOperationIsCurrentOperate(this.operation, OperationEvent.StationControl.requestCentralControl);
-            }
-            return false;
-        },
-        domIdChoose() {
-            if (this.dialogShow) {
-                if (checkOperationIsCurrentOperate(this.operation, OperationEvent.StationControl.forcedStationControl)) {
-                    return OperationEvent.StationControl.forcedStationControl.choose.domId;
-                } else if (checkOperationIsCurrentOperate(this.operation, OperationEvent.StationControl.requestStationControl)) {
-                    return OperationEvent.StationControl.requestStationControl.choose.domId;
-                } else if (checkOperationIsCurrentOperate(this.operation, OperationEvent.StationControl.requestCentralControl)) {
-                    return OperationEvent.StationControl.requestCentralControl.choose.domId;
-                }
-            }
-            return false;
-        },
-        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) {
-                this.flagListBit[this.selection.forEach(elem => { return elem.stationControlCode == elem.code; })] = false;
-                if (elem.hasOwnProperty('timeout')) {
-                    this.updateTableValue(elem.stationControlCode, { result: this.$t('menu.menuDialog.acceptConversionResponseTimeout') }, false);
-                } else if (elem.hasOwnProperty('agree')) {
-                    if (elem.agree) {
-                        this.updateTableValue(elem.stationControlCode, { result: this.$t('menu.menuDialog.controlModeTransfersuccees') }, true);
-                    } else {
-                        this.updateTableValue(elem.stationControlCode, { result: this.$t('menu.menuDialog.controlModeTransferFailed') }, false);
-                    }
-                }
-                this.disabledClose = false;
-                this.disabledSure = 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.$t('menu.menuDialog.senedMessageOne')}${this.timeout} ${this.$t('menu.menuDialog.senedMessageTwo')}` }, false);
-                        } else if (operate.cancel) {
-                            this.updateTableValue(elem.code, { result: '' }, false);
-                        }
-                    });
-                }
-            }
-        },
-        // 深度数据状态
-        tableData: {
-            handler(val, oldVal) {
-                this.checkTableDataSelction(val);
-            },
-            deep: true
-        }
-    },
-    mounted() {
-        this.loadTableData();
-        this.$nextTick(() => {
-            this.$store.dispatch('training/tipReload');
-        });
-    },
-    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 (checkOperationIsCurrentOperate(this.operation, OperationEvent.StationControl.forcedStationControl) || checkOperationIsCurrentOperate(this.operation, OperationEvent.StationControl.requestStationControl)) {
-                            row.control = this.controlProps['02']; // 01:中控， 02:站控
-                        } else if (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 (checkOperationIsCurrentOperate(this.operation, OperationEvent.StationControl.forcedStationControl) || checkOperationIsCurrentOperate(this.operation, OperationEvent.StationControl.requestStationControl)) {
-                if (control && control.status == '02') { // 01:中控， 02:站控
-                    return true;
-                }
-            } else if (checkOperationIsCurrentOperate(this.operation, OperationEvent.StationControl.requestCentralControl)) {
-                if (control && control.status == '01') { // 01:中控， 02:站控
-                    return true;
-                }
-            }
-
-        },
-        loadTableData() {
-            this.tableData = [];
-            this.stationControlList.forEach(control => {
-                const station = this.$store.getters['map/getDeviceByCode'](control.stationCode);
-                this.tableData.push({
-                    code: control.code,
-                    operate: station.name || '',
-                    control: '',
-                    check: false,
-                    disabled: false,
-                    status: this.$t('menu.menuDialog.normal'),
-                    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);
-                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() {
-            if (this.dialogShow) {
-                this.$store.dispatch('socket/shiftMsgQueue');
-            }
-            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/next', operate).then(({ valid }) => {
-                if (valid) {
-                    this.doClose();
-                }
-            });
-        },
-        setTimer() {
-            this.clearTimer();
-            this.flagListBit = new Array(this.selection.length).fill(true);
-            this.timer = setInterval(() => {
-                (this.selection || []).forEach((elem, index) => {
-                    if (this.flagListBit[index]) {
-                        elem['count'] = (elem['count'] || 0) + 1;
-                        elem['count'] > this.timeout && (
-                            this.flagListBit[index] = false,
-                            this.setRequestTimeout(elem)
-                        );
-                    }
-                });
-
-                this.flagListBit.findIndex(elem => { return elem; }) < 0 && this.clearTimer();
-            }, 1000);
-        },
-        clearTimer() {
-            this.count = 0;
-            if (this.timer) {
-                clearInterval(this.timer);
-                this.timer = null;
-            }
-        },
-        setRequestTimeout(elem) {
-            elem['count'] = 0;
-            this.$store.dispatch('socket/pushMsgQueue',
-                { type: 'resp', timeout: 'true', stationControlCode: elem.code }
-            );
-        },
-        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 = {
-                    type: MapDeviceType.StationControl.type,
-                    operation: '',
-                    val: this.serializeCodeListWithSeparator('::'),
-                    selection: selection
-                };
-
-                if (checkOperationIsCurrentOperate(this.operation, OperationEvent.StationControl.forcedStationControl)) {
-                    operate.operation = OperationEvent.StationControl.forcedStationControl.choose.operation;
-                } else if (checkOperationIsCurrentOperate(this.operation, OperationEvent.StationControl.requestStationControl)) {
-                    operate.operation = OperationEvent.StationControl.requestStationControl.choose.operation;
-                } else if (checkOperationIsCurrentOperate(this.operation, OperationEvent.StationControl.requestCentralControl)) {
-                    operate.operation = OperationEvent.StationControl.requestCentralControl.choose.operation;
-                }
-
-                this.disabledSure = true;
-                this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                    if (valid) {
-                        this.disabledSure = false;
-                        this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    }
-                });
-            } else if (!selection) {
-                this.$messageBox(this.$t('menu.menuDialog.selectData'));
-            }
-        },
-        requestCommit() {
-            const operate = {
-                type: MapDeviceType.StationControl.type,
-                messages: [this.$t('menu.menuDialog.confirmStationControlTip')],
-                operation: OperationEvent.StationControl.requestStationControl.menu.operation,
-                val: this.serializeCodeListWithSeparator('::'),
-                selection: this.selection
-            };
-
-            this.selection.forEach((elem, index) => {
-                operate.messages.push(`${this.$t('menu.menuDialog.operatingArea')} ${index + 1}:${elem.operate}`);
-            });
-
-            this.disabledSure = true;
-            this.$store.dispatch('training/next', 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;
-            });
-        },
-        forkCommit() {
-            const operate = {
-                type: MapDeviceType.StationControl.type,
-                messages: [this.$t('menu.menuDialog.confirmInTheControlTip')],
-                operation: OperationEvent.StationControl.forcedStationControl.menu.operation,
-                val: this.serializeCodeListWithSeparator('::'),
-                selection: this.selection
-            };
-
-            this.selection.forEach((elem, index) => {
-                operate.messages.push(`${this.$t('menu.menuDialog.operatingArea')} ${index + 1}:${elem.operate}`);
-            });
-
-            this.disabledSure = true;
-            this.$store.dispatch('training/next', 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;
-            });
-        },
-        conterCommit() { // 请求中控
-            const operate = {
-                type: MapDeviceType.StationControl.type,
-                messages: [this.$t('menu.menuDialog.confirmInTheControlTip')],
-                operation: OperationEvent.StationControl.requestCentralControl.menu.operation,
-                val: this.serializeCodeListWithSeparator('::'),
-                selection: this.selection
-            };
-
-            this.selection.forEach((elem, index) => {
-                operate.messages.push(`${this.$t('menu.menuDialog.operatingArea')} ${index + 1}:${elem.operate}`);
-            });
-
-            this.disabledSure = true;
-            this.$store.dispatch('training/next', 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;
-            });
-        },
-        getOperate(operate) {
-            this.backOperate = operate;
-            if (operate.cancel) {
-                this.disabledSure = this.disabledSend = false;
-            }
-            if (operate.commit || operate.timeout) {
-                this.disabledSend = this.disabledSure = true;
-            }
-            this.setTimer();
-            this.disabledClose = true;
-            this.counts = 1;
-        }
-    }
-};
-</script>
-<style lang="scss" scoped>
-    .fuzhou-01__systerm .el-dialog .control_button button{
-        max-width:180px;
-        width:auto ;
-        padding-left: 5px ;
-        padding-right: 5px ;
-        min-width: 80px;
-    }
-</style>
diff --git a/src/jmap/theme/fuzhou_01/menus/menuDialog/viewDevice.vue b/src/jmap/theme/fuzhou_01/menus/menuDialog/viewDevice.vue
deleted file mode 100644
index 096fb45a5..000000000
--- a/src/jmap/theme/fuzhou_01/menus/menuDialog/viewDevice.vue
+++ /dev/null
@@ -1,166 +0,0 @@
-<template>
-  <el-dialog
-    v-dialogDrag
-    class="fuzhou-01__systerm view-display"
-    :title="$t('menu.menuDialog.deviceDisplaySettings')"
-    :visible.sync="show"
-    width="340px"
-    :before-close="doClose"
-    :z-index="2000"
-    :modal="false"
-    :close-on-click-modal="false"
-  >
-    <el-checkbox-group v-model="deviceLevels">
-      <div>
-        <el-checkbox :label="1">{{ $t('menu.menuDialog.trainWindow') }}</el-checkbox>
-      </div>
-      <div>
-        <el-checkbox :label="2">{{ $t('menu.menuDialog.sectionBoundary') }}</el-checkbox>
-      </div>
-      <div>
-        <el-checkbox :label="3">{{ $t('menu.menuDialog.linkageAutoRouteShow') }}</el-checkbox>
-      </div>
-      <div>
-        <el-checkbox :label="4">{{ $t('menu.menuDialog.atsAutoTriggerShow') }}</el-checkbox>
-      </div>
-    </el-checkbox-group>
-    <el-row class="button-group">
-      <el-col :span="8" :offset="2">
-        <el-button :id="domIdConfirm" class="commit" type="primary" :loading="loading" @click="commit">{{ $t('menu.menuDialog.confirm') }}
-        </el-button>
-      </el-col>
-      <el-col :span="8" :offset="3">
-        <el-button :id="domIdCancel" class="cancal" @click="cancel">{{ $t('menu.menuDialog.cancel') }}</el-button>
-      </el-col>
-    </el-row>
-    <notice-info ref="noticeInfo" />
-  </el-dialog>
-</template>
-
-<script>
-import { OperationEvent } from '@/scripts/ConstDic';
-import NoticeInfo from '../dialog/childDialog/childDialog/noticeInfo';
-
-export default {
-    name: 'ViewDevice',
-    components: {
-        NoticeInfo
-    },
-    data() {
-        return {
-            dialogShow: false,
-            loading: false,
-            operate: null,
-            operation: '',
-            deviceLevels: [2, 3, 4, 5]
-        };
-    },
-    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.setDeviceDisplay();
-            this.$store.dispatch('training/tipReload');
-        });
-    },
-    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/next', operate).then(({ valid }) => {
-                if (valid) {
-                    this.doClose();
-                }
-            });
-        },
-        commit() {
-            const operate = {
-                over: true,
-                type: this.operate.type,
-                operation: OperationEvent.Command.close.confirm.operation,
-                val: this.deviceLevels.sort().join('::')
-            };
-
-            this.loading = true;
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                this.loading = false;
-                if (valid) {
-                    this.doClose();
-                    this.setDeviceDisplay();
-                }
-            }).catch(() => {
-                this.loading = false;
-            });
-        },
-        setDeviceDisplay() {
-            const deviceList = [];
-
-            // 区段边界设置
-            const borderBorderShow = this.deviceLevels.indexOf(2) !== -1;
-            const sectionList = this.$store.getters['map/sectionList'];
-            if (sectionList && sectionList.length > 0) {
-                sectionList.forEach(elem => {
-                    // 区段边界
-                    deviceList.push(Object.assign(this.$jlmap.getDeviceByCode(elem.code), {borderBorderShow }));
-                });
-            }
-
-            // 车次窗设置
-            const trainWindowShow = this.deviceLevels.indexOf(1) !== -1;
-            const trainWindowList = this.$store.getters['map/trainWindowList'];
-            if (trainWindowList && trainWindowList.length > 0) {
-                trainWindowList.forEach(elem => {
-                    // 车次窗
-                    deviceList.push(Object.assign(this.$jlmap.getDeviceByCode(elem.code), {trainWindowShow }));
-                });
-            }
-
-            // 联锁自动进路表示灯和ATS自动触发表示灯设置
-            const linkageAutoRouteShow = this.deviceLevels.indexOf(3) !== -1; // 联锁自动进路表示灯
-            const atsAutoTriggerShow = this.deviceLevels.indexOf(4) !== -1; // ATS自动触发表示灯
-            const signalList = this.$store.getters['map/signalList'];
-            if (signalList && signalList.length > 0) {
-                signalList.forEach(elem => {
-                    deviceList.push(Object.assign(this.$jlmap.getDeviceByCode(elem.code), { linkageAutoRouteShow, atsAutoTriggerShow }));
-                });
-            }
-
-            this.$store.dispatch('map/updateMapDevices', deviceList);
-        }
-    }
-};
-
-</script>
-<style rel="stylesheet/scss" lang="scss" scoped>
-    @import "src/styles/mixin.scss";
-</style>
diff --git a/src/jmap/theme/fuzhou_01/menus/menuDialog/viewName.vue b/src/jmap/theme/fuzhou_01/menus/menuDialog/viewName.vue
deleted file mode 100644
index 83006fcf3..000000000
--- a/src/jmap/theme/fuzhou_01/menus/menuDialog/viewName.vue
+++ /dev/null
@@ -1,234 +0,0 @@
-<template>
-  <el-dialog
-    v-dialogDrag
-    class="fuzhou-01__systerm view-name"
-    :title="$t('menu.menuDialog.nameDisplaySetting')"
-    :visible.sync="show"
-    width="400px"
-    :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">{{ $t('menu.menuDialog.signalName') }}</el-checkbox>
-        </el-col>
-        <el-col :span="10" :offset="4">
-          <el-checkbox :label="2">{{ $t('menu.menuDialog.standTrackName') }}</el-checkbox>
-        </el-col>
-      </el-row>
-      <el-row>
-        <el-col :span="10">
-          <el-checkbox :label="3" disabled>{{ $t('menu.menuDialog.buttonName') }}</el-checkbox>
-        </el-col>
-        <el-col :span="10" :offset="4">
-          <el-checkbox :label="4">{{ $t('menu.menuDialog.reentryTrackName') }}</el-checkbox>
-        </el-col>
-      </el-row>
-      <el-row>
-        <el-col :span="10">
-          <el-checkbox :label="5">{{ $t('menu.menuDialog.trackName') }}</el-checkbox>
-        </el-col>
-        <el-col :span="10" :offset="4">
-          <el-checkbox dio :label="6">{{ $t('menu.menuDialog.transferTrackName') }}</el-checkbox>
-        </el-col>
-      </el-row>
-      <el-row>
-        <el-col :span="10">
-          <el-checkbox :label="7">{{ $t('menu.menuDialog.turnoutName') }}</el-checkbox>
-        </el-col>
-        <el-col :span="10" :offset="4">
-          <el-checkbox dio :label="8">{{ $t('menu.menuDialog.indicatorName') }}</el-checkbox>
-        </el-col>
-      </el-row>
-      <el-row>
-        <el-col :span="10">
-          <el-checkbox :label="9">{{ $t('menu.menuDialog.turnoutSectionName') }}</el-checkbox>
-        </el-col>
-        <el-col :span="10" :offset="4">
-          <el-checkbox dio :label="10">{{ $t('menu.menuDialog.destinationName') }}</el-checkbox>
-        </el-col>
-      </el-row>
-      <el-row>
-        <el-col :span="10">
-          <el-checkbox :label="11">{{ $t('menu.menuDialog.axisSectionName') }}</el-checkbox>
-        </el-col>
-        <el-col :span="10" :offset="4">
-          <el-checkbox dio :label="12">{{ $t('menu.menuDialog.kmPost') }}</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">{{ $t('menu.menuDialog.confirm') }}</el-button>
-      </el-col>
-      <el-col :span="4" :offset="8">
-        <el-button :id="domIdCancel" @click="cancel">{{ $t('menu.menuDialog.cancel') }}</el-button>
-      </el-col>
-    </el-row>
-    <notice-info ref="noticeInfo" />
-  </el-dialog>
-</template>
-
-<script>
-import { OperationEvent } from '@/scripts/ConstDic';
-import deviceType from '@/jmap/constant/deviceType';
-import NoticeInfo from '../dialog/childDialog/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, 12]
-        };
-    },
-    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();
-            this.$store.dispatch('training/tipReload');
-        });
-    },
-    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/next', 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/next', operate).then(({ valid }) => {
-                this.loading = false;
-                if (valid) {
-                    this.doClose();
-                    this.setNameDisplay();
-                }
-            }).catch(() => {
-                this.loading = false;
-            });
-        },
-        setNameDisplay() {
-            const deviceList = [];
-
-            // 信号机
-            let nameShow = this.nameLevels.indexOf(1) !== -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.indexOf(7) !== -1;				// 道岔名称
-            const switchSectionNameShow = this.nameLevels.indexOf(9) !== -1;	// 道岔轨名称
-            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.indexOf(8) !== -1;
-            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;
-            const standTrackNameShow = this.nameLevels.indexOf(2) !== -1; // 站台轨名称
-            const reentryTrackNameShow = this.nameLevels.indexOf(4) !== -1; // 折返轨名称
-            const transferTrackNameShow = this.nameLevels.indexOf(6) !== -1; // 转换轨名称
-            const destinationNameShow = this.nameLevels.indexOf(10) !== -1;
-            const sectionList = this.$store.getters['map/sectionList'];
-            if (sectionList && sectionList.length > 0) {
-                sectionList.forEach(elem => {
-                    elem._type = deviceType.Section;
-                    if (elem.isSwitchSection && elem.parentCode) {
-                        // 道岔轨的区段名称默认不显示
-                        nameShow = false;
-                    } else {
-                        if (elem.type === '01') {
-                            // 计轴区段名称
-                            nameShow = this.nameLevels.indexOf(11) !== -1;
-                        } else if (elem.type === '02') {
-                            // 股道轨名称
-                            nameShow = this.nameLevels.indexOf(5) !== -1;
-                        } else if (elem.type === '03') {
-                            // 道岔区段名称
-                            nameShow = this.nameLevels.indexOf(9) !== -1;
-                        }
-                    }
-
-                    deviceList.push(Object.assign(this.$jlmap.getDeviceByCode(elem.code), { nameShow, standTrackNameShow, reentryTrackNameShow, transferTrackNameShow, destinationNameShow }));
-                });
-            }
-
-            // 车站
-            const kmPostShow = this.nameLevels.indexOf(12) !== -1;
-            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/jmap/theme/fuzhou_01/menus/menuDialog/viewTrainId.vue b/src/jmap/theme/fuzhou_01/menus/menuDialog/viewTrainId.vue
deleted file mode 100644
index 65cd96542..000000000
--- a/src/jmap/theme/fuzhou_01/menus/menuDialog/viewTrainId.vue
+++ /dev/null
@@ -1,209 +0,0 @@
-<template>
-  <el-dialog
-    v-dialogDrag
-    class="fuzhou-01__systerm view-train-id"
-    :title="$t('menu.menuDialog.trainIDDisplaySetting')"
-    :visible.sync="show"
-    width="420px"
-    :before-close="doClose"
-    :z-index="2000"
-    :modal="false"
-    :close-on-click-modal="false"
-  >
-    <div style="padding: 10px 20px; border: 1px double lightgray;">
-      <span class="base-label">{{ $t('menu.menuDialog.plantrainDisplayMode') }}</span>
-      <el-radio-group v-model="planMode">
-        <el-row>
-          <el-col :span="10">
-            <el-radio :label="1">{{ $t('menu.menuDialog.serviceNumber') }} + {{ $t('menu.menuDialog.tripNumber') }}</el-radio>
-          </el-col>
-          <el-col :span="10" :offset="4">
-            <el-radio :label="2">{{ $t('menu.menuDialog.serviceNumber') }} + {{ $t('menu.menuDialog.groupNumber') }}</el-radio>
-          </el-col>
-        </el-row>
-        <el-row class="elrow">
-          <el-col :span="10">
-            <el-radio :label="3">{{ $t('menu.menuDialog.targetNumber') }} + {{ $t('menu.menuDialog.tripNumber') }}</el-radio>
-          </el-col>
-          <el-col :span="10" :offset="4">
-            <el-radio :label="4">{{ $t('menu.menuDialog.targetNumber') }} + {{ $t('menu.menuDialog.groupNumber') }}</el-radio>
-          </el-col>
-        </el-row>
-        <el-row class="elrow">
-          <el-col :span="10">
-            <el-radio :label="5">{{ $t('menu.menuDialog.targetNumber') }} + {{ $t('menu.menuDialog.serviceNumber') }} + {{ $t('menu.menuDialog.tripNumber') }}</el-radio>
-          </el-col>
-          <el-col :span="10" :offset="4">
-            <el-radio :label="6">{{ $t('menu.menuDialog.targetNumber') }} + {{ $t('menu.menuDialog.serviceNumber') }} + {{ $t('menu.menuDialog.groupNumber') }}</el-radio>
-          </el-col>
-        </el-row>
-      </el-radio-group>
-    </div>
-    <div style="padding: 10px 20px; border: 1px double lightgray; margin: 20px 0px;">
-      <span class="base-label">{{ $t('menu.menuDialog.headCodeStationDisplayMode') }}</span>
-      <el-radio-group v-model="headMode">
-        <el-row>
-          <el-col :span="10">
-            <el-radio :label="3">{{ $t('menu.menuDialog.targetNumber') }} + {{ $t('menu.menuDialog.tripNumber') }}</el-radio>
-          </el-col>
-          <el-col :span="6" :offset="4">
-            <el-radio :label="4">{{ $t('menu.menuDialog.targetNumber') }} + {{ $t('menu.menuDialog.groupNumber') }}</el-radio>
-          </el-col>
-        </el-row>
-      </el-radio-group>
-    </div>
-    <div style="padding: 10px 20px; border: 1px double lightgray;">
-      <span class="base-label">{{ $t('menu.menuDialog.fontSize') }}</span>
-      <el-row>
-        <el-col :span="10">
-          <el-input v-model="fontSize" size="small" min="16" max="99" />
-        </el-col>
-        <el-col :span="10" :offset="1">
-          <span style="height:32px; line-height:32px;">{{ $t('menu.menuDialog.range') }}</span>
-        </el-col>
-      </el-row>
-    </div>
-    <el-row class="button-group">
-      <el-col :span="6" :offset="2">
-        <el-button :id="domIdConfirm" type="primary" :loading="loading" @click="commit">{{ $t('menu.menuDialog.confirm') }}</el-button>
-      </el-col>
-      <el-col :span="4" :offset="8">
-        <el-button :id="domIdCancel" @click="cancel">{{ $t('menu.menuDialog.cancel') }}</el-button>
-      </el-col>
-    </el-row>
-    <notice-info ref="noticeInfo" />
-  </el-dialog>
-</template>
-
-<script>
-import { OperationEvent } from '@/scripts/ConstDic';
-// import deviceType from '@/jmap/constant/deviceType';
-import NoticeInfo from '../dialog/childDialog/childDialog/noticeInfo';
-
-export default {
-    name: 'ViewTrainId',
-    components: {
-        NoticeInfo
-    },
-    data() {
-        return {
-            dialogShow: false,
-            loading: false,
-            operate: null,
-            operation: '',
-            planMode: 5,
-            headMode: 5,
-            fontSize: 16
-        };
-    },
-    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.setTrainDispaly();
-            this.$store.dispatch('training/tipReload');
-        });
-    },
-    methods: {
-        doShow(operate) {
-            this.operate = operate || {};
-            this.operation = operate.operation;
-
-            // 非断电激活时设置初始值
-            if (!this.dialogShow) {
-                this.loading = false;
-            }
-
-            this.dialogShow = true;
-            this.$nextTick(function () {
-                this.$store.dispatch('training/emitTipFresh');
-            });
-        },
-        doClose() {
-            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/next', operate).then(({ valid }) => {
-                if (valid) {
-                    this.doClose();
-                }
-            });
-        },
-        commit() {
-            const operate = {
-                over: true,
-                type: this.operate.type,
-                operation: OperationEvent.Command.close.confirm.operation,
-                val: [this.planMode, this.headMode, this.fontSize].join('::')
-            };
-
-            this.loading = true;
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                this.loading = false;
-                if (valid) {
-                    this.setTrainDispaly();
-                    this.doClose();
-                }
-            }).catch(() => {
-                this.loading = false;
-            });
-        },
-        setTrainDispaly() {
-            const updatlist = [];
-            const trainList = this.$store.getters['training/viewTrainList']();
-            if (trainList && trainList.length > 0) {
-                const nameFormat = this.trainNameFormatBy(this.planMode);
-                const nameFontSize = this.fontSize;
-                trainList.forEach(elem => {
-                    updatlist.push(Object.assign(this.$jlmap.getDeviceByCode(elem.code), {nameFormat, nameFontSize }));
-                });
-
-                this.$store.dispatch('map/updateMapDevices', updatlist);
-            }
-        },
-        trainNameFormatBy(mode) {
-            switch (mode.toString()) {
-            case '1': return 'serviceNumber:tripNumber'; // 表号+车次号
-            case '2': return 'serviceNumber:groupNumber'; // 表号+车组号
-            case '3': return 'targetCode:tripNumber'; // 目的地号+车次号
-            case '4': return 'targetCode:groupNumber'; // 目的地号+车组号
-            case '5': return 'targetCode:serviceNumber:tripNumber'; // 目的地号+表号+车次号
-            case '6': return 'targetCode:serviceNumber:groupNumber'; // 目的地号+表号+车组号
-            }
-
-            return ''; // 无格式类型
-        }
-    }
-};
-</script>
-<style rel="stylesheet/scss" lang="scss" scoped>
-	/deep/ {
-        .el-dialog .el-radio__label{
-			width: 150px ;
-			white-space: pre-wrap ;
-			display: inline-block ;
-		}
-		.el-radio__input{
-			vertical-align: top;
-		}
-    }
-	.elrow{
-		margin-top:4px;
-	}
-</style>
diff --git a/src/jmap/theme/fuzhou_01/menus/menuSection.vue b/src/jmap/theme/fuzhou_01/menus/menuSection.vue
deleted file mode 100644
index f2a03250d..000000000
--- a/src/jmap/theme/fuzhou_01/menus/menuSection.vue
+++ /dev/null
@@ -1,407 +0,0 @@
-<template>
-  <div>
-    <pop-menu ref="popMenu" :menu="menu" />
-    <section-control ref="sectionControl" />
-    <section-cmd-control ref="sectionCmdControl" />
-    <speed-cmd-control ref="speedCmdControl" />
-    <train-create ref="trainCreate" />
-    <notice-info ref="noticeInfo" />
-  </div>
-</template>
-
-<script>
-import PopMenu from '@/components/PopMenu';
-import SectionControl from './dialog/sectionControl';
-import SectionCmdControl from './dialog/sectionCmdControl';
-import SpeedCmdControl from './dialog/speedCmdControl';
-import TrainCreate from './dialog/trainCreate';
-import NoticeInfo from './dialog/childDialog/childDialog/noticeInfo';
-import { mapGetters } from 'vuex';
-import { OperateMode } from '@/scripts/ConstDic';
-import { MapDeviceType, OperationEvent, DeviceMenu } from '@/scripts/ConstDic';
-import { MenuDisabledState, menuConvert, menuFiltration } from './utils/menuItemStatus';
-
-export default {
-    name: 'SectionMenu',
-    components: {
-        PopMenu,
-        SectionControl,
-        SectionCmdControl,
-        SpeedCmdControl,
-        TrainCreate,
-        NoticeInfo
-    },
-    props: {
-        selected: {
-            type: Object,
-            default() {
-                return null;
-            }
-        }
-    },
-    data() {
-        return {
-            menu: [],
-            menuNormal: {
-                local: [
-                    {
-                        label: this.$t('menu.menuSection.sectionFaultUnlock'),
-                        handler: this.fault,
-                        disabledCallback: MenuDisabledState.Section.fault,
-                        auth: { station: true, center: false }
-                    },
-                    {
-                        label: this.$t('menu.menuSection.sectionResection'),
-                        handler: this.split,
-                        disabledCallback: MenuDisabledState.Section.split,
-                        auth: { station: true, center: false }
-                    },
-                    {
-                        label: this.$t('menu.menuSection.sectionActive'),
-                        handler: this.active,
-                        disabledCallback: MenuDisabledState.Section.active,
-                        auth: { station: true, center: false }
-                    },
-                    {
-                        label: this.$t('menu.menuSection.sectionAxisPreReset'),
-                        handler: this.axlePreReset,
-                        disabledCallback: MenuDisabledState.Section.axlePreReset,
-                        auth: { station: true, center: false }
-                    },
-                    {
-                        label: this.$t('menu.menuSection.sectionBlockade'),
-                        handler: this.lock,
-                        disabledCallback: MenuDisabledState.Section.lock,
-                        auth: { station: true, center: false }
-                    },
-                    {
-                        label: this.$t('menu.menuSection.sectionUnblock'),
-                        handler: this.unlock,
-                        disabledCallback: MenuDisabledState.Section.unlock,
-                        auth: { station: true, center: false }
-                    },
-                    {
-                        label: this.$t('menu.menuSection.sectionSetSpeedLimit'),
-                        handler: this.setSpeed,
-                        disabledCallback: MenuDisabledState.Section.setSpeed,
-                        auth: { station: true, center: false }
-                    },
-                    {
-                        label: this.$t('menu.menuSection.sectionCancelSpeedLimit'),
-                        handler: this.cancelSpeed,
-                        disabledCallback: MenuDisabledState.Section.cancelSpeed,
-                        auth: { station: true, center: false }
-                    }
-                ],
-                central: [
-                    {
-                        label: this.$t('menu.menuSection.sectionFaultUnlock'),
-                        handler: this.fault,
-                        disabledCallback: MenuDisabledState.Section.fault,
-                        auth: { station: false, center: true }
-                    },
-                    {
-                        label: this.$t('menu.menuSection.sectionResection'),
-                        handler: this.split,
-                        disabledCallback: MenuDisabledState.Section.split,
-                        auth: { station: false, center: true }
-                    },
-                    {
-                        label: this.$t('menu.menuSection.sectionActive'),
-                        handler: this.active,
-                        disabledCallback: MenuDisabledState.Section.active,
-                        auth: { station: false, center: true }
-                    },
-                    {
-                        label: this.$t('menu.menuSection.axisPreReset'),
-                        handler: this.axlePreReset,
-                        disabledCallback: MenuDisabledState.Section.axlePreReset,
-                        auth: { station: false, center: false }
-                    },
-                    {
-                        label: this.$t('menu.menuSection.sectionBlockade'),
-                        handler: this.lock,
-                        disabledCallback: MenuDisabledState.Section.lock,
-                        auth: { station: false, center: true }
-                    },
-                    {
-                        label: this.$t('menu.menuSection.sectionUnblock'),
-                        handler: this.unlock,
-                        disabledCallback: MenuDisabledState.Section.unlock,
-                        auth: { station: false, center: true }
-                    },
-                    {
-                        label: this.$t('menu.menuSection.sectionSetSpeedLimit'),
-                        handler: this.setSpeed,
-                        disabledCallback: MenuDisabledState.Section.setSpeed,
-                        auth: { station: false, center: true }
-                    },
-                    {
-                        label: this.$t('menu.menuSection.sectionCancelSpeedLimit'),
-                        handler: this.cancelSpeed,
-                        disabledCallback: MenuDisabledState.Section.cancelSpeed,
-                        auth: { station: false, center: true }
-                    }
-                ]
-            },
-            menuTrain: [
-                {
-                    label: this.$t('menu.menuSection.createTrain'),
-                    handler: this.newTrain,
-                    disabledCallback: MenuDisabledState.Section.newTrain
-                }
-            ],
-            menuForce: [
-                {
-                    label: this.$t('menu.menuSection.setFault'),
-                    handler: this.setStoppage,
-                    disabledCallback: MenuDisabledState.Section.setStoppage
-                },
-                {
-                    label: this.$t('menu.menuSection.cancelFault'),
-                    handler: this.cancelStoppage,
-                    disabledCallback: MenuDisabledState.Section.cancelStoppage
-                }
-            ]
-        };
-    },
-    computed: {
-        ...mapGetters('training', [
-            'mode',
-            'operatemode'
-        ]),
-        ...mapGetters('menuOperation', [
-            'buttonOperation'
-        ])
-    },
-    watch: {
-        '$store.state.menuOperation.menuCount': function (val) {
-            if (this.$store.getters['menuOperation/checkDialogIsOpen'](DeviceMenu.Section) && !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 = menuFiltration(this.menuNormal);
-            if (this.operatemode === OperateMode.ADMIN) {
-                this.menu = [...this.menu, ...this.menuForce, ...this.menuTrain];
-            }
-
-            // 故障模式菜单列表
-            if (this.operatemode === OperateMode.FAULT) {
-                this.menu = this.menuForce;
-            }
-
-            this.menu = menuConvert(this.menu);
-        },
-        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();
-            }
-        },
-        // 设置故障
-        setStoppage() {
-            const operate = {
-                start: true,
-                send: true,
-                code: this.selected.code,
-                type: MapDeviceType.Section.type,
-                label: MapDeviceType.Section.label,
-                operation: OperationEvent.Section.stoppage.menu.operation
-            };
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                if (valid) {
-                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                } else {
-                    this.$refs.noticeInfo.doShow(operate);
-                }
-            }).catch(() => {
-                this.$refs.noticeInfo.doShow(operate);
-            });
-        },
-        // 取消故障
-        cancelStoppage() {
-            const operate = {
-                start: true,
-                send: true,
-                code: this.selected.code,
-                type: MapDeviceType.Section.type,
-                label: MapDeviceType.Section.label,
-                operation: OperationEvent.Section.cancelStoppage.menu.operation
-            };
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                if (valid) {
-                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                } else {
-                    this.$refs.noticeInfo.doShow(operate);
-                }
-            }).catch(() => {
-                this.$refs.noticeInfo.doShow(operate);
-            });
-        },
-        // 故障解锁
-        fault() {
-            const operate = {
-                start: true,
-                code: this.selected.code,
-                type: MapDeviceType.Section.type,
-                label: MapDeviceType.Section.label,
-                operation: OperationEvent.Section.fault.menu.operation
-            };
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                if (valid) {
-                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    this.$refs.sectionCmdControl.doShow(operate, this.selected);
-                }
-            });
-        },
-        // 切除
-        split() {
-            const operate = {
-                start: true,
-                code: this.selected.code,
-                type: MapDeviceType.Section.type,
-                label: MapDeviceType.Section.label,
-                operation: OperationEvent.Section.split.menu.operation
-            };
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                if (valid) {
-                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    this.$refs.sectionControl.doShow(operate, this.selected);
-                }
-            });
-        },
-        // 激活
-        active() {
-            const operate = {
-                start: true,
-                code: this.selected.code,
-                type: MapDeviceType.Section.type,
-                label: MapDeviceType.Section.label,
-                operation: OperationEvent.Section.active.menu.operation
-            };
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                if (valid) {
-                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    this.$refs.sectionControl.doShow(operate, this.selected);
-                }
-            });
-        },
-        // 区段计轴预复位
-        axlePreReset() {
-            const operate = {
-                start: true,
-                code: this.selected.code,
-                type: MapDeviceType.Section.type,
-                label: MapDeviceType.Section.label,
-                operation: OperationEvent.Section.axlePreReset.menu.operation
-            };
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                if (valid) {
-                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    this.$refs.sectionCmdControl.doShow(operate, this.selected);
-                }
-            });
-        },
-        // 区段解锁
-        lock() {
-            const operate = {
-                start: true,
-                code: this.selected.code,
-                type: MapDeviceType.Section.type,
-                label: MapDeviceType.Section.label,
-                operation: OperationEvent.Section.lock.menu.operation
-            };
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                if (valid) {
-                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    this.$refs.sectionControl.doShow(operate, this.selected);
-                }
-            });
-        },
-        // 区段封锁
-        unlock() {
-            const operate = {
-                start: true,
-                code: this.selected.code,
-                type: MapDeviceType.Section.type,
-                label: MapDeviceType.Section.label,
-                operation: OperationEvent.Section.unlock.menu.operation
-            };
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                if (valid) {
-                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    this.$refs.sectionCmdControl.doShow(operate, this.selected);
-                }
-            });
-        },
-        // 设置速度
-        setSpeed() {
-            const operate = {
-                start: true,
-                code: this.selected.code,
-                type: MapDeviceType.Section.type,
-                label: MapDeviceType.Section.label,
-                operation: OperationEvent.Section.setSpeed.menu.operation
-            };
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                if (valid) {
-                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    this.$refs.speedCmdControl.doShow(operate, this.selected);
-                }
-            });
-        },
-        // 取消速度
-        cancelSpeed() {
-            const operate = {
-                start: true,
-                send: true,
-                code: this.selected.code,
-                type: MapDeviceType.Section.type,
-                label: MapDeviceType.Section.label,
-                operation: OperationEvent.Section.cancelSpeed.menu.operation
-            };
-            this.$store.dispatch('training/next', operate).then(({ valid, response }) => {
-                if (valid) {
-                    const tempData = response.data;
-                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    this.$refs.speedCmdControl.doShow(operate, this.selected, tempData);
-                }
-            });
-        },
-        // 新建列车
-        newTrain() {
-            const operate = {
-                start: true,
-                code: this.selected.code,
-                type: MapDeviceType.Section.type,
-                label: MapDeviceType.Section.label,
-                operation: OperationEvent.Section.newtrain.menu.operation
-            };
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                if (valid) {
-                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    this.$refs.trainCreate.doShow(operate, this.selected);
-                }
-            });
-        }
-    }
-};
-</script>
diff --git a/src/jmap/theme/fuzhou_01/menus/menuSignal.vue b/src/jmap/theme/fuzhou_01/menus/menuSignal.vue
deleted file mode 100644
index 1bc1ac780..000000000
--- a/src/jmap/theme/fuzhou_01/menus/menuSignal.vue
+++ /dev/null
@@ -1,538 +0,0 @@
-<template>
-  <div>
-    <pop-menu ref="popMenu" :menu="menu" />
-    <route-selection ref="routeSelection" />
-    <route-lock ref="routeLock" />
-    <route-control ref="routeControl" />
-    <route-cmd-control ref="routeCmdControl" />
-    <route-hand-control ref="routeHandControl" />
-    <route-detail ref="routeDetail" />
-    <notice-info ref="noticeInfo" />
-  </div>
-</template>
-
-<script>
-import PopMenu from '@/components/PopMenu';
-import RouteControl from './dialog/routeControl';
-import RouteSelection from './dialog/routeSelection';
-import RouteLock from './dialog/routeLock';
-import RouteCmdControl from './dialog/routeCmdControl';
-import RouteHandControl from './dialog/routeHandControl';
-import RouteDetail from './dialog/routeDetail';
-import NoticeInfo from './dialog/childDialog/childDialog/noticeInfo';
-import { mapGetters } from 'vuex';
-import { OperateMode } from '@/scripts/ConstDic';
-import { MapDeviceType, OperationEvent, DeviceMenu } from '@/scripts/ConstDic';
-import { MenuDisabledState, menuConvert, menuFiltration } from './utils/menuItemStatus';
-
-export default {
-    name: 'SignalMenu',
-    components: {
-        PopMenu,
-        RouteControl,
-        RouteSelection,
-        RouteLock,
-        RouteCmdControl,
-        RouteHandControl,
-        RouteDetail,
-        NoticeInfo
-    },
-    props: {
-        selected: {
-            type: Object,
-            default() {
-                return null;
-            }
-        }
-    },
-    data() {
-        return {
-            menu: [],
-            menuNormal: {
-                local: [
-                    {
-                        label: this.$t('menu.menuSignal.routeSelect'),
-                        handler: this.arrangementRoute,
-                        disabledCallback: MenuDisabledState.Signal.arrangementRoute,
-                        auth: { station: true, center: false }
-                    },
-                    {
-                        label: this.$t('menu.menuSignal.routeCancel'),
-                        handler: this.cancelTrainRoute,
-                        disabledCallback: MenuDisabledState.Signal.cancelTrainRoute,
-                        auth: { station: true, center: false }
-                    },
-                    {
-                        label: this.$t('menu.menuSignal.signalBlock'),
-                        handler: this.lock,
-                        disabledCallback: MenuDisabledState.Signal.lock,
-                        auth: { station: true, center: false }
-                    },
-                    {
-                        label: this.$t('menu.menuSignal.signalDeblock'),
-                        handler: this.unlock,
-                        disabledCallback: MenuDisabledState.Signal.unlock,
-                        auth: { station: true, center: false }
-                    },
-                    {
-                        label: this.$t('menu.menuSignal.signalReopen'),
-                        handler: this.reopenSignal,
-                        disabledCallback: MenuDisabledState.Signal.reopenSignal,
-                        auth: { station: true, center: false }
-                    },
-                    {
-                        label: this.$t('menu.menuSignal.guideRouteHandle'),
-                        handler: this.guide,
-                        disabledCallback: MenuDisabledState.Signal.guide,
-                        auth: { station: true, center: false }
-                    },
-                    {
-                        label: this.$t('menu.menuSignal.setInterlockAutoRoute'),
-                        handler: this.setAutoInterlock,
-                        disabledCallback: MenuDisabledState.Signal.setAutoInterlock,
-                        auth: { station: true, center: false }
-                    },
-                    {
-                        label: this.$t('menu.menuSignal.cancelInterlockAutoRoute'),
-                        handler: this.cancelAutoInterlock,
-                        disabledCallback: MenuDisabledState.Signal.cancelAutoInterlock,
-                        auth: { station: true, center: false }
-                    },
-                    {
-                        label: this.$t('menu.menuSignal.setInterlockAutoTrigger'),
-                        handler: this.setAutoTrigger,
-                        disabledCallback: MenuDisabledState.Signal.setAutoTrigger,
-                        auth: { station: true, center: false }
-                    },
-                    {
-                        label: this.$t('menu.menuSignal.cancelInterlockAutoTrigger'),
-                        handler: this.cancelAutoTrigger,
-                        disabledCallback: MenuDisabledState.Signal.cancelAutoTrigger,
-                        auth: { station: true, center: false }
-                    },
-                    {
-                        label: this.$t('menu.menuSignal.signalOff'),
-                        handler: this.signalClose,
-                        disabledCallback: MenuDisabledState.Signal.signalClose,
-                        auth: { station: true, center: false }
-                    }
-                ],
-                central: [
-                    {
-                        label: this.$t('menu.menuSignal.routeSelect'),
-                        handler: this.arrangementRoute,
-                        disabledCallback: MenuDisabledState.Signal.arrangementRoute,
-                        auth: { station: false, center: true }
-                    },
-                    {
-                        label: this.$t('menu.menuSignal.routeCancel'),
-                        handler: this.cancelTrainRoute,
-                        disabledCallback: MenuDisabledState.Signal.cancelTrainRoute,
-                        auth: { station: false, center: true }
-                    },
-                    {
-                        label: this.$t('menu.menuSignal.signalBlock'),
-                        handler: this.lock,
-                        disabledCallback: MenuDisabledState.Signal.lock,
-                        auth: { station: false, center: true }
-                    },
-                    {
-                        label: this.$t('menu.menuSignal.signalDeblock'),
-                        handler: this.unlock,
-                        disabledCallback: MenuDisabledState.Signal.unlock,
-                        auth: { station: false, center: true }
-                    },
-                    {
-                        label: this.$t('menu.menuSignal.signalOff'),
-                        handler: this.signalClose,
-                        disabledCallback: MenuDisabledState.Signal.signalClose,
-                        auth: { station: false, center: true }
-                    },
-                    {
-                        label: this.$t('menu.menuSignal.signalReopen'),
-                        handler: this.reopenSignal,
-                        disabledCallback: MenuDisabledState.Signal.reopenSignal,
-                        auth: { station: false, center: true }
-                    },
-                    {
-                        label: this.$t('menu.menuSignal.routeGuide'),
-                        handler: this.guide,
-                        disabledCallback: MenuDisabledState.Signal.guide,
-                        auth: { station: false, center: false }
-                    },
-                    {
-                        label: this.$t('menu.menuSignal.humanControl'),
-                        handler: this.humanControl,
-                        disabledCallback: MenuDisabledState.Signal.humanControl,
-                        auth: { station: false, center: true }
-                    },
-                    {
-                        label: this.$t('menu.menuSignal.atsAutoControl'),
-                        handler: this.atsAutoControl,
-                        disabledCallback: MenuDisabledState.Signal.atsAutoControl,
-                        auth: { station: false, center: true }
-                    },
-                    {
-                        label: this.$t('menu.menuSignal.queryRouteControlMode'),
-                        handler: this.detail,
-                        disabledCallback: MenuDisabledState.Signal.detail,
-                        auth: { station: true, center: true }
-                    }
-                ]
-            },
-            menuForce: [
-                {
-                    label: this.$t('menu.menuSignal.setFault'),
-                    handler: this.setStoppage,
-                    disabledCallback: MenuDisabledState.Signal.setStoppage
-                },
-                {
-                    label: this.$t('menu.menuSignal.cancelFault'),
-                    handler: this.cancelStoppage,
-                    disabledCallback: MenuDisabledState.Signal.cancelStoppage
-                }
-            ]
-        };
-    },
-    computed: {
-        ...mapGetters('training', [
-            'mode',
-            'operatemode'
-        ]),
-        ...mapGetters('menuOperation', [
-            'buttonOperation'
-        ])
-    },
-    watch: {
-        '$store.state.menuOperation.menuCount': function (val) {
-            if (this.$store.getters['menuOperation/checkDialogIsOpen'](DeviceMenu.Signal) && !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 = menuFiltration(this.menuNormal);
-            if (this.operatemode === OperateMode.ADMIN) {
-                this.menu = [...this.menu, ...this.menuForce];
-            }
-
-            // 故障模式菜单列表
-            if (this.operatemode === OperateMode.FAULT) {
-                this.menu = this.menuForce;
-            }
-
-            this.menu = menuConvert(this.menu);
-
-        },
-        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();
-            }
-        },
-        // 设置故障
-        setStoppage() {
-            const operate = {
-                start: true,
-                send: true,
-                code: this.selected.code,
-                type: MapDeviceType.Signal.type,
-                label: MapDeviceType.Signal.label,
-                operation: OperationEvent.Signal.stoppage.menu.operation
-            };
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                if (valid) {
-                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                } else {
-                    this.$refs.noticeInfo.doShow(operate);
-                }
-            }).catch(() => {
-                this.$refs.noticeInfo.doShow(operate);
-            });
-        },
-        // 取消故障
-        cancelStoppage() {
-            const operate = {
-                start: true,
-                send: true,
-                code: this.selected.code,
-                type: MapDeviceType.Signal.type,
-                label: MapDeviceType.Signal.label,
-                operation: OperationEvent.Signal.cancelStoppage.menu.operation
-            };
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                if (valid) {
-                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                } else {
-                    this.$refs.noticeInfo.doShow(operate);
-                }
-            }).catch(() => {
-                this.$refs.noticeInfo.doShow(operate);
-            });
-        },
-        // 排列进路
-        arrangementRoute() {
-            const operate = {
-                start: true,
-                send: true,
-                code: this.selected.code,
-                type: MapDeviceType.Signal.type,
-                label: MapDeviceType.Signal.label,
-                operation: OperationEvent.Signal.arrangementRoute.menu.operation
-            };
-
-            this.$store.dispatch('training/next', operate).then(({ valid, response }) => {
-                this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                if (valid) {
-                    var tempData = null;
-                    if (response) {
-                        tempData = response.data;
-                    }
-                    this.$refs.routeSelection.doShow(operate.operation, this.selected, tempData);
-                }
-            }).catch(() => {
-                this.$refs.noticeInfo.doShow(operate);
-            });
-        },
-        // 取消进路
-        cancelTrainRoute() {
-            const operate = {
-                start: true,
-                code: this.selected.code,
-                type: MapDeviceType.Signal.type,
-                label: MapDeviceType.Signal.label,
-                operation: OperationEvent.Signal.cancelTrainRoute.menu.operation
-            };
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                if (valid) {
-                    this.$refs.routeControl.doShow(operate, this.selected);
-                }
-            });
-        },
-        // 信号封锁
-        lock() {
-            const operate = {
-                start: true,
-                send: true,
-                code: this.selected.code,
-                type: MapDeviceType.Signal.type,
-                label: MapDeviceType.Signal.label,
-                operation: OperationEvent.Signal.lock.menu.operation
-            };
-
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                if (valid) {
-                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    this.$refs.routeLock.doShow(operate.operation, this.selected);
-                }
-            }).catch(() => {
-                this.$refs.noticeInfo.doShow(operate);
-            });
-        },
-        // 信号解封
-        unlock() {
-            const operate = {
-                start: true,
-                code: this.selected.code,
-                type: MapDeviceType.Signal.type,
-                label: MapDeviceType.Signal.label,
-                operation: OperationEvent.Signal.unlock.menu.operation
-            };
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                if (valid) {
-                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    this.$refs.routeCmdControl.doShow(operate, this.selected);
-                }
-            });
-        },
-        // 信号重开
-        reopenSignal() {
-            const operate = {
-                start: true,
-                code: this.selected.code,
-                type: MapDeviceType.Signal.type,
-                label: MapDeviceType.Signal.label,
-                operation: OperationEvent.Signal.reopenSignal.menu.operation
-            };
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                if (valid) {
-                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    this.$refs.routeControl.doShow(operate, this.selected);
-                }
-            });
-        },
-        // 进路引导
-        guide() {
-            const operate = {
-                start: true,
-                code: this.selected.code,
-                type: MapDeviceType.Signal.type,
-                label: MapDeviceType.Signal.label,
-                operation: OperationEvent.Signal.guide.menu.operation
-            };
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                if (valid) {
-                    this.$refs.routeCmdControl.doShow(operate, this.selected);
-                }
-            });
-        },
-        // 设置联锁自动进路
-        setAutoInterlock() {
-            const operate = {
-                start: true,
-                code: this.selected.code,
-                type: MapDeviceType.Signal.type,
-                label: MapDeviceType.Signal.label,
-                operation: OperationEvent.Signal.setAutoInterlock.menu.operation
-            };
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                if (valid) {
-                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    this.$refs.routeControl.doShow(operate, this.selected);
-                }
-            });
-        },
-        // 取消联锁自动进路
-        cancelAutoInterlock() {
-            const operate = {
-                start: true,
-                code: this.selected.code,
-                type: MapDeviceType.Signal.type,
-                label: MapDeviceType.Signal.label,
-                operation: OperationEvent.Signal.cancelAutoInterlock.menu.operation
-            };
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                if (valid) {
-                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    this.$refs.routeControl.doShow(operate, this.selected);
-                }
-            });
-        },
-        // 设置联锁自动触发
-        setAutoTrigger() {
-            const operate = {
-                start: true,
-                code: this.selected.code,
-                type: MapDeviceType.Signal.type,
-                label: MapDeviceType.Signal.label,
-                operation: OperationEvent.Signal.setAutoTrigger.menu.operation
-            };
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                if (valid) {
-                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    this.$refs.routeControl.doShow(operate, this.selected);
-                }
-            });
-        },
-        // 取消联锁自动触发
-        cancelAutoTrigger() {
-            const operate = {
-                start: true,
-                code: this.selected.code,
-                type: MapDeviceType.Signal.type,
-                label: MapDeviceType.Signal.label,
-                operation: OperationEvent.Signal.cancelAutoTrigger.menu.operation
-            };
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                if (valid) {
-                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    this.$refs.routeControl.doShow(operate, this.selected);
-                }
-            });
-        },
-        // 信号关灯
-        signalClose() {
-            const operate = {
-                start: true,
-                code: this.selected.code,
-                type: MapDeviceType.Signal.type,
-                label: MapDeviceType.Signal.label,
-                operation: OperationEvent.Signal.signalClose.menu.operation
-            };
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                if (valid) {
-                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    this.$refs.routeControl.doShow(operate, this.selected);
-                }
-            });
-        },
-        // 自排关(进路交人工控)
-        humanControl() {
-            const operate = {
-                start: true,
-                send: true,
-                code: this.selected.code,
-                type: MapDeviceType.Signal.type,
-                label: MapDeviceType.Signal.label,
-                operation: OperationEvent.Signal.humanControl.menu.operation
-            };
-            this.$store.dispatch('training/next', operate).then(({ valid, response }) => {
-                if (valid) {
-                    let tempData = null;
-                    if (response) {
-                        tempData = response.data;
-                    }
-                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    this.$refs.routeHandControl.doShow(operate, this.selected, tempData);
-                }
-            });
-        },
-        // 自排关（进路交ATS自动控）
-        atsAutoControl() {
-            const operate = {
-                start: true,
-                send: true,
-                code: this.selected.code,
-                type: MapDeviceType.Signal.type,
-                label: MapDeviceType.Signal.label,
-                operation: OperationEvent.Signal.atsAutoControl.menu.operation
-            };
-            this.$store.dispatch('training/next', operate).then(({ valid, response }) => {
-                if (valid) {
-                    let tempData = null;
-                    if (response) {
-                        tempData = response.data;
-                    }
-                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    this.$refs.routeHandControl.doShow(operate, this.selected, tempData);
-                }
-            });
-        },
-        // 查询进路状态
-        detail() {
-            const operate = {
-                start: true,
-                send: true,
-                code: this.selected.code,
-                type: MapDeviceType.Signal.type,
-                label: MapDeviceType.Signal.label,
-                operation: OperationEvent.Signal.detail.menu.operation
-            };
-            this.$store.dispatch('training/next', operate).then(({ valid, response }) => {
-                if (valid) {
-                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    this.$refs.routeDetail.doShow(operate, this.selected, response.data);
-                }
-            });
-        }
-    }
-};
-</script>
diff --git a/src/jmap/theme/fuzhou_01/menus/menuStation.vue b/src/jmap/theme/fuzhou_01/menus/menuStation.vue
deleted file mode 100644
index a5cbb4993..000000000
--- a/src/jmap/theme/fuzhou_01/menus/menuStation.vue
+++ /dev/null
@@ -1,302 +0,0 @@
-<template>
-  <div>
-    <pop-menu ref="popMenu" :menu="menu" />
-    <station-cmd-control ref="stationCmdControl" />
-    <station-human-control-all ref="stationHumanControlAll" />
-    <station-set-route-control-all ref="stationSetRouteControlAll" />
-    <notice-info ref="noticeInfo" />
-  </div>
-</template>
-
-<script>
-import PopMenu from '@/components/PopMenu';
-import StationCmdControl from './dialog/stationCmdControl';
-import StationHumanControlAll from './dialog/stationHumanControlAll';
-import StationSetRouteControlAll from './dialog/stationSetRouteControlAll';
-import NoticeInfo from './dialog/childDialog/childDialog/noticeInfo';
-import { mapGetters } from 'vuex';
-import { OperateMode } from '@/scripts/ConstDic';
-import { MapDeviceType, OperationEvent, DeviceMenu } from '@/scripts/ConstDic';
-import { MenuDisabledState, menuConvert, menuFiltration } from './utils/menuItemStatus';
-
-export default {
-    name: 'StationMenu',
-    components: {
-        PopMenu,
-        StationCmdControl,
-        StationHumanControlAll,
-        StationSetRouteControlAll,
-        NoticeInfo
-    },
-    props: {
-        selected: {
-            type: Object,
-            default() {
-                return null;
-            }
-        }
-    },
-    data() {
-        return {
-            menu: [],
-            menuNormal: {
-                local: [
-                    {
-                        label: this.$t('menu.menuStation.fullSiteSetInterlockAutoTrigger'),
-                        handler: this.setAutoTrigger,
-                        disabledCallback: MenuDisabledState.Station.setAutoTrigger,
-                        auth: { station: true, center: false }
-                    },
-                    {
-                        label: this.$t('menu.menuStation.fullSiteCancelInterlockAutoTrigger'),
-                        handler: this.cancelAutoTrigger,
-                        disabledCallback: MenuDisabledState.Station.cancelAutoTrigger,
-                        auth: { station: true, center: false }
-                    },
-                    {
-                        label: this.$t('menu.menuStation.powerUnLock'),
-                        handler: this.powerUnLock,
-                        disabledCallback: MenuDisabledState.Station.powerUnLock,
-                        auth: { station: true, center: false }
-                    },
-                    {
-                        label: this.$t('menu.menuStation.execKeyOperationTest'),
-                        handler: this.execKeyOperationTest,
-                        disabledCallback: MenuDisabledState.Station.execKeyOperationTest,
-                        auth: { station: true, center: false }
-                    }
-                ],
-                central: [
-                    {
-                        label: this.$t('menu.menuStation.allHumanControl'),
-                        handler: this.humanControlALL,
-                        disabledCallback: MenuDisabledState.Station.humanControlALL,
-                        auth: { station: false, center: true }
-                    },
-                    {
-                        label: this.$t('menu.menuStation.allATSAutoControl'),
-                        handler: this.atsAutoControlALL,
-                        disabledCallback: MenuDisabledState.Station.atsAutoControlALL,
-                        auth: { station: false, center: true }
-                    },
-                    {
-                        label: this.$t('menu.menuStation.execKeyOperationTest'),
-                        handler: this.execKeyOperationTest,
-                        disabledCallback: MenuDisabledState.Station.execKeyOperationTest,
-                        auth: { station: false, center: true }
-                    }
-                ]
-            },
-            menuForce: [
-                {
-                    label: this.$t('menu.menuStation.setStoppage'),
-                    handler: this.setStoppage,
-                    disabledCallback: MenuDisabledState.Station.setStoppage
-                },
-                {
-                    label: this.$t('menu.menuStation.cancelStoppage'),
-                    handler: this.cancelStoppage,
-                    disabledCallback: MenuDisabledState.Station.cancelStoppage
-                }
-            ]
-        };
-    },
-    computed: {
-        ...mapGetters('training', [
-            'mode',
-            'operatemode'
-        ]),
-        ...mapGetters('menuOperation', [
-            'buttonOperation'
-        ])
-    },
-    watch: {
-        '$store.state.menuOperation.menuCount': function (val) {
-            if (this.$store.getters['menuOperation/checkDialogIsOpen'](DeviceMenu.Station) && !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 = [];
-            if (this.selected.concentrateStationCode == this.selected.code) {
-                // 编辑模式菜单列表
-                this.menu = menuFiltration(this.menuNormal);
-                if (this.operatemode === OperateMode.ADMIN) {
-                    this.menu = [...this.menu, ...this.menuForce];
-                }
-            }
-
-            if (this.selected.centralized) {
-                // 故障模式菜单列表
-                if (this.operatemode === OperateMode.FAULT) {
-                    this.menu = [...this.menuForce];
-                }
-            }
-
-            this.menu = menuConvert(this.menu);
-        },
-        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();
-            }
-        },
-        // 设置故障
-        setStoppage() {
-            const operate = {
-                start: true,
-                send: true,
-                code: this.selected.code,
-                type: MapDeviceType.Station.type,
-                label: MapDeviceType.Station.label,
-                operation: OperationEvent.Station.stoppage.menu.operation
-            };
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                if (valid) {
-                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                } else {
-                    this.$refs.noticeInfo.doShow(operate);
-                }
-            }).catch(() => {
-                this.$refs.noticeInfo.doShow(operate);
-            });
-        },
-        // 取消故障
-        cancelStoppage() {
-            const operate = {
-                start: true,
-                send: true,
-                code: this.selected.code,
-                type: MapDeviceType.Station.type,
-                label: MapDeviceType.Station.label,
-                operation: OperationEvent.Station.cancelStoppage.menu.operation
-            };
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                if (valid) {
-                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                } else {
-                    this.$refs.noticeInfo.doShow(operate);
-                }
-            }).catch(() => {
-                this.$refs.noticeInfo.doShow(operate);
-            });
-        },
-        // 全站设置联锁自动触发
-        setAutoTrigger() {
-            const operate = {
-                start: true,
-                send: true,
-                code: this.selected.code,
-                type: MapDeviceType.Station.type,
-                label: MapDeviceType.Station.label,
-                operation: OperationEvent.Station.setAutoTrigger.menu.operation
-            };
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                if (valid) {
-                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                }
-            }).catch(() => {
-                this.$refs.noticeInfo.doShow(operate);
-            });
-        },
-        // 全站取消联锁自动触发
-        cancelAutoTrigger() {
-            const operate = {
-                start: true,
-                send: true,
-                code: this.selected.code,
-                type: MapDeviceType.Station.type,
-                label: MapDeviceType.Station.label,
-                operation: OperationEvent.Station.cancelAutoTrigger.menu.operation
-            };
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                if (valid) {
-                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                }
-            }).catch(() => {
-                this.$refs.noticeInfo.doShow(operate);
-            });
-        },
-        // 上电解锁
-        powerUnLock() {
-            const operate = {
-                start: true,
-                code: this.selected.code,
-                type: MapDeviceType.Station.type,
-                label: MapDeviceType.Station.label,
-                operation: OperationEvent.Station.powerUnLock.menu.operation
-            };
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                if (valid) {
-                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    this.$refs.stationCmdControl.doShow(operate, this.selected);
-                }
-            });
-        },
-        // 执行关键操作测试
-        execKeyOperationTest() {
-            const operate = {
-                start: true,
-                code: this.selected.code,
-                type: MapDeviceType.Station.type,
-                label: MapDeviceType.Station.label,
-                operation: OperationEvent.Station.execKeyOperationTest.menu.operation
-            };
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                if (valid) {
-                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    this.$refs.stationCmdControl.doShow(operate, this.selected);
-                }
-            });
-        },
-        // 所有进路自排关
-        humanControlALL() {
-            const operate = {
-                start: true,
-                code: this.selected.code,
-                type: MapDeviceType.Station.type,
-                label: MapDeviceType.Station.label,
-                operation: OperationEvent.Station.humanControlALL.menu.operation
-            };
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                if (valid) {
-                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    this.$refs.stationHumanControlAll.doShow(operate);
-                }
-            });
-        },
-        // 所有进路自排开
-        atsAutoControlALL() {
-            const operate = {
-                start: true,
-                code: this.selected.code,
-                type: MapDeviceType.Station.type,
-                label: MapDeviceType.Station.label,
-                operation: OperationEvent.Station.atsAutoControlALL.menu.operation
-            };
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                if (valid) {
-                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    this.$refs.stationSetRouteControlAll.doShow(operate, this.selected);
-                }
-            });
-        }
-    }
-};
-</script>
diff --git a/src/jmap/theme/fuzhou_01/menus/menuStationControl.vue b/src/jmap/theme/fuzhou_01/menus/menuStationControl.vue
deleted file mode 100644
index ddecefc8a..000000000
--- a/src/jmap/theme/fuzhou_01/menus/menuStationControl.vue
+++ /dev/null
@@ -1,69 +0,0 @@
-<template>
-  <pop-menu ref="popMenu" :menu="menu" />
-</template>
-
-<script>
-import PopMenu from '@/components/PopMenu';
-import { mapGetters } from 'vuex';
-import { DeviceMenu } from '@/scripts/ConstDic';
-
-export default {
-    name: 'StationControlMenu',
-    components: {
-        PopMenu
-    },
-    props: {
-        selected: {
-            type: Object,
-            default() {
-                return null;
-            }
-        }
-    },
-    data() {
-        return {
-            menu: [],
-            menuNormal: [
-            ],
-            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();
-            };
-        },
-        doShow(point) {
-            if (this.$refs && this.$refs.popMenu) {
-                this.$refs.popMenu.close();
-            }
-        },
-        doClose() {
-            if (this.$refs && this.$refs.popMenu) {
-                this.$refs.popMenu.close();
-            }
-        }
-    }
-};
-</script>
diff --git a/src/jmap/theme/fuzhou_01/menus/menuStationStand.vue b/src/jmap/theme/fuzhou_01/menus/menuStationStand.vue
deleted file mode 100644
index 260d7fdf7..000000000
--- a/src/jmap/theme/fuzhou_01/menus/menuStationStand.vue
+++ /dev/null
@@ -1,488 +0,0 @@
-<template>
-  <div>
-    <pop-menu ref="popMenu" :menu="menu" />
-    <stand-control ref="standControl" />
-    <stand-detail ref="standDetail" />
-    <stand-run-level ref="standRunLevel" />
-    <stand-stop-time ref="standStopTime" />
-    <stand-detain-train-all ref="standDetainTrainAll" />
-    <notice-info ref="noticeInfo" />
-    <stand-back-strategy ref="standBackStrategy" />
-  </div>
-</template>
-
-<script>
-import PopMenu from '@/components/PopMenu';
-import StandControl from './dialog/standControl';
-import StandBackStrategy from './dialog/standBackStrategy';
-import StandDetail from './dialog/standDetail';
-import StandRunLevel from './dialog/standRunLevel';
-import StandStopTime from './dialog/standStopTime';
-import StandDetainTrainAll from './dialog/standDetainTrainAll';
-import NoticeInfo from './dialog/childDialog/childDialog/noticeInfo';
-import { mapGetters } from 'vuex';
-import { OperateMode } from '@/scripts/ConstDic';
-import { MapDeviceType, OperationEvent, DeviceMenu } from '@/scripts/ConstDic';
-import { MenuDisabledState, menuConvert, menuFiltration } from './utils/menuItemStatus';
-
-export default {
-    name: 'StationStandMenu',
-    components: {
-        PopMenu,
-        StandControl,
-        StandDetail,
-        StandRunLevel,
-        NoticeInfo,
-        StandBackStrategy,
-        StandStopTime,
-        StandDetainTrainAll
-    },
-    props: {
-        selected: {
-            type: Object,
-            default() {
-                return null;
-            }
-        }
-    },
-    data() {
-        return {
-            menu: [],
-            menuNormal: {
-                local: [
-                    {
-                        label: this.$t('menu.menuStationStand.detainTrain'),
-                        handler: this.setDetainTrain,
-                        disabledCallback: MenuDisabledState.StationStand.setDetainTrain,
-                        auth: { station: true, center: false }
-                    },
-                    {
-                        label: this.$t('menu.menuStationStand.cancelDetainTrain'),
-                        handler: this.cancelDetainTrain,
-                        disabledCallback: MenuDisabledState.StationStand.cancelDetainTrain,
-                        auth: { station: true, center: false }
-                    },
-                    {
-                        label: this.$t('menu.menuStationStand.cancelDetainTrainForce'),
-                        handler: this.cancelDetainTrainForce,
-                        disabledCallback: MenuDisabledState.StationStand.cancelDetainTrainForce,
-                        auth: { station: true, center: false }
-                    },
-                    {
-                        label: this.$t('menu.menuStationStand.jumpStop'),
-                        handler: this.setJumpStop,
-                        disabledCallback: MenuDisabledState.StationStand.setJumpStop,
-                        auth: { station: true, center: false }
-                    },
-                    {
-                        label: this.$t('menu.menuStationStand.cancelJumpStop'),
-                        handler: this.cancelJumpStop,
-                        disabledCallback: MenuDisabledState.StationStand.cancelJumpStop,
-                        auth: { station: true, center: false }
-                    },
-                    {
-                        label: this.$t('menu.menuStationStand.setRunLevel'),
-                        handler: this.setRunLevel,
-                        disabledCallback: MenuDisabledState.StationStand.setRunLevel,
-                        auth: { station: false, center: false }
-                    },
-                    {
-                        label: this.$t('menu.menuStationStand.setEarlyDeparture'),
-                        handler: this.earlyDeparture,
-                        disabledCallback: MenuDisabledState.StationStand.earlyDeparture,
-                        auth: { station: false, center: false }
-                    },
-                    {
-                        label: this.$t('menu.menuStationStand.setBackStrategy'),
-                        handler: this.setBackStrategy,
-                        disabledCallback: MenuDisabledState.StationStand.setBackStrategy,
-                        auth: { station: false, center: false }
-                    },
-                    {
-                        label: this.$t('menu.menuStationStand.getStationStandStatus'),
-                        handler: this.detail,
-                        disabledCallback: MenuDisabledState.StationStand.detail,
-                        auth: { station: true, center: false }
-                    }
-                ],
-                central: [
-                    {
-                        label: this.$t('menu.menuStationStand.detainTrain'),
-                        handler: this.setDetainTrain,
-                        disabledCallback: MenuDisabledState.StationStand.setDetainTrain,
-                        auth: { station: false, center: true }
-                    },
-                    {
-                        label: this.$t('menu.menuStationStand.cancelDetainTrain'),
-                        handler: this.cancelDetainTrain,
-                        disabledCallback: MenuDisabledState.StationStand.cancelDetainTrain,
-                        auth: { station: false, center: true }
-                    },
-                    {
-                        label: this.$t('menu.menuStationStand.cancelDetainTrainForce'),
-                        handler: this.cancelDetainTrainForce,
-                        disabledCallback: MenuDisabledState.StationStand.cancelDetainTrainForce,
-                        auth: { station: false, center: false }
-                    },
-                    {
-                        label: this.$t('menu.menuStationStand.cancelDetainTrainAll'), // 全线取消扣车
-                        handler: this.cancelDetainTrainAll,
-                        disabledCallback: MenuDisabledState.StationStand.cancelDetainTrainAll,
-                        auth: { station: false, center: true }
-                    },
-                    {
-                        label: this.$t('menu.menuStationStand.jumpStop'),
-                        handler: this.setJumpStop,
-                        disabledCallback: MenuDisabledState.StationStand.setJumpStop,
-                        auth: { station: false, center: true }
-                    },
-                    {
-                        label: this.$t('menu.menuStationStand.cancelJumpStop'),
-                        handler: this.cancelJumpStop,
-                        disabledCallback: MenuDisabledState.StationStand.cancelJumpStop,
-                        auth: { station: true, center: true }
-                    },
-                    {
-                        label: this.$t('menu.menuStationStand.setStopTime'),
-                        handler: this.setStopTime,
-                        disabledCallback: MenuDisabledState.StationStand.setStopTime,
-                        auth: { station: false, center: true }
-                    },
-                    {
-                        label: this.$t('menu.menuStationStand.setRunLevel'),
-                        handler: this.setRunLevel,
-                        disabledCallback: MenuDisabledState.StationStand.setRunLevel,
-                        auth: { station: false, center: true }
-                    },
-                    {
-                        label: this.$t('menu.menuStationStand.setEarlyDeparture'),
-                        handler: this.earlyDeparture,
-                        disabledCallback: MenuDisabledState.StationStand.earlyDeparture,
-                        auth: { station: false, center: true }
-                    },
-                    {
-                        label: this.$t('menu.menuStationStand.setBackStrategy'),
-                        handler: this.setBackStrategy,
-                        disabledCallback: MenuDisabledState.StationStand.setBackStrategy,
-                        auth: { station: false, center: true }
-                    },
-                    {
-                        label: this.$t('menu.menuStationStand.getStationStandStatus'),
-                        handler: this.detail,
-                        disabledCallback: MenuDisabledState.StationStand.detail,
-                        auth: { station: true, center: true }
-                    }
-                ]
-            },
-            menuForce: [
-                {
-                    label: this.$t('menu.menuStationStand.setFault'),
-                    handler: this.setStoppage,
-                    disabledCallback: MenuDisabledState.StationStand.setStoppage
-                },
-                {
-                    label: this.$t('menu.menuStationStand.cancelFault'),
-                    handler: this.cancelStoppage,
-                    disabledCallback: MenuDisabledState.StationStand.cancelStoppage
-                }
-            ]
-        };
-    },
-    computed: {
-        ...mapGetters('training', [
-            'mode',
-            'operatemode'
-        ]),
-        ...mapGetters('menuOperation', [
-            'buttonOperation'
-        ])
-    },
-    watch: {
-        '$store.state.menuOperation.menuCount': function (val) {
-            if (this.$store.getters['menuOperation/checkDialogIsOpen'](DeviceMenu.StationStand) && !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 = menuFiltration(this.menuNormal);
-            if (this.operatemode === OperateMode.ADMIN) {
-                this.menu = [...this.menu, ...this.menuForce];
-            }
-
-            // 故障模式菜单列表
-            if (this.operatemode === OperateMode.FAULT) {
-                this.menu = this.menuForce;
-            }
-
-            this.menu = menuConvert(this.menu);
-        },
-        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();
-            }
-        },
-        // 设置故障
-        setStoppage() {
-            const operate = {
-                start: true,
-                send: true,
-                code: this.selected.code,
-                type: MapDeviceType.StationStand.type,
-                label: MapDeviceType.StationStand.label,
-                operation: OperationEvent.StationStand.stoppage.menu.operation
-            };
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                if (valid) {
-                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                } else {
-                    this.$refs.noticeInfo.doShow(operate);
-                }
-            }).catch(() => {
-                this.$refs.noticeInfo.doShow(operate);
-            });
-        },
-        // 取消故障
-        cancelStoppage() {
-            const operate = {
-                start: true,
-                send: true,
-                code: this.selected.code,
-                type: MapDeviceType.StationStand.type,
-                label: MapDeviceType.StationStand.label,
-                operation: OperationEvent.StationStand.cancelStoppage.menu.operation
-            };
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                if (valid) {
-                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                } else {
-                    this.$refs.noticeInfo.doShow(operate);
-                }
-            }).catch(() => {
-                this.$refs.noticeInfo.doShow(operate);
-            });
-        },
-        // 设置扣车
-        setDetainTrain() {
-            const operate = {
-                start: true,
-                code: this.selected.code,
-                type: MapDeviceType.StationStand.type,
-                label: MapDeviceType.StationStand.label,
-                operation: OperationEvent.StationStand.setDetainTrain.menu.operation
-            };
-
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                if (valid) {
-                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    this.$refs.standControl.doShow(operate, this.selected);
-                }
-            });
-        },
-        // 取消扣车
-        cancelDetainTrain() {
-            const operate = {
-                start: true,
-                code: this.selected.code,
-                type: MapDeviceType.StationStand.type,
-                label: MapDeviceType.StationStand.label,
-                operation: OperationEvent.StationStand.cancelDetainTrain.menu.operation
-            };
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                if (valid) {
-                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    this.$refs.standControl.doShow(operate, this.selected);
-                }
-            });
-        },
-        // 强制取消扣车
-        cancelDetainTrainForce() {
-            const operate = {
-                start: true,
-                code: this.selected.code,
-                type: MapDeviceType.StationStand.type,
-                label: MapDeviceType.StationStand.label,
-                operation: OperationEvent.StationStand.cancelDetainTrainForce.menu.operation
-            };
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                if (valid) {
-                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    this.$refs.standControl.doShow(operate, this.selected);
-                }
-            });
-        },
-        // 全线取消扣车
-        cancelDetainTrainAll() {
-            const operate = {
-                start: true,
-                code: this.selected.code,
-                type: MapDeviceType.StationStand.type,
-                label: MapDeviceType.StationStand.label,
-                operation: OperationEvent.StationStand.cancelDetainTrainAll.menu.operation
-            };
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                if (valid) {
-                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    this.$refs.standDetainTrainAll.doShow(operate, this.selected);
-                }
-            });
-        },
-        // 设置跳停
-        setJumpStop() {
-            const operate = {
-                start: true,
-                code: this.selected.code,
-                type: MapDeviceType.StationStand.type,
-                label: MapDeviceType.StationStand.label,
-                operation: OperationEvent.StationStand.setJumpStop.menu.operation
-            };
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                if (valid) {
-                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    this.$refs.standControl.doShow(operate, this.selected);
-                }
-            });
-        },
-        // 取消跳停
-        cancelJumpStop() {
-            const operate = {
-                start: true,
-                code: this.selected.code,
-                type: MapDeviceType.StationStand.type,
-                label: MapDeviceType.StationStand.label,
-                operation: OperationEvent.StationStand.cancelJumpStop.menu.operation
-            };
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                if (valid) {
-                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    this.$refs.standControl.doShow(operate, this.selected);
-                }
-            });
-        },
-        // 设置停站时间
-        setStopTime() {
-            const operate = {
-                start: true,
-                send: true,
-                code: this.selected.code,
-                type: MapDeviceType.StationStand.type,
-                label: MapDeviceType.StationStand.label,
-                operation: OperationEvent.StationStand.setStopTime.menu.operation
-            };
-            this.$store.dispatch('training/next', operate).then(({ valid, response }) => {
-                if (valid) {
-                    let tempDate = null;
-                    if (response) {
-                        tempDate = response.data;
-                    }
-                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    this.$refs.standStopTime.doShow(operate, this.selected, tempDate);
-                }
-            }).catch(() => {
-                this.$refs.noticeInfo.doShow(operate);
-            });
-        },
-        // 设置运行等级
-        setRunLevel() {
-            const operate = {
-                start: true,
-                send: true,
-                code: this.selected.code,
-                type: MapDeviceType.StationStand.type,
-                label: MapDeviceType.StationStand.label,
-                operation: OperationEvent.StationStand.setRunLevel.menu.operation
-            };
-            this.$store.dispatch('training/next', operate).then(({ valid, response }) => {
-                if (valid) {
-                    let tempDate = null;
-                    if (response) {
-                        tempDate = response.data;
-                    }
-                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    this.$refs.standRunLevel.doShow(operate, this.selected, tempDate);
-                }
-            }).catch(() => {
-                this.$refs.noticeInfo.doShow(operate);
-            });
-        },
-        // 设置提前发车
-        earlyDeparture() {
-            const operate = {
-                start: true,
-                code: this.selected.code,
-                type: MapDeviceType.StationStand.type,
-                operation: OperationEvent.StationStand.earlyDeparture.menu.operation
-            };
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                if (valid) {
-                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    this.$refs.standControl.doShow(operate, this.selected);
-                }
-            });
-        },
-        // 设置折返策略
-        setBackStrategy() {
-            const operate = {
-                start: true,
-                send: true,
-                code: this.selected.code,
-                type: MapDeviceType.StationStand.type,
-                operation: OperationEvent.StationStand.setBackStrategy.menu.operation
-            };
-
-            this.$store.dispatch('training/next', operate).then(({ valid, response }) => {
-                if (valid) {
-                    let tempDate = null;
-                    if (response) {
-                        tempDate = response.data;
-                    }
-                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    this.$refs.standBackStrategy.doShow(operate, this.selected, tempDate);
-                }
-            }).catch(() => {
-                this.$refs.noticeInfo.doShow(operate);
-            });
-        },
-        // 查询站台状态
-        detail() {
-            const operate = {
-                start: true,
-                send: true,
-                code: this.selected.code,
-                type: MapDeviceType.StationStand.type,
-                label: MapDeviceType.StationStand.label,
-                operation: OperationEvent.StationStand.detail.menu.operation
-            };
-            this.$store.dispatch('training/next', operate).then(({ valid, response }) => {
-                if (valid) {
-                    let tempDate = null;
-                    if (response) {
-                        tempDate = response.data;
-                    }
-                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    this.$refs.standDetail.doShow(operate, this.selected, tempDate);
-                }
-            }).catch(() => {
-                this.$refs.noticeInfo.doShow(operate);
-            });
-        }
-    }
-};
-</script>
diff --git a/src/jmap/theme/fuzhou_01/menus/menuSwitch.vue b/src/jmap/theme/fuzhou_01/menus/menuSwitch.vue
deleted file mode 100644
index 8c18ebee9..000000000
--- a/src/jmap/theme/fuzhou_01/menus/menuSwitch.vue
+++ /dev/null
@@ -1,485 +0,0 @@
-<template>
-  <div>
-    <pop-menu ref="popMenu" :menu="menu" />
-    <switch-control ref="switchControl" />
-    <switch-cmd-control ref="switchCmdControl" />
-    <speed-cmd-control ref="speedCmdControl" />
-    <notice-info ref="noticeInfo" />
-  </div>
-</template>
-
-<script>
-import PopMenu from '@/components/PopMenu';
-import SwitchControl from './dialog/switchControl';
-import SwitchCmdControl from './dialog/switchCmdControl';
-import SpeedCmdControl from './dialog/speedCmdControl';
-import NoticeInfo from './dialog/childDialog/childDialog/noticeInfo';
-import { mapGetters } from 'vuex';
-import { OperateMode } from '@/scripts/ConstDic';
-import { MapDeviceType, OperationEvent, DeviceMenu } from '@/scripts/ConstDic';
-import { MenuDisabledState, menuConvert, menuFiltration } from './utils/menuItemStatus';
-
-export default {
-    name: 'SwitchMenu',
-    components: {
-        PopMenu,
-        SwitchControl,
-        SwitchCmdControl,
-        SpeedCmdControl,
-        NoticeInfo
-    },
-    props: {
-        selected: {
-            type: Object,
-            default() {
-                return null;
-            }
-        }
-    },
-    data() {
-        return {
-            menu: [],
-            menuNormal: {
-                local: [
-                    {
-                        label: this.$t('menu.menuSwitch.switchLock'),
-                        handler: this.lock,
-                        disabledCallback: MenuDisabledState.Switch.lock,
-                        auth: { station: true, center: false }
-                    },
-                    {
-                        label: this.$t('menu.menuSwitch.switchUnlock'),
-                        handler: this.unlock,
-                        disabledCallback: MenuDisabledState.Switch.unlock,
-                        auth: { station: true, center: false }
-                    },
-                    {
-                        label: this.$t('menu.menuSwitch.switchSectionBlockade'),
-                        handler: this.block,
-                        disabledCallback: MenuDisabledState.Switch.block,
-                        auth: { station: true, center: false }
-                    },
-                    {
-                        label: this.$t('menu.menuSwitch.switchSectionUnblock'),
-                        handler: this.unblock,
-                        disabledCallback: MenuDisabledState.Switch.unblock,
-                        auth: { station: true, center: false }
-                    },
-                    {
-                        label: this.$t('menu.menuSwitch.switchTurnout'),
-                        handler: this.switchTurnout,
-                        disabledCallback: MenuDisabledState.Switch.switchTurnout,
-                        auth: { station: true, center: false }
-                    },
-                    {
-                        label: this.$t('menu.menuSwitch.switchSectionFaultUnlock'),
-                        handler: this.fault,
-                        disabledCallback: MenuDisabledState.Switch.fault,
-                        auth: { station: true, center: false }
-                    },
-                    {
-                        label: this.$t('menu.menuSwitch.switchSectionAxisPreReset'),
-                        handler: this.axlePreReset,
-                        disabledCallback: MenuDisabledState.Switch.axlePreReset,
-                        auth: { station: true, center: false }
-                    },
-                    {
-                        label: this.$t('menu.menuSwitch.sectionResection'),
-                        handler: this.split,
-                        disabledCallback: MenuDisabledState.Switch.split,
-                        auth: { station: true, center: false }
-                    },
-                    {
-                        label: this.$t('menu.menuSwitch.sectionActive'),
-                        handler: this.active,
-                        disabledCallback: MenuDisabledState.Switch.active,
-                        auth: { station: true, center: false }
-                    },
-                    {
-                        label: this.$t('menu.menuSwitch.switchSectionSetSpeedLimit'),
-                        handler: this.setSpeed,
-                        disabledCallback: MenuDisabledState.Switch.setSpeed,
-                        auth: { station: true, center: false }
-                    },
-                    {
-                        label: this.$t('menu.menuSwitch.switchSectionCancelSpeedLimit'),
-                        handler: this.cancelSpeed,
-                        disabledCallback: MenuDisabledState.Switch.cancelSpeed,
-                        auth: { station: true, center: false }
-                    }
-                ],
-                central: [
-                    {
-                        label: this.$t('menu.menuSwitch.switchLock'),
-                        handler: this.lock,
-                        disabledCallback: MenuDisabledState.Switch.lock,
-                        auth: { station: false, center: true }
-                    },
-                    {
-                        label: this.$t('menu.menuSwitch.switchUnlock'),
-                        handler: this.unlock,
-                        disabledCallback: MenuDisabledState.Switch.unlock,
-                        auth: { station: false, center: true }
-                    },
-                    {
-                        label: this.$t('menu.menuSwitch.switchSectionBlockade'),
-                        handler: this.block,
-                        disabledCallback: MenuDisabledState.Switch.block,
-                        auth: { station: false, center: true }
-                    },
-                    {
-                        label: this.$t('menu.menuSwitch.switchSectionUnblock'),
-                        handler: this.unblock,
-                        disabledCallback: MenuDisabledState.Switch.unblock,
-                        auth: { station: false, center: true }
-                    },
-                    {
-                        label: this.$t('menu.menuSwitch.switchTurnout'),
-                        handler: this.switchTurnout,
-                        disabledCallback: MenuDisabledState.Switch.switchTurnout,
-                        auth: { station: false, center: true }
-                    },
-                    {
-                        label: this.$t('menu.menuSwitch.switchSectionFaultUnlock'),
-                        handler: this.fault,
-                        disabledCallback: MenuDisabledState.Switch.fault,
-                        auth: { station: false, center: true }
-                    },
-                    {
-                        label: this.$t('menu.menuSwitch.sectionResection'),
-                        handler: this.split,
-                        disabledCallback: MenuDisabledState.Switch.split,
-                        auth: { station: true, center: true }
-                    },
-                    {
-                        label: this.$t('menu.menuSwitch.sectionActive'),
-                        handler: this.active,
-                        disabledCallback: MenuDisabledState.Switch.active,
-                        auth: { station: true, center: true }
-                    },
-                    {
-                        label: this.$t('menu.menuSwitch.switchSectionSetSpeedLimit'),
-                        handler: this.setSpeed,
-                        disabledCallback: MenuDisabledState.Switch.setSpeed,
-                        auth: { station: false, center: true }
-                    },
-                    {
-                        label: this.$t('menu.menuSwitch.switchSectionCancelSpeedLimit'),
-                        handler: this.cancelSpeed,
-                        disabledCallback: MenuDisabledState.Switch.cancelSpeed,
-                        auth: { station: false, center: true }
-                    }
-                ]
-            },
-            menuForce: [
-                {
-                    label: this.$t('menu.menuSwitch.setFault'),
-                    handler: this.setStoppage,
-                    disabledCallback: MenuDisabledState.Switch.setStoppage,
-                    auth: {
-
-                    }
-                },
-                {
-                    label: this.$t('menu.menuSwitch.cancelFault'),
-                    handler: this.cancelStoppage,
-                    disabledCallback: MenuDisabledState.Switch.cancelStoppage,
-                    auth: {
-
-                    }
-                }
-            ]
-        };
-    },
-    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();
-            }
-        }
-    },
-    methods: {
-        clickEvent() {
-            const self = this;
-            window.onclick = function (e) {
-                self.doClose();
-            };
-        },
-        initMenu() {
-            // 编辑模式菜单列表
-            this.menu = menuFiltration(this.menuNormal);
-            if (this.operatemode === OperateMode.ADMIN) {
-                this.menu = [...this.menu, ...this.menuForce];
-            }
-
-            // 故障模式菜单列表
-            if (this.operatemode === OperateMode.FAULT) {
-                this.menu = this.menuForce;
-            }
-
-            this.menu = menuConvert(this.menu);
-        },
-        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();
-            }
-        },
-        // 设置故障
-        setStoppage() {
-            const operate = {
-                start: true,
-                send: true,
-                code: this.selected.code,
-                type: MapDeviceType.Switch.type,
-                label: MapDeviceType.Switch.label,
-                operation: OperationEvent.Switch.stoppage.menu.operation
-            };
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                if (valid) {
-                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                } else {
-                    this.$refs.noticeInfo.doShow(operate);
-                }
-            }).catch(() => {
-                this.$refs.noticeInfo.doShow(operate);
-            });
-        },
-        // 取消故障
-        cancelStoppage() {
-            const operate = {
-                start: true,
-                send: true,
-                code: this.selected.code,
-                type: MapDeviceType.Switch.type,
-                label: MapDeviceType.Switch.label,
-                operation: OperationEvent.Switch.cancelStoppage.menu.operation
-            };
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                if (valid) {
-                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                } else {
-                    this.$refs.noticeInfo.doShow(operate);
-                }
-            }).catch(() => {
-                this.$refs.noticeInfo.doShow(operate);
-            });
-        },
-        // 道岔单锁
-        lock() {
-            const operate = {
-                start: true,
-                code: this.selected.code,
-                type: MapDeviceType.Switch.type,
-                label: MapDeviceType.Switch.label,
-                operation: OperationEvent.Switch.lock.menu.operation
-            };
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                if (valid) {
-                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    this.$refs.switchControl.doShow(operate, this.selected);
-                }
-            });
-        },
-        // 道岔解封
-        unlock() {
-            const operate = {
-                start: true,
-                code: this.selected.code,
-                type: MapDeviceType.Switch.type,
-                label: MapDeviceType.Switch.label,
-                operation: OperationEvent.Switch.unlock.menu.operation
-            };
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                if (valid) {
-                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    this.$refs.switchCmdControl.doShow(operate, this.selected);
-                }
-            });
-        },
-        // 道岔封锁
-        block() {
-            const operate = {
-                start: true,
-                code: this.selected.code,
-                type: MapDeviceType.Switch.type,
-                label: MapDeviceType.Switch.label,
-                operation: OperationEvent.Switch.block.menu.operation
-            };
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                if (valid) {
-                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    this.$refs.switchControl.doShow(operate, this.selected);
-                }
-            });
-        },
-        // 道岔解封
-        unblock() {
-            const operate = {
-                start: true,
-                code: this.selected.code,
-                type: MapDeviceType.Switch.type,
-                label: MapDeviceType.Switch.label,
-                operation: OperationEvent.Switch.unblock.menu.operation
-            };
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                if (valid) {
-                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    this.$refs.switchCmdControl.doShow(operate, this.selected);
-                }
-            });
-        },
-        // 道岔强扳
-        switchTurnoutForce() {
-            const operate = {
-                start: true,
-                code: this.selected.code,
-                type: MapDeviceType.Switch.type,
-                label: MapDeviceType.Switch.label,
-                operation: OperationEvent.Switch.turnoutForce.menu.operation
-            };
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                if (valid) {
-                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    this.$refs.switchControl.doShow(operate, this.selected);
-                }
-            });
-        },
-        // 道岔转动
-        switchTurnout() {
-            const operate = {
-                start: true,
-                code: this.selected.code,
-                type: MapDeviceType.Switch.type,
-                label: MapDeviceType.Switch.label,
-                operation: OperationEvent.Switch.turnout.menu.operation
-            };
-
-            if (operate.operation) {
-                this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                    if (valid) {
-                        this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                        this.$refs.switchControl.doShow(operate, this.selected);
-                    }
-                });
-            }
-        },
-        // 道岔故障解锁
-        fault() {
-            const operate = {
-                start: true,
-                code: this.selected.code,
-                type: MapDeviceType.Switch.type,
-                label: MapDeviceType.Switch.label,
-                operation: OperationEvent.Switch.fault.menu.operation
-            };
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                if (valid) {
-                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    this.$refs.switchCmdControl.doShow(operate, this.selected);
-                }
-            });
-        },
-        // 道岔计轴预复位
-        axlePreReset() {
-            const operate = {
-                start: true,
-                code: this.selected.code,
-                type: MapDeviceType.Switch.type,
-                label: MapDeviceType.Switch.label,
-                operation: OperationEvent.Switch.axlePreReset.menu.operation
-            };
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                if (valid) {
-                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    this.$refs.switchCmdControl.doShow(operate, this.selected);
-                }
-            });
-        },
-        // 区段切除
-        split() {
-            const operate = {
-                start: true,
-                code: this.selected.code,
-                type: MapDeviceType.Switch.type,
-                label: MapDeviceType.Switch.label,
-                operation: OperationEvent.Switch.split.menu.operation
-            };
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                if (valid) {
-                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    this.$refs.switchControl.doShow(operate, this.selected);
-                }
-            });
-        },
-        // 区段激活
-        active() {
-            const operate = {
-                start: true,
-                code: this.selected.code,
-                type: MapDeviceType.Switch.type,
-                label: MapDeviceType.Switch.label,
-                operation: OperationEvent.Switch.active.menu.operation
-            };
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                if (valid) {
-                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    this.$refs.switchControl.doShow(operate, this.selected);
-                }
-            });
-        },
-        // 道岔设置速度
-        setSpeed() {
-            const operate = {
-                start: true,
-                code: this.selected.code,
-                type: MapDeviceType.Switch.type,
-                label: MapDeviceType.Switch.label,
-                operation: OperationEvent.Switch.setSpeed.menu.operation
-            };
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                if (valid) {
-                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    this.$refs.speedCmdControl.doShow(operate, this.selected);
-                }
-            });
-        },
-        // 道岔取消速度
-        cancelSpeed() {
-            const operate = {
-                start: true,
-                send: true,
-                code: this.selected.code,
-                type: MapDeviceType.Switch.type,
-                label: MapDeviceType.Switch.label,
-                operation: OperationEvent.Switch.cancelSpeed.menu.operation
-            };
-            this.$store.dispatch('training/next', operate).then(({ valid, response }) => {
-                if (valid) {
-                    const tempData = response.data;
-                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    this.$refs.speedCmdControl.doShow(operate, this.selected, tempData);
-                }
-            });
-        }
-
-    }
-};
-</script>
diff --git a/src/jmap/theme/fuzhou_01/menus/menuTrain.vue b/src/jmap/theme/fuzhou_01/menus/menuTrain.vue
deleted file mode 100644
index 40679a35d..000000000
--- a/src/jmap/theme/fuzhou_01/menus/menuTrain.vue
+++ /dev/null
@@ -1,321 +0,0 @@
-<template>
-  <div>
-    <pop-menu ref="popMenu" :menu="menu" />
-    <notice-info ref="noticeInfo" />
-    <train-control ref="trainControl" />
-    <train-delete ref="trainDelete" />
-    <train-move ref="trainMove" />
-    <train-switch ref="trainSwitch" />
-    <train-edit-number ref="trainEditNumber" />
-  </div>
-</template>
-
-<script>
-import PopMenu from '@/components/PopMenu';
-import NoticeInfo from './dialog/childDialog/childDialog/noticeInfo';
-import { mapGetters } from 'vuex';
-import { OperateMode } from '@/scripts/ConstDic';
-import { MapDeviceType, OperationEvent, DeviceMenu } from '@/scripts/ConstDic';
-import { MenuDisabledState, menuConvert, trainMenuFiltration } from './utils/menuItemStatus';
-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';
-
-export default {
-    name: 'MenuTrain',
-    components: {
-        PopMenu,
-        NoticeInfo,
-        TrainControl,
-        TrainDelete,
-        TrainMove,
-        TrainSwitch,
-        TrainEditNumber
-    },
-    props: {
-        selected: {
-            type: Object,
-            default() {
-                return null;
-            }
-        }
-    },
-    data() {
-        return {
-            menu: [],
-            menuNormal: {
-                local: [],
-                central: [
-                    {
-                        label: this.$t('menu.menuTrain.addTrainId'),
-                        handler: this.addTrainId,
-                        disabledCallback: MenuDisabledState.Train.addTrainId,
-                        auth: { station: true, center: true }
-                    },
-                    {
-                        label: this.$t('menu.menuTrain.deleteTrainId'),
-                        handler: this.delTrainId,
-                        disabledCallback: MenuDisabledState.Train.delTrainId,
-                        auth: { station: true, center: true }
-                    },
-                    {
-                        label: this.$t('menu.menuTrain.editTrainId'),
-                        handler: this.editTrainId,
-                        disabledCallback: MenuDisabledState.Train.editTrainId,
-                        auth: { station: true, center: true }
-                    },
-                    {
-                        label: this.$t('menu.menuTrain.editTrainNo'),
-                        handler: this.editTrainNo,
-                        disabledCallback: MenuDisabledState.Train.editTrainNo,
-                        auth: { station: true, center: true }
-                    },
-                    {
-                        label: this.$t('menu.menuTrain.moveTrainId'),
-                        handler: this.moveTrainId,
-                        disabledCallback: MenuDisabledState.Train.moveTrainId,
-                        auth: { station: true, center: true }
-                    },
-                    {
-                        label: this.$t('menu.menuTrain.switchTrainId'),
-                        handler: this.switchTrainId,
-                        disabledCallback: MenuDisabledState.Train.switchTrainId,
-                        auth: { station: true, center: true }
-                    }
-                ]
-            },
-            menuForce: [
-                {
-                    label: this.$t('menu.menuTrain.setCommunicationFault'),
-                    handler: this.setStoppage,
-                    disabledCallback: MenuDisabledState.Train.setStoppage
-                },
-                {
-                    label: this.$t('menu.menuTrain.cancelCommunicationFault'),
-                    handler: this.cancelStoppage,
-                    disabledCallback: MenuDisabledState.Train.cancelStoppage
-                }
-            ],
-            menuSpeed: [
-                {
-                    label: this.$t('menu.menuTrain.confirmRunToFrontStation'),
-                    handler: this.limitSpeed,
-                    disabledCallback: MenuDisabledState.Train.limitSpeed
-                }
-            ]
-        };
-    },
-    computed: {
-        ...mapGetters('training', [
-            'mode',
-            'operatemode'
-        ]),
-        ...mapGetters('menuOperation', [
-            'buttonOperation'
-        ])
-    },
-    watch: {
-        '$store.state.menuOperation.menuCount': function () {
-            if (this.$store.getters['menuOperation/checkDialogIsOpen'](DeviceMenu.Train) && !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 = trainMenuFiltration(this.menuNormal);
-            if (this.operatemode === OperateMode.ADMIN) {
-                this.menu = [...this.menu, ...this.menuForce, ...this.menuSpeed];
-            }
-
-            // 故障模式菜单列表
-            if (this.operatemode === OperateMode.FAULT) {
-                this.menu = [...this.menuForce, ...this.menuSpeed];
-            }
-
-            this.menu = menuConvert(this.menu);
-        },
-        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();
-                // this.$store.dispatch('map/setTrainWindowShow', false);
-            }
-        },
-        // 设置故障
-        setStoppage() {
-            const operate = {
-                start: true,
-                send: true,
-                code: this.selected.code,
-                type: MapDeviceType.Train.type,
-                label: MapDeviceType.Train.label,
-                operation: OperationEvent.Train.stoppage.menu.operation
-            };
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                if (valid) {
-                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                } else {
-                    this.$refs.noticeInfo.doShow(operate);
-                }
-            }).catch(() => {
-                this.$refs.noticeInfo.doShow(operate);
-            });
-        },
-        // 取消故障
-        cancelStoppage() {
-            const operate = {
-                start: true,
-                send: true,
-                code: this.selected.code,
-                type: MapDeviceType.Train.type,
-                label: MapDeviceType.Train.label,
-                operation: OperationEvent.Train.cancelStoppage.menu.operation
-            };
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                if (valid) {
-                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                } else {
-                    this.$refs.noticeInfo.doShow(operate);
-                }
-            }).catch(() => {
-                this.$refs.noticeInfo.doShow(operate);
-            });
-        },
-        // 限速行驶
-        limitSpeed() {
-            const operate = {
-                start: true,
-                send: true,
-                code: this.selected.code,
-                type: MapDeviceType.Train.type,
-                label: MapDeviceType.Train.label,
-                operation: OperationEvent.Train.limitSpeed.menu.operation
-            };
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                if (valid) {
-                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                } else {
-                    this.$refs.noticeInfo.doShow(operate);
-                }
-            }).catch(() => {
-                this.$refs.noticeInfo.doShow(operate);
-            });
-        },
-        // 添加列车识别号
-        addTrainId() {
-            const operate = {
-                start: true,
-                code: this.selected.code,
-                type: MapDeviceType.Train.type,
-                label: MapDeviceType.Train.label,
-                operation: OperationEvent.Train.addTrainId.menu.operation
-            };
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                if (valid) {
-                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    this.$refs.trainControl.doShow(operate, this.selected);
-                }
-            });
-        },
-        // 删除列车识别号
-        delTrainId() {
-            const operate = {
-                start: true,
-                code: this.selected.code,
-                type: MapDeviceType.Train.type,
-                label: MapDeviceType.Train.label,
-                operation: OperationEvent.Train.delTrainId.menu.operation
-            };
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                if (valid) {
-                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    this.$refs.trainDelete.doShow(operate, this.selected);
-                }
-            });
-        },
-        // 修改列车识别号
-        editTrainId() {
-            const operate = {
-                start: true,
-                code: this.selected.code,
-                type: MapDeviceType.Train.type,
-                label: MapDeviceType.Train.label,
-                operation: OperationEvent.Train.editTrainId.menu.operation
-            };
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                if (valid) {
-                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    this.$refs.trainControl.doShow(operate, this.selected);
-                }
-            });
-        },
-        // 修改车组号
-        editTrainNo() {
-            const operate = {
-                start: true,
-                code: this.selected.code,
-                type: MapDeviceType.Train.type,
-                label: MapDeviceType.Train.label,
-                operation: OperationEvent.Train.editTrainNo.menu.operation
-            };
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                if (valid) {
-                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    this.$refs.trainEditNumber.doShow(operate, this.selected);
-                }
-            });
-        },
-        // 移动列车识别号
-        moveTrainId() {
-            const operate = {
-                start: true,
-                code: this.selected.code,
-                type: MapDeviceType.Train.type,
-                label: MapDeviceType.Train.label,
-                operation: OperationEvent.Train.moveTrainId.menu.operation
-            };
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                if (valid) {
-                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    this.$refs.trainMove.doShow(operate, this.selected);
-                }
-            });
-        },
-        // 交换列车识别号
-        switchTrainId() {
-            const operate = {
-                start: true,
-                code: this.selected.code,
-                type: MapDeviceType.Train.type,
-                label: MapDeviceType.Train.label,
-                operation: OperationEvent.Train.switchTrainId.menu.operation
-            };
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                if (valid) {
-                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    this.$refs.trainSwitch.doShow(operate, this.selected);
-                }
-            });
-        }
-    }
-};
-</script>
diff --git a/src/jmap/theme/fuzhou_01/menus/passiveDialog/control.vue b/src/jmap/theme/fuzhou_01/menus/passiveDialog/control.vue
deleted file mode 100644
index 0ee717b7d..000000000
--- a/src/jmap/theme/fuzhou_01/menus/passiveDialog/control.vue
+++ /dev/null
@@ -1,315 +0,0 @@
-<template>
-  <el-dialog
-    v-dialogDrag
-    class="fuzhou-01__systerm passive-control"
-    :title="$t('menu.passiveDialog.controlModeRequest')"
-    :visible.sync="show"
-    width="700px"
-    :before-close="doClose"
-    :show-close="true"
-    :z-index="2000"
-    :modal="false"
-    :close-on-click-modal="false"
-  >
-    <span class="control-label">{{ `${requestInfo}${$t('menu.passiveDialog.requestAreaControlMode')}` }}</span>
-    <el-table
-      ref="multipleTable"
-      :data="tableData"
-      border
-      row-key="code"
-      style="width: 100%"
-      height="250"
-      center
-      size="mini"
-      highlight-current-row
-    >
-      <el-table-column prop="operate" :label="$t('menu.passiveDialog.operatingArea')">
-        <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="$t('menu.passiveDialog.currentControlMode')" width="120">
-        <template slot-scope="scope">
-          <span :style="{color: scope.row.disabled ? '#CBCBCB':'unset'}">{{ scope.row.control.name }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column prop="target" :label="$t('menu.passiveDialog.requestControlMode')" width="120">
-        <template slot-scope="scope">
-          <span :style="{color: scope.row.disabled ? '#CBCBCB':'unset'}">{{ scope.row.target.name }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column prop="agree" :label="$t('menu.passiveDialog.isAgree')" width="140">
-        <template slot-scope="scope">
-          <el-checkbox ref="agree" v-model="scope.row.agree" :disabled="scope.row.disabled" />
-        </template>
-      </el-table-column>
-    </el-table>
-    <span class="control-label">{{ $t('menu.passiveDialog.messageOne') }} {{ count }} {{ $t('menu.passiveDialog.messageTwo') }}</span>
-    <el-row class="button-group">
-      <el-col :span="10" :offset="3">
-        <el-button :id="domAgree" :disabled="disabledAgree" @click="agree">{{ $t('menu.passiveDialog.agree') }}
-        </el-button>
-      </el-col>
-      <el-col :span="6" :offset="4">
-        <el-button :id="domIdRefuse" :disabled="disabledRefuse" @click="refuse">{{ $t('menu.passiveDialog.refuse') }}</el-button>
-      </el-col>
-    </el-row>
-    <notice-info ref="noticeInfo" />
-  </el-dialog>
-</template>
-
-<script>
-import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
-import NoticeInfo from '../dialog/childDialog/childDialog/noticeInfo';
-
-export default {
-    name: 'RequestControl',
-    components: {
-        NoticeInfo
-    },
-    data() {
-        return {
-            dialogShow: false,
-            disabledAgree: false,
-            disabledRefuse: false,
-            requestInfo: this.$t('menu.passiveDialog.dispatcherWorkstation'),
-            controlProps: {
-                '01': this.$t('menu.passiveDialog.inTheControl'),
-                '02': this.$t('menu.passiveDialog.stationControl')
-            },
-            selection: [],
-            tableData: [],
-            timer: null,
-            timeout: 61,
-            count: 0,
-            commandId: ''
-        };
-    },
-    computed: {
-        targetStatus() {
-            if (this.$store.state.training.prdType == '01') {
-                return '01';
-            }
-            if (this.$store.state.training.prdType == '02') {
-                return '02';
-            }
-            return '';
-        },
-        show() {
-            return this.dialogShow && !this.$store.state.menuOperation.break;
-        },
-        domIdChoose() {
-            return this.dialogShow ? OperationEvent.StationControl.controlResponse.choose.domId : '';
-        },
-        domAgree() {
-            return this.dialogShow ? OperationEvent.StationControl.controlResponse.agree.domId : '';
-        },
-        domIdRefuse() {
-            return this.dialogShow ? OperationEvent.StationControl.controlResponse.refuse.domId : '';
-        }
-    },
-    watch: {
-        tableData: {
-            handler(val, oldVal) {
-                this.checkTableDataSelction(val);
-            },
-            deep: true
-        },
-        '$store.state.socket.msgHead': function (elem) {
-            if (elem && elem.type == 'req') {
-                if (elem.stationControlCode) {
-                    this.doShow(elem);
-                    this.commandId = elem.commandId;
-                }
-            }
-        }
-    },
-    mounted() {
-        this.$nextTick(() => {
-            this.$store.dispatch('training/tipReload');
-        });
-    },
-    methods: {
-        createTimer() {
-            this.count = this.timeout;
-            this.timer = setInterval(() => {
-                if (this.count <= 0) {
-                    this.doClose();
-                    return;
-                }
-                this.count = this.count - 1;
-            }, 1000);
-        },
-        clearTimer() {
-            if (this.timer) {
-                clearInterval(this.timer);
-                this.timer = null;
-            }
-        },
-        checkTableDataSelction(data) {
-            const selection = [];
-            if (data && data.length > 0) {
-                data.forEach(row => {
-                    if (row.agree && !row.disabled) {
-                        selection.push(row);
-                    }
-                });
-            }
-
-            this.disabledSend = !selection.length;
-            if (JSON.stringify(selection) !== JSON.stringify(this.selection)) {
-                this.handleChooseChange(selection);
-                this.selection = selection;
-                this.disabledAgree = this.selection.length <= 0;
-            }
-        },
-        updateTableData(code) {
-            this.tableData = [];
-
-            const model = {
-                code: code,
-                operate: '',
-                control: { code: '', name: '' },
-                target: { code: '', name: '' },
-                agree: false,
-                disabled: false
-            };
-
-            const device = this.$store.getters['map/getDeviceByCode'](code);
-            if (device) {
-                const control = (device || {}).state;
-                if (control) {
-                    model.control = { status: control.status, name: this.controlProps[control.status] };
-                    model.target = { status: this.targetStatus, name: this.controlProps[this.targetStatus] };
-                }
-
-                const station = this.$store.getters['map/getDeviceByCode'](device.stationCode);
-                if (station) {
-                    model.operate = station.name || '';
-                }
-            }
-
-            this.tableData.push(model);
-        },
-        doShow(msgHead) {
-            this.requestInfo = `${msgHead.fromMember.deviceName}`;
-            if (msgHead.fromMember.nickName) {
-                this.requestInfo = `${msgHead.fromMember.deviceName}(${msgHead.fromMember.nickName})`;
-            }
-            this.dialogShow = true;
-            this.disabledAgree = true;
-            this.createTimer();
-            this.updateTableData(msgHead.stationControlCode);
-
-            const operate = {
-                start: true,
-                type: MapDeviceType.StationControl.type,
-                operation: OperationEvent.StationControl.controlResponse.menu.operation
-            };
-
-            this.$store.dispatch('training/emitTipFresh');
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                if (valid) {
-                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                }
-            });
-
-        },
-        doClose() {
-            this.disabledAgree = false;
-            if (this.dialogShow) {
-                this.$store.dispatch('socket/shiftMsgQueue');
-            }
-
-            this.count = 0;
-            this.dialogShow = false;
-            this.clearTimer();
-            this.$store.dispatch('training/emitTipFresh');
-            this.$refs.multipleTable.setCurrentRow();
-        },
-        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 = {
-                    type: MapDeviceType.StationControl.type,
-                    operation: OperationEvent.StationControl.controlResponse.choose.operation,
-                    val: this.serializeCodeListWithSeparator('::')
-                };
-
-                this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                    if (valid) {
-                        this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    }
-                });
-            } else if (!selection) {
-                this.$messageBox(this.$t('menu.passiveDialog.selectData'));
-
-            }
-        },
-        agree() {
-            const operate = {
-                send: true,
-                over: true,
-                type: MapDeviceType.StationControl.type,
-                operation: OperationEvent.StationControl.controlResponse.agree.operation,
-                code: this.selection[0].code,
-                val: this.commandId,
-                prdType: this.$store.state.training.prdType
-            };
-
-            this.clearTimer();
-            this.disabledAgree = true;
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                if (valid) {
-                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    this.doClose();
-                }
-            }).catch(() => {
-                this.$refs.noticeInfo.doShow(operate);
-            });
-        },
-        refuse() {
-            const operate = {
-                send: true,
-                over: true,
-                type: MapDeviceType.StationControl.type,
-                operation: OperationEvent.StationControl.controlResponse.refuse.operation,
-                code: this.selection.length ? this.selection[0].code : '',
-                val: this.commandId,
-                prdType: this.$store.state.training.prdType
-            };
-            if (!operate.code) {
-                operate.code = this.tableData[0].code;
-            }
-
-            this.clearTimer();
-            this.disabledAgree = true;
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                if (valid) {
-                    this.doClose();
-                }
-            }).catch(() => {
-                this.$refs.noticeInfo.doShow(operate);
-            });
-        }
-    }
-};
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-    @import "src/styles/mixin.scss";
-
-    .control-label {
-        line-height: 30px;
-        font-size: 18px;
-    }
-</style>
diff --git a/src/jmap/theme/fuzhou_01/menus/statusDownTrainDetail.vue b/src/jmap/theme/fuzhou_01/menus/statusDownTrainDetail.vue
deleted file mode 100644
index ac712152d..000000000
--- a/src/jmap/theme/fuzhou_01/menus/statusDownTrainDetail.vue
+++ /dev/null
@@ -1,25 +0,0 @@
-<template>
-  <div id="statusDownTrainDetail" />
-</template>
-
-<script>
-export default {
-    name: 'StatusDownTrainDetail',
-    props: {
-        selected: {
-            type: Object,
-            default() {
-                return null;
-            }
-        }
-    },
-    data() {
-        return {
-        };
-    },
-    mounted() {
-    }
-};
-</script>
-<style>
-</style>
diff --git a/src/jmap/theme/fuzhou_01/menus/statusUpTrainDetail.vue b/src/jmap/theme/fuzhou_01/menus/statusUpTrainDetail.vue
deleted file mode 100644
index bb1e0cee3..000000000
--- a/src/jmap/theme/fuzhou_01/menus/statusUpTrainDetail.vue
+++ /dev/null
@@ -1,26 +0,0 @@
-<template>
-  <div id="statusUpTrainDetail" />
-</template>
-
-<script>
-export default {
-    name: 'StatusUpTrainDetail',
-    props: {
-        selected: {
-            type: Object,
-            default() {
-                return null;
-            }
-        }
-    },
-    data() {
-        return {
-        };
-    },
-    mounted() {
-    }
-};
-</script>
-<style>
-
-</style>
diff --git a/src/jmap/theme/fuzhou_01/menus/utils/menuItemStatus.js b/src/jmap/theme/fuzhou_01/menus/utils/menuItemStatus.js
deleted file mode 100644
index c41559f8c..000000000
--- a/src/jmap/theme/fuzhou_01/menus/utils/menuItemStatus.js
+++ /dev/null
@@ -1,570 +0,0 @@
-import store from '@/store/index_APP_TARGET';
-import deviceState from '@/jmap/constant/deviceState';
-import { OperateMode } from '@/scripts/ConstDic';
-
-export function getCurrentStateObject() {
-    return store.getters['menuOperation/selected'];
-}
-
-/** 系统类型 */
-export const SystemType = {
-    '01': 'local',		// 现地工作站
-    '02': 'central'		// 中心调度工作站
-};
-
-export const StationControlType = {
-    '01': 'center', 	// 中控
-    '02': 'station',	// 站控
-    '03': 'station'
-};
-
-// 控制禁用
-export const MenuDisabledState = {
-    Section: {
-        // 故障解锁
-        fault() {
-        },
-        // 切除
-        split() {
-            const device = getCurrentStateObject();
-            if (device && device.cutOff != deviceState.Section.cutOff.Default) {
-                return true;
-            }
-        },
-        // 激活
-        active() {
-            const device = getCurrentStateObject();
-            if (device && device.cutOff == deviceState.Section.cutOff.Default) {
-                return true;
-            }
-        },
-        // 区段封锁
-        lock() {
-            const device = getCurrentStateObject();
-            if (device && device.status == deviceState.Section.status.State06) {
-                return true;
-            }
-        },
-        // 区段解禁
-        unlock() {
-            const device = getCurrentStateObject();
-            if (device && device.status != deviceState.Section.status.State06) {
-                return true;
-            }
-        },
-        // 区段设置限速
-        setSpeed() {
-            const device = getCurrentStateObject();
-            if (device && device.speedUpperLimit != deviceState.Section.speedUpperLimit.Default) {
-                return true;
-            }
-        },
-        // 区段取消限速
-        cancelSpeed() {
-            const device = getCurrentStateObject();
-            if (device && device.speedUpperLimit == deviceState.Section.speedUpperLimit.Default) {
-                return true;
-            }
-        },
-        // 新建列车
-        newTrain() {
-        },
-        // 计轴预复位
-        axlePreReset() {
-        },
-        // 设置故障
-        setStoppage() {
-            const device = getCurrentStateObject();
-            if (device && device.fault) {
-                return true;
-            }
-        },
-        // 取消故障
-        cancelStoppage() {
-            const device = getCurrentStateObject();
-            if (device && !device.fault) {
-                return true;
-            }
-        }
-    },
-    Signal: {
-        // 进路选排
-        arrangementRoute() {
-
-        },
-        // 进路取消
-        cancelTrainRoute() {
-        },
-        // 信号封闭
-        lock() {
-            const device = getCurrentStateObject();
-            if (device && device.status == deviceState.Signal.status.State05) {
-                return true;
-            }
-        },
-        // 信号解封
-        unlock() {
-            const device = getCurrentStateObject();
-            if (device && device.status != deviceState.Signal.status.State05) {
-                return true;
-            }
-        },
-        // 信号重开
-        reopenSignal() {
-        },
-        // 进路引导
-        guide() {
-        },
-        // 设置联锁自动进路
-        setAutoInterlock() {
-        },
-        // 取消联锁自动进路
-        cancelAutoInterlock() {
-        },
-        // 设置联锁自动触发
-        setAutoTrigger() {
-        },
-        // 取消联锁自动触发
-        cancelAutoTrigger() {
-        },
-        // 关灯
-        signalClose() {
-            const device = getCurrentStateObject();
-            if (device && device.status == deviceState.Signal.status.State01) {
-                return true;
-            }
-        },
-        // 人工控
-        humanControl() {
-        },
-        // ats自动控
-        atsAutoControl() {
-        },
-        // 查询进路状态
-        detail() {
-        },
-        // 设置故障
-        setStoppage() {
-            const device = getCurrentStateObject();
-            if (device && device.fault) {
-                return true;
-            }
-        },
-        // 取消故障
-        cancelStoppage() {
-            const device = getCurrentStateObject();
-            if (device && !device.fault) {
-                return true;
-            }
-        }
-    },
-    Station: {
-        // 全站设置联锁自动触发
-        setAutoTrigger() {
-        },
-        // 全站取消联锁自动触发
-        cancelAutoTrigger() {
-        },
-        // 上电解锁
-        powerUnLock() {
-        },
-        // 执行关键操作测试
-        execKeyOperationTest() {
-        },
-        // 所有进路自排开
-        atsAutoControlALL() {
-        },
-        // 所有进路自排关
-        humanControlALL() {
-        },
-        // 设置ZC故障
-        setStoppage() {
-            const device = getCurrentStateObject();
-            if (device && device.fault) {
-                return true;
-            }
-        },
-        // 取消ZC故障
-        cancelStoppage() {
-            const device = getCurrentStateObject();
-            if (device && !device.fault) {
-                return true;
-            }
-        }
-    },
-    StationControl: {
-        // 紧急站控
-        emergencyStationControl() {
-            const device = getCurrentStateObject();
-            if (device && device.status == deviceState.StationControl.status.State03) {
-                return true;
-            }
-        },
-        // 请求站控
-        requestStationControl() {
-            const device = getCurrentStateObject();
-            if (device && device.status == deviceState.StationControl.status.State02) {
-                return true;
-            }
-        },
-        // 强行站控
-        forcedStationControl() {
-            const device = getCurrentStateObject();
-            if (device && device.status == deviceState.StationControl.status.State02) {
-                return true;
-            }
-        },
-        // 请求中控
-        requestCentralControl() {
-            const device = getCurrentStateObject();
-            if (device && device.status == deviceState.StationControl.status.State01) {
-                return true;
-            }
-        },
-        // 设置故障
-        setStoppage() {
-            const device = getCurrentStateObject();
-            if (device && device.fault) {
-                return true;
-            }
-        },
-        // 取消故障
-        cancelStoppage() {
-            const device = getCurrentStateObject();
-            if (device && !device.fault) {
-                return true;
-            }
-        }
-    },
-    StationStand: {
-        // 设置扣车
-        setDetainTrain() {
-            const device = getCurrentStateObject();
-            if (store.state.training.prdType == '02') { // 中心行调模式
-                if (device && device.holdStatus == deviceState.StationStand.holdStatus.State04) {
-                    return true;
-                } else if (device && device.holdStatus == deviceState.StationStand.holdStatus.State03) {
-                    return true;
-                }
-            } else { // 现地模式
-                if (device && device.holdStatus == deviceState.StationStand.holdStatus.State04) {
-                    return true;
-                } else if (device && device.holdStatus == deviceState.StationStand.holdStatus.State02) {
-                    return true;
-                }
-            }
-        },
-        // 取消扣车
-        cancelDetainTrain() {
-            const device = getCurrentStateObject();
-            if (store.state.training.prdType == '02') {
-                if (device && device.holdStatus == deviceState.StationStand.holdStatus.State04) {
-                    return false;
-                } else if (device && device.holdStatus != deviceState.StationStand.holdStatus.State03) {
-                    return true;
-                }
-            } else {
-                if (device && device.holdStatus == deviceState.StationStand.holdStatus.State04) {
-                    return false;
-                } else if (device && device.holdStatus != deviceState.StationStand.holdStatus.State02) {
-                    return true;
-                }
-            }
-        },
-        // 强制取消扣车
-        cancelDetainTrainForce() {
-            const device = getCurrentStateObject();
-            if (device && device.holdStatus == deviceState.StationStand.holdStatus.State01) {
-                return true;
-            }
-        },
-        // 设置全站扣车
-        cancelDetainTrainAll() {
-        },
-        // 设置运行等级
-        setRunLevel() {
-        },
-        // 设置停站时间
-        setStopTime() {
-        },
-        // 设置跳停
-        setJumpStop() {
-            const device = getCurrentStateObject();
-            if (device && device.jumpStopStatus != deviceState.StationStand.jumpStopStatus.State01) {
-                return true;
-            }
-        },
-        // 取消跳停
-        cancelJumpStop() {
-            const device = getCurrentStateObject();
-            if (device && device.jumpStopStatus == deviceState.StationStand.jumpStopStatus.State01) {
-                return true;
-            }
-        },
-        // 提前发车
-        earlyDeparture() {
-        },
-        // 站台详细信息
-        detail() {
-        },
-        // 设置折返策略
-        setBackStrategy() {
-        },
-        // 设置故障
-        setStoppage() {
-            const device = getCurrentStateObject();
-            if (device && device.fault) {
-                return true;
-            }
-        },
-        // 取消故障
-        cancelStoppage() {
-            const device = getCurrentStateObject();
-            if (device && !device.fault) {
-                return true;
-            }
-        }
-    },
-    Switch: {
-        // 单锁
-        lock() {
-            const device = getCurrentStateObject();
-            if (device && device.status == deviceState.Switch.status.State10) {
-                return true;
-            }
-        },
-        // 解锁
-        unlock() {
-            const device = getCurrentStateObject();
-            if (device && device.status != deviceState.Switch.status.State10) {
-                return true;
-            }
-        },
-        // 封锁
-        block() {
-            const device = getCurrentStateObject();
-            if (device && device.status == deviceState.Switch.status.State14) {
-                return true;
-            }
-        },
-        // 解封
-        unblock() {
-            const device = getCurrentStateObject();
-            if (device && device.status != deviceState.Switch.status.State14) {
-                return true;
-            }
-        },
-        // 强扳
-        switchTurnoutForce() {
-        },
-        // 转动
-        switchTurnout() {
-        },
-        // 道岔故障解锁
-        fault() {
-        },
-        // 计轴预复位
-        axlePreReset() {
-        },
-        // 道岔切除
-        split() {
-        },
-        // 道岔激活
-        active() {
-        },
-        // 道岔设置速度
-        setSpeed() {
-            // const device = getCurrentStateObject();
-        },
-        // 道岔取消速度
-        cancelSpeed() {
-        },
-        // 设置故障
-        setStoppage() {
-            const device = getCurrentStateObject();
-            if (device && device.fault) {
-                return true;
-            }
-        },
-        // 取消故障
-        cancelStoppage() {
-            const device = getCurrentStateObject();
-            if (device && !device.fault) {
-                return true;
-            }
-        }
-    },
-    Train: {
-        // 添加列车识别号
-        addTrainId() {
-        },
-        // 删除列车识别号
-        delTrainId() {
-        },
-        // 修改列车识别号
-        editTrainId() {
-        },
-        // 修改车组号
-        editTrainNo() {
-        },
-        // 移动列车识别号
-        moveTrainId() {
-        },
-        // 交换列车识别号
-        switchTrainId() {
-        },
-        // 设置限速
-        limitSpeed() {
-        },
-        // 设置通信故障
-        setStoppage() {
-            const device = getCurrentStateObject();
-            if (device && device.fault) {
-                return true;
-            }
-        },
-        // 取消通信故障
-        cancelStoppage() {
-            const device = getCurrentStateObject();
-            if (device && !device.fault) {
-                return true;
-            }
-        }
-    }
-};
-
-export function checkOperationValidity() {
-    if (store.state.training.prdType == '02') {
-        return true;
-    }
-}
-
-/**
- * 将menu的disabled属性使用disabledCallback计算并返回
- * @param {Array} menu
- */
-export function menuConvert(menu) {
-    if (menu.constructor === Array) {
-        menu.forEach(elem => {
-            if (elem.type === 'separator') {
-                elem.show = true;
-                return;
-            }
-
-            if (elem.disabledCallback.constructor === Function) {
-                elem.disabled = elem.defaultDisabled;
-                if (!elem.defaultDisabled) {
-                    elem.disabled = elem.disabledCallback();
-                }
-            }
-        });
-    }
-    return menu;
-}
-
-/**
- * 根据产品类型，返回对应的menuBar
- * @param {*} menuObj
- */
-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.froce) {
-                    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 || [];
-}
-
-/**
- * 将menu的show属性过滤返回
- * @param {Array} menu
- */
-export function menuFiltration(menuObj) {
-    var selected = getCurrentStateObject();
-    var control;
-    var menu = [];
-
-    if (selected._type == 'StationStand') {
-        control = store.getters['map/getStationControlByStationCode'](selected.deviceStationCode);
-    } else if (selected._type == 'Station') {
-        control = store.getters['map/getStationControlByStationCode'](selected.code);
-    } else {
-        control = store.getters['map/getStationControlByStationCode'](selected.stationCode);
-    }
-
-    if (control) {
-        if (store.state.training.prdType != '') {
-            const type = SystemType[store.state.training.prdType];
-            const status = StationControlType[control.status];
-            menu = [...menuObj[type]];
-            if (menu.constructor === Array) {
-                menu.forEach(elem => {
-                    if (elem.type === 'separator') {
-                        elem.show = true;
-                        return;
-                    }
-
-                    if (elem.auth.constructor === Object) {
-                        elem.show = true;
-                        if (!elem.auth['station'] && !elem.auth['center']) {	// 控制不显示
-                            elem.show = false;
-                        }
-                        elem.defaultDisabled = !elem.auth[status];
-                    }
-                });
-            }
-        }
-    }
-
-    return menu;
-}
-
-/**
- * 将train menu的show属性过滤返回
- */
-export function trainMenuFiltration(menuObj) {
-    var menu = [];
-    if (store.state.training.prdType != '') {
-        const type = SystemType[store.state.training.prdType];
-        menu = [...menuObj[type]];
-        if (menu.constructor === Array) {
-            menu.forEach(elem => {
-                if (elem.auth.constructor === Object) {
-                    elem.show = true;
-                    if (!elem.auth['station'] && !elem.auth['center']) {	// 控制不显示
-                        elem.show = false;
-                    }
-                }
-            });
-        }
-    }
-    return menu;
-}
-
diff --git a/src/jmap/theme/fuzhou_01/menusPlan/addTask.vue b/src/jmap/theme/fuzhou_01/menusPlan/addTask.vue
deleted file mode 100644
index b9e6c42e8..000000000
--- a/src/jmap/theme/fuzhou_01/menusPlan/addTask.vue
+++ /dev/null
@@ -1,175 +0,0 @@
-<template>
-  <el-dialog
-    v-dialogDrag
-    class="fuzhou-01__schedule add-task"
-    :title="title"
-    :visible.sync="dialogShow"
-    width="800px"
-    :before-close="doClose"
-    :z-index="2000"
-    :modal="false"
-    :close-on-click-modal="false"
-  >
-    <div style="margin: 10px">
-      <el-row>
-        <el-col :span="3">
-          <el-radio v-model="model.type" label="1">{{ $t('menu.addToTheFront') }}</el-radio>
-        </el-col>
-        <el-col :span="2" :offset="1">
-          <span>{{ $t('menu.tripNumber') + $t('global.colon') }}</span>
-        </el-col>
-        <el-col :span="5">
-          <el-select v-model="model.tripNumber" :placeholder="this.$t('global.choose')">
-            <el-option
-              v-for="item in tripNumberList"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"
-            />
-          </el-select>
-        </el-col>
-        <el-col :span="3" :offset="1">
-          <span>{{ $t('global.startTime') + $t('global.colon') }}</span>
-        </el-col>
-        <el-col :span="5">
-          <el-select v-model="model.startTime" :placeholder="this.$t('global.choose')">
-            <el-option
-              v-for="item in tripNumberList"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"
-            />
-          </el-select>
-        </el-col>
-      </el-row>
-      <el-row>
-        <el-col :span="3">
-          <el-radio v-model="model.type" label="2">{{ $t('menu.addToTheEnd') }}</el-radio>
-        </el-col>
-        <el-col :span="2" :offset="1">
-          <span>{{ $t('menu.tripNumber') + $t('global.colon') }}</span>
-        </el-col>
-        <el-col :span="5">
-          <el-select v-model="model.tripNumber" :placeholder="this.$t('global.choose')">
-            <el-option
-              v-for="item in tripNumberList"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"
-            />
-          </el-select>
-        </el-col>
-        <el-col :span="3" :offset="1">
-          <span>{{ $t('global.startTime') + $t('global.colon') }}</span>
-        </el-col>
-        <el-col :span="5">
-          <el-select v-model="model.startTime" :placeholder="this.$t('global.choose')">
-            <el-option
-              v-for="item in tripNumberList"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"
-            />
-          </el-select>
-        </el-col>
-
-      </el-row>
-      <el-row style="margin-bottom: 5px;">
-        {{ $t('menu.crossing') + $t('global.colon') }}
-      </el-row>
-      <el-row>
-        <el-table :data="model.route" border :height="180">
-          <el-table-column prop="date" :label="this.$t('menu.date')" width="180" />
-          <el-table-column prop="name" :label="this.$t('menu.name')" width="180" />
-          <el-table-column prop="address" :label="this.$t('menu.address')" />
-          <el-table-column width="20" />
-        </el-table>
-      </el-row>
-      <el-row style=" margin-bottom: 5px;margin-top: 10px;">
-        {{ $t('global.details') + $t('global.colon') }}
-      </el-row>
-      <el-row>
-        <el-table :data="model.detail" border :height="180">
-          <el-table-column prop="date" :label="this.$t('menu.date')" width="180" />
-          <el-table-column prop="name" :label="this.$t('menu.name')" width="180" />
-          <el-table-column prop="address" :label="this.$t('menu.address')" />
-          <el-table-column width="20" />
-        </el-table>
-      </el-row>
-      <el-row>
-        <el-col :offset="16">
-          <el-checkbox v-model="model.default">{{ $t('menu.displaysDefaultStopTimesAndRunLevels') }}</el-checkbox>
-        </el-col>
-      </el-row>
-    </div>
-    <el-row type="flex" justify="center" class="button-group">
-      <el-button @click="commit">{{ $t('global.confirm') }}</el-button>
-      <el-button @click="doClose">{{ $t('global.cancel') }}</el-button>
-    </el-row>
-  </el-dialog>
-</template>
-
-<script>
-
-export default {
-    name: 'AddTask',
-    components: {
-    },
-    data() {
-        return {
-            dialogShow: false,
-            loading: false,
-            model: {
-                type: '1',
-                serviceNumber: '',
-                tripNumber: '',
-                startTime: '',
-                default: false,
-                route: [],
-                detail: []
-            },
-            tripNumberList: []
-        };
-    },
-    computed: {
-        title() {
-            return this.$t('menu.addTask');
-        }
-    },
-    mounted() {
-    },
-    methods: {
-        doShow(params) {
-            this.model.serviceNumber = params.serviceNumber;
-            this.model.tripNumber = params.tripNumber;
-            this.dialogShow = true;
-        },
-        doClose() {
-            this.loading = false;
-            this.dialogShow = false;
-        },
-        commit() {
-            this.doClose();
-        }
-    }
-};
-</script>
-<style rel="stylesheet/scss" lang="scss" scoped>
-    @import "src/styles/mixin.scss";
-
-    /deep/ {
-        .el-button {
-            margin-left: 40px !important;
-            margin-right: 40px !important;
-        }
-
-        .el-row {
-            margin-bottom: 5px !important;
-        }
-
-        .el-input__inner {
-            height: 20px !important;
-            line-height: 20px !important;
-        }
-    }
-</style>
diff --git a/src/jmap/theme/fuzhou_01/menusPlan/chooseTemplatePlan.vue b/src/jmap/theme/fuzhou_01/menusPlan/chooseTemplatePlan.vue
deleted file mode 100644
index 78abc470e..000000000
--- a/src/jmap/theme/fuzhou_01/menusPlan/chooseTemplatePlan.vue
+++ /dev/null
@@ -1,115 +0,0 @@
-<template>
-  <el-dialog
-    v-dialogDrag
-    :title="title"
-    class="fuzhou-01__schedule choose-plan-template"
-    :visible.sync="dialogShow"
-    width="70%"
-    :before-close="doClose"
-    :modal="false"
-    :close-on-click-modal="false"
-  >
-    <QueryListPage ref="pageRules" :pager-config="pagerConfig" :query-form="queryForm" :query-list="queryList" />
-    <el-row type="flex" justify="center" class="button-group">
-      <el-button type="primary" :loading="loading" @click="handleConfirm">{{ $t('global.select') }}</el-button>
-      <el-button @click="dialogShow = false">{{ $t('global.cancel') }}</el-button>
-    </el-row>
-  </el-dialog>
-</template>
-
-<script>
-import { runPlanTemplateList } from '@/api/runplan';
-import { listPublishMap } from '@/api/jmap/map';
-
-export default {
-    name: 'ChooseTemplatePlan',
-    data() {
-        return {
-            dialogShow: false,
-            loading: false,
-            mapList: [],
-            pagerConfig: {
-                pageSize: 'pageSize',
-                pageIndex: 'pageNum'
-            },
-            queryForm: {
-                reset: true,
-                labelWidth: '120px',
-                queryObject: {
-                    name: {
-                        type: 'text',
-                        label: this.$t('menu.runGraphName')
-                    }
-                }
-            },
-            queryList: {
-                query: this.queryFunction,
-                selectCheckShow: false,
-                radioShow: true,
-                columns: [
-                    {
-                        title: this.$t('menu.runGraphName'),
-                        prop: 'name'
-                    },
-                    {
-                        title: this.$t('menu.mapName'),
-                        prop: 'mapId',
-                        type: 'tag',
-                        columnValue: (row) => {
-                            return this.$convertField(row.mapId, this.mapList, ['id', 'name']);
-                        },
-                        tagType: (row) => { return 'success'; }
-                    }
-                ]
-            },
-
-            currentModel: {}
-        };
-    },
-    computed: {
-        title() {
-            return this.$t('menu.selectTemplateRunGraph');
-        }
-    },
-    methods: {
-        loadInitData() {
-            this.mapList = [];
-            listPublishMap().then(response => {
-                this.mapList = response.data;
-            });
-        },
-        doShow() {
-            this.loading = false;
-            this.dialogShow = true;
-            this.loadInitData();
-        },
-        doClose() {
-            this.dialogShow = false;
-        },
-        queryFunction(params) {
-            if (this.$store.state.map && this.$store.state.map.map) {
-                // params['lineCode'] = this.$store.getters['map/lineCode'];
-                params['mapId'] = this.$route.query.mapId;
-            }
-            return runPlanTemplateList(params);
-        },
-        handleConfirm() {
-            if (this.$refs && this.$refs.pageRules) {
-                const choose = this.$refs.pageRules.currentChoose();
-                if (choose) {
-                    this.$emit('chooseConfirm', choose);
-                    this.doClose();
-                } else {
-                    this.$messageBox(this.$t('menu.pleaseSelectTemplateRunGraph'));
-                }
-            }
-        },
-        reloadTable() {
-            this.queryList.reload();
-        }
-    }
-};
-</script>
-<style rel="stylesheet/scss" lang="scss" scoped>
-    @import "src/styles/mixin.scss";
-</style>
diff --git a/src/jmap/theme/fuzhou_01/menusPlan/components/dataTable.vue b/src/jmap/theme/fuzhou_01/menusPlan/components/dataTable.vue
deleted file mode 100644
index cfaac866d..000000000
--- a/src/jmap/theme/fuzhou_01/menusPlan/components/dataTable.vue
+++ /dev/null
@@ -1,206 +0,0 @@
-<template>
-  <div v-if="show">
-    <template v-if="maxmini">
-      <div class="nav">
-        <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"
-        :height="height"
-        border
-        @current-change="handleChange"
-      >
-        <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=" max-status" @click="touch('Maxim')"><span /></div>
-      </div>
-    </template>
-  </div>
-</template>
-
-<script>
-export default {
-    name: 'DataTable',
-    props: {
-        height: {
-            type: Number,
-            required: true
-        },
-        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);
-            }
-        },
-        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: $height;
-        line-height: $height;
-    }
-
-    /deep/ {
-        .el-table--border th.gutter {
-            background: #EBEADB !important;
-        }
-
-        .el-table {
-            overflow-y: hidden;
-            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/jmap/theme/fuzhou_01/menusPlan/createTodayPlan.vue b/src/jmap/theme/fuzhou_01/menusPlan/createTodayPlan.vue
deleted file mode 100644
index e53fffb54..000000000
--- a/src/jmap/theme/fuzhou_01/menusPlan/createTodayPlan.vue
+++ /dev/null
@@ -1,135 +0,0 @@
-<template>
-  <el-dialog
-    v-dialogDrag
-    :title="title"
-    class="fuzhou-01__schedule reload-today-plan"
-    :visible.sync="dialogShow"
-    width="80%"
-    :before-close="doClose"
-    :modal="false"
-    :close-on-click-modal="false"
-  >
-    <QueryListPage ref="pageRules" :pager-config="pagerConfig" :query-form="queryForm" :query-list="queryList" />
-    <el-row type="flex" justify="center" class="button-group">
-      <el-button type="primary" :loading="loading" @click="handleConfirm">{{ $t('menu.load') }}</el-button>
-      <el-button @click="dialogShow = false">{{ $t('global.cancel') }}</el-button>
-    </el-row>
-  </el-dialog>
-</template>
-
-<script>
-import { runPlanTemplateList } from '@/api/runplan';
-import { getStationList } from '@/api/runplan';
-import { getEveryDayRunPlanData, generateDayRunPlan } from '@/api/simulation';
-import { getPublishMapInfo } from '@/api/jmap/map';
-
-export default {
-    name: 'ReloadTodayPlan',
-    data() {
-        return {
-            dialogShow: false,
-            loading: false,
-            pagerConfig: {
-                pageSize: 'pageSize',
-                pageIndex: 'pageNum'
-            },
-            queryForm: {
-                reset: true,
-                labelWidth: '120px',
-                queryObject: {
-                    name: {
-                        type: 'text',
-                        label: this.$t('menu.runGraphName')
-                    }
-                }
-            },
-            queryList: {
-                query: this.queryFunction,
-                selectCheckShow: false,
-                radioShow: true,
-                columns: [
-                    {
-                        title: this.$t('menu.runGraphName'),
-                        prop: 'name'
-                    }
-                ]
-            },
-
-            currentModel: {}
-        };
-    },
-    computed: {
-        title() {
-            return this.$t('menu.loadTheDayPlan');
-        }
-    },
-    methods: {
-        doShow() {
-            this.loading = false;
-            this.dialogShow = true;
-        },
-        doClose() {
-            this.dialogShow = false;
-        },
-        queryFunction(params) {
-            if (this.$store.state.map && this.$store.state.map.map) {
-                // params['lineCode'] = this.$store.getters['map/lineCode'];
-                params['mapId'] = this.$route.query.mapId;
-            }
-            return runPlanTemplateList(params);
-        },
-        // 生成每日运行图
-        handleConfirm() {
-            if (this.$refs && this.$refs.pageRules) {
-                const choose = this.$refs.pageRules.currentChoose();
-                if (choose && choose.id) {
-                    this.loading = true;
-                    generateDayRunPlan(choose.id, this.$route.query.group).then(response => {
-                        this.loading = false;
-                        this.reloadTable();
-                        this.loadRunData();
-                        this.doClose();
-                        this.$message.success(this.$t('tip.generateUserDailyRunGraphSuccessfully'));
-                    }).catch(() => {
-                        this.loading = false;
-                        this.reloadTable();
-                        // this.$messageBox(this.$t('tip.generateUserDailyRunGraphFailed'));
-                    });
-                } else {
-                    this.$messageBox(this.$t('rules.selectTheRunningDiagramToBeLoaded'));
-                }
-            }
-        },
-        loadRunData() {
-            // const skinCode = this.$route.query.skinCode;
-            const mapId = this.$route.query.mapId;
-            this.$store.dispatch('runPlan/clear');
-            if (mapId) {
-                getStationList(mapId).then(response => {
-                    const stations = response.data;
-                    getPublishMapInfo(this.$route.query.mapId).then(res=>{
-                        this.PlanConvert = this.$theme.loadPlanConvert(res.data.lineCode);
-                        this.$store.dispatch('runPlan/setStations', stations).then(() => {
-                            getEveryDayRunPlanData(this.$route.query.group).then(resp => {
-                                this.$store.dispatch('runPlan/setPlanData', resp.data);
-                            }).catch(() => {
-                                this.$store.dispatch('runPlan/setPlanData', []);
-                                // this.$messageBox(this.$t('error.getRunGraphDataFailed'));
-                            });
-                        });
-                    });
-
-                }).catch(() => {
-                    this.$messageBox(this.$t('error.getStationListFail'));
-                });
-            }
-        },
-        reloadTable() {
-            this.queryList.reload();
-        }
-    }
-};
-</script>
-<style rel="stylesheet/scss" lang="scss" scoped>
-    @import "src/styles/mixin.scss";
-</style>
diff --git a/src/jmap/theme/fuzhou_01/menusPlan/createWeekPlan.vue b/src/jmap/theme/fuzhou_01/menusPlan/createWeekPlan.vue
deleted file mode 100644
index 09f3abfa4..000000000
--- a/src/jmap/theme/fuzhou_01/menusPlan/createWeekPlan.vue
+++ /dev/null
@@ -1,137 +0,0 @@
-<template>
-  <el-dialog
-    v-dialogDrag
-    class="fuzhou-01__schedule create-week-plan"
-    :title="title"
-    :visible.sync="dialogShow"
-    width="800px"
-    :before-close="doClose"
-    :z-index="2000"
-    :modal="false"
-    :close-on-click-modal="false"
-  >
-    <el-row>
-      <el-form ref="form" :model="model" :rules="rules" label-width="150px" size="small">
-        <el-form-item :label="this.$t('menu.runGraphName') + this.$t('global.colon')" prop="planId">
-          <el-row>
-            <el-col :span="19">
-              <el-input v-model="model.planName" :readonly="true" />
-            </el-col>
-            <el-col :span="4" :offset="1">
-              <el-button @click="handleChoose">{{ this.$t('global.select') }}</el-button>
-            </el-col>
-          </el-row>
-        </el-form-item>
-        <el-form-item :label="this.$t('menu.plannedDateRange') + this.$t('global.colon')" prop="dateList">
-          <el-row>
-            <el-date-picker
-              v-model="model.dateList"
-              type="dates"
-              :clearable="false"
-              :placeholder="this.$t('rules.selectOneOrMoreDates')"
-              value-format="yyyy-MM-dd"
-            />
-          </el-row>
-        </el-form-item>
-      </el-form>
-    </el-row>
-    <el-row type="flex" justify="center" class="button-group">
-      <el-button @click="create">{{ $t('global.confirm') }}</el-button>
-      <el-button @click="doClose">{{ $t('global.cancel') }}</el-button>
-    </el-row>
-    <choose-template-plan ref="choose" @chooseConfirm="chooseConfirm" />
-  </el-dialog>
-</template>
-
-<script>
-import { createRunPlanLoad } from '@/api/runplan';
-import ChooseTemplatePlan from './chooseTemplatePlan';
-
-export default {
-    name: 'CreateWeekPlan',
-    components: {
-        ChooseTemplatePlan
-    },
-    data() {
-        return {
-            dialogShow: false,
-            loading: false,
-            model: {
-                planId: '',
-                planName: '',
-                dateList: []
-            }
-        };
-    },
-    computed: {
-        title() {
-            return this.$t('menu.createAWeekPlan');
-        },
-        rules() {
-            const rules = {
-                planId: [
-                    { required: true, message: this.$t('rules.inputTemplateRunPlan'), trigger: 'blur' }
-                ],
-                dateList: [
-                    { required: true, message: this.$t('rules.selectAPlannedDateRange'), trigger: 'change' }
-                ]
-            };
-
-            return rules;
-        }
-    },
-    mounted() {
-    },
-    methods: {
-        doShow(params) {
-            this.dialogShow = true;
-        },
-        doClose() {
-            this.loading = false;
-            this.dialogShow = false;
-        },
-        handleChoose() {
-            this.$refs.choose.doShow();
-        },
-        chooseConfirm(choose) {
-            if (choose) {
-                this.model.planId = choose.id;
-                this.model.planName = choose.name;
-            }
-        },
-        buildModel() {
-            return {
-                planDateList: this.model.dateList,
-                mapId: this.$route.query.mapId,
-                templatePlanId: this.model.planId
-            };
-        },
-        create() {
-            this.$refs['form'].validate((valid) => {
-                if (valid) {
-                    createRunPlanLoad(this.buildModel()).then(response => {
-                        this.$message.success(this.$t('tip.createRunChartPlanSuccessfully'));
-                        this.doClose();
-                    }).catch(() => {
-                        this.doClose();
-                        // this.$messageBox(this.$t('tip.createRunChartPlanFailed'));
-                    });
-                }
-            });
-        }
-    }
-};
-</script>
-<style rel="stylesheet/scss" lang="scss" scoped>
-    @import "src/styles/mixin.scss";
-
-    .card-box {
-        padding-top: 10px;
-    }
-
-    /deep/ {
-        .el-row {
-            margin: 10px;
-        }
-    }
-</style>
diff --git a/src/jmap/theme/fuzhou_01/menusPlan/deleteTask.vue b/src/jmap/theme/fuzhou_01/menusPlan/deleteTask.vue
deleted file mode 100644
index 363f3c8ab..000000000
--- a/src/jmap/theme/fuzhou_01/menusPlan/deleteTask.vue
+++ /dev/null
@@ -1,73 +0,0 @@
-<template>
-  <el-dialog
-    v-dialogDrag
-    class="fuzhou-01__schedule delete-task"
-    :title="title"
-    :visible.sync="dialogShow"
-    width="400px"
-    :before-close="doClose"
-    :z-index="2000"
-    :modal="false"
-    :close-on-click-modal="false"
-  >
-    <el-row>
-      <el-radio v-model="type" :label="1">{{ $t('menu.deleteAllPreviousTasks') }}</el-radio>
-    </el-row>
-    <el-row>
-      <el-radio v-model="type" :label="2">{{ $t('menu.deleteAllSubsequentTasks') }}</el-radio>
-    </el-row>
-    <el-row type="flex" justify="center" class="button-group">
-      <el-button @click="commit">{{ $t('global.confirm') }}</el-button>
-      <el-button @click="doClose">{{ $t('global.cancel') }}</el-button>
-    </el-row>
-  </el-dialog>
-</template>
-
-<script>
-
-export default {
-    name: 'DeleteTask',
-    components: {
-    },
-    data() {
-        return {
-            dialogShow: false,
-            loading: false,
-            tripNumber: '',
-            serviceNumber: '',
-            type: '1'
-        };
-    },
-    computed: {
-        title() {
-            return this.$t('menu.deleteTask');
-        }
-    },
-    mounted() {
-    },
-    methods: {
-        doShow(params) {
-            this.tripNumber = params.tripNumber;
-            this.serviceNumber = params.serviceNumber;
-            this.dialogShow = true;
-        },
-        doClose() {
-            this.loading = false;
-            this.dialogShow = false;
-        },
-        commit() {
-            // this.tripNumber
-            this.doClose();
-        }
-    }
-};
-</script>
-<style rel="stylesheet/scss" lang="scss" scoped>
-    @import "src/styles/mixin.scss";
-
-    /deep/ {
-        .el-row {
-            margin: 10px;
-        }
-    }
-</style>
diff --git a/src/jmap/theme/fuzhou_01/menusPlan/deleteTodayPlan.vue b/src/jmap/theme/fuzhou_01/menusPlan/deleteTodayPlan.vue
deleted file mode 100644
index be003663e..000000000
--- a/src/jmap/theme/fuzhou_01/menusPlan/deleteTodayPlan.vue
+++ /dev/null
@@ -1,62 +0,0 @@
-<template>
-  <el-dialog
-    v-dialogDrag
-    class="fuzhou-01__schedule create-week-plan"
-    :title="title"
-    :visible.sync="dialogShow"
-    width="400px"
-    :before-close="doClose"
-    :z-index="2000"
-    :modal="false"
-    :close-on-click-modal="false"
-  >
-    <el-row type="flex" justify="center" class="button-group">
-      <el-button @click="commit">{{ $t('global.confirm') }}</el-button>
-      <el-button @click="doClose">{{ $t('global.cancel') }}</el-button>
-    </el-row>
-  </el-dialog>
-</template>
-
-<script>
-
-export default {
-    name: 'DeleteTodayPlan',
-    components: {
-    },
-    data() {
-        return {
-            dialogShow: false,
-            loading: false
-        };
-    },
-    computed: {
-        title() {
-            return this.$t('menu.deleteTheDayPlan');
-        }
-    },
-    mounted() {
-    },
-    methods: {
-        doShow(params) {
-            this.dialogShow = true;
-        },
-        doClose() {
-            this.loading = false;
-            this.dialogShow = false;
-        },
-        commit() {
-            // this.tripNumber
-            this.doClose();
-        }
-    }
-};
-</script>
-<style rel="stylesheet/scss" lang="scss" scoped>
-    @import "src/styles/mixin.scss";
-
-    /deep/ {
-        .el-row {
-            margin: 10px;
-        }
-    }
-</style>
diff --git a/src/jmap/theme/fuzhou_01/menusPlan/managePlanList.vue b/src/jmap/theme/fuzhou_01/menusPlan/managePlanList.vue
deleted file mode 100644
index e619bcbbf..000000000
--- a/src/jmap/theme/fuzhou_01/menusPlan/managePlanList.vue
+++ /dev/null
@@ -1,143 +0,0 @@
-<template>
-  <el-dialog
-    v-dialogDrag
-    class="fuzhou-01__schedule manage-plan-list"
-    :title="title"
-    :visible.sync="dialogShow"
-    width="80%"
-    :before-close="doClose"
-    :z-index="2000"
-    :modal="false"
-    :close-on-click-modal="false"
-  >
-    <QueryListPage ref="queryListPage" :pager-config="pagerConfig" :query-form="queryForm" :query-list="queryList" />
-  </el-dialog>
-</template>
-
-<script>
-import { getRunPlanLoadList, deleteRunPlanLoad, listAllTempLateRunPlan } from '@/api/runplan';
-import { getPublishMapListOnline } from '@/api/jmap/map';
-
-export default {
-    name: 'ManagePlanList',
-    data() {
-        return {
-            dialogShow: false,
-            loading: false,
-            pagerConfig: {
-                pageSize: 'pageSize',
-                pageIndex: 'pageNum'
-            },
-            queryForm: {
-                labelWidth: '140px',
-                reset: true
-            },
-            queryList: {
-                query: this.queryFunction,
-                selectCheckShow: false,
-                indexShow: true,
-                columns: [
-                    {
-                        title: this.$t('menu.mapName'),
-                        prop: 'mapId',
-                        type: 'tag',
-                        columnValue: (row) => { return this.$convertField(row.mapId, this.mapList, ['id', 'name']); },
-                        tagType: (row) => { return ''; }
-                    },
-                    {
-                        title: this.$t('menu.runGraphName'),
-                        prop: 'templatePlanId',
-                        type: 'tag',
-                        columnValue: (row) => { return this.$convertField(row.templatePlanId, this.templatePlanList, ['id', 'name']); },
-                        tagType: (row) => { return 'success'; }
-                    },
-                    {
-                        title: this.$t('menu.loadDate'),
-                        prop: 'loadTime'
-                    },
-                    {
-                        type: 'button',
-                        title: this.$t('global.operate'),
-                        width: '100',
-                        buttons: [
-                            {
-                                name: this.$t('global.delete'),
-                                handleClick: this.handleDelete,
-                                type: 'danger'
-                            }
-                        ]
-                    }
-                ],
-                actions: [
-                    { text: this.$t('global.create'), btnCode: 'employee_insert', handler: this.handleCreateRunPlan }
-                ]
-            },
-
-            currentModel: {}
-        };
-    },
-    computed: {
-        title() {
-            return this.$t('menu.operationChartSchedule');
-        }
-    },
-    mounted() {
-        this.loadPageData();
-    },
-    methods: {
-        loadPageData() {
-            this.mapList = [];
-            getPublishMapListOnline().then(resp => {
-                this.mapList = resp.data;
-            });
-            this.templatePlanList = [];
-            listAllTempLateRunPlan().then(resp => {
-                this.templatePlanList = resp.data;
-            });
-        },
-        queryFunction(params) {
-            if (this.$route.query.mapId) {
-                params['mapId'] = this.$route.query.mapId;
-            }
-
-            if (this.$store.state.user.id) {
-                params['userId'] = this.$store.state.user.id;
-            }
-
-            return getRunPlanLoadList(params);
-        },
-        handleDelete(index, row) {
-            this.$confirm(this.$t('tip.deleteTheRunningGraphLoadedTheNextDay'), this.$t('tip.hint'), {
-                confirmButtonText: this.$t('global.confirm'),
-                cancelButtonText: this.$t('global.cancel'),
-                type: 'warning'
-            }).then(() => {
-                deleteRunPlanLoad(row.id).then(response => {
-                    this.$message.success(this.$t('global.successfullyDelete'));
-                    this.reloadTable();
-                }).catch(() => {
-                    this.reloadTable();
-                    // this.$messageBox(this.$t('global.failDelete'));
-                });
-            }).catch(() => { });
-        },
-        handleCreateRunPlan() {
-            this.$emit('dispatchDialog', { name: 'createWeekPlan' });
-        },
-        doShow() {
-            this.dialogShow = true;
-            this.$nextTick(()=> { this.reloadTable(); });
-        },
-        doClose() {
-            this.loading = false;
-            this.dialogShow = false;
-        },
-        reloadTable() {
-            this.queryList.reload();
-        }
-    }
-};
-</script>
-<style rel="stylesheet/scss" lang="scss" scoped>
-    @import "src/styles/mixin.scss";
-</style>
diff --git a/src/jmap/theme/fuzhou_01/menusPlan/modifyingPlan.vue b/src/jmap/theme/fuzhou_01/menusPlan/modifyingPlan.vue
deleted file mode 100644
index 6cba11edc..000000000
--- a/src/jmap/theme/fuzhou_01/menusPlan/modifyingPlan.vue
+++ /dev/null
@@ -1,177 +0,0 @@
-<template>
-  <el-dialog
-    v-dialogDrag
-    class="fuzhou-01__schedule 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 :offset="10">{{ $t('menu.trainLine') }}</el-col>
-    </el-row>
-    <el-row>
-      <el-col :span="17">
-        <el-table :data="serviceData" border style="width: 100%" height="160">
-          <el-table-column prop="startStationCode" :label="this.$t('menu.startStation')" />
-          <el-table-column prop="startStationStandCode" :label="this.$t('menu.startPlatform')" />
-          <el-table-column prop="endStationCode" :label="this.$t('menu.terminal')" />
-          <el-table-column prop="endStationStandCode" :label="this.$t('menu.endPlatform')" />
-        </el-table>
-      </el-col>
-      <el-col :span="6" :offset="1">
-        <el-row type="flex" justify="center">
-          <el-button class="view-button" @click="handleAddTask">{{ this.$t('menu.addTask2') }}</el-button>
-        </el-row>
-        <el-row type="flex" justify="center">
-          <el-button class="view-button" @click="handleReplace">{{ this.$t('menu.replace') }}</el-button>
-        </el-row>
-        <el-row type="flex" justify="center">
-          <el-button class="view-button" @click="handleDeleteTask">{{ this.$t('menu.deleteTask2') }}</el-button>
-        </el-row>
-        <div class="view-box">
-          <el-row type="flex" justify="center">
-            <el-radio-group v-model="storeInOut">
-              <el-radio :label="1">{{ this.$t('menu.inTheLibrary') }}</el-radio>
-              <el-radio :label="2">{{ this.$t('menu.outOfTheLibrary') }}</el-radio>
-            </el-radio-group>
-          </el-row>
-        </div>
-      </el-col>
-    </el-row>
-    <el-row class="view-box">
-      <el-col :span="9" style="padding-left: 10px">
-        <el-input v-model="oldServiceNumber" size="small" :disabled="true" />
-      </el-col>
-      <el-col :span="9" style="padding-left: 20px">
-        <el-input v-model="newServiceNumber" size="small" />
-      </el-col>
-      <el-col :span="5" style="padding-left: 20px">
-        <el-button style="width: 150px;" @click="handleModifyingTripNumber">{{ $t('menu.changeTripNumber') }}</el-button>
-      </el-col>
-    </el-row>
-    <el-row style="margin-top: 10px">
-      <el-col :span="4"><span class="view-label">{{ $t('menu.lineStartTime') }}</span></el-col>
-      <el-col :span="8">
-        <el-time-select v-model="serviceStartTime" size="small" />
-      </el-col>
-      <el-col :span="4"><span class="view-label">{{ $t('menu.lineEndTime') }}</span></el-col>
-      <el-col :span="8">
-        <el-time-select v-model="serviceEndTime" size="small" />
-      </el-col>
-    </el-row>
-    <el-row style="margin-top: 20px">
-      <el-col :offset="10">{{ $t('menu.lineDetails') }}</el-col>
-    </el-row>
-    <el-row>
-      <el-table :data="tripData" border style="width: 100%" height="200">
-        <el-table-column prop="arriveTime" :label="this.$t('menu.arrivalTime2')" />
-        <el-table-column prop="stationCode" :label="this.$t('menu.station')" />
-        <el-table-column prop="stationStandCode" :label="this.$t('menu.platform')" />
-        <el-table-column prop="stopTime" :label="this.$t('menu.stopTime')" />
-        <el-table-column prop="level" :label="this.$t('menu.runLevel')" />
-      </el-table>
-    </el-row>
-    <el-row style="margin-top: 20px">
-      <el-checkbox v-model="effect">{{ $t('menu.affectSubsequentTasks') }}</el-checkbox>
-    </el-row>
-    <el-row type="flex" justify="center">
-      <el-button @click="commit">{{ $t('global.confirm') }}</el-button>
-      <el-button @click="doClose">{{ $t('global.cancel') }}</el-button>
-    </el-row>
-  </el-dialog>
-</template>
-
-<script>
-import { formatTime, formatName } from '@/utils/runPlan';
-
-export default {
-    name: 'ModifyingPlan',
-    data() {
-        return {
-            dialogShow: false,
-            loading: false,
-            effect: false,
-            storeInOut: '1',
-            oldServiceNumber: '',
-            newServiceNumber: '',
-            serviceStartTime: '',
-            serviceEndTime: '',
-            serviceData: [],
-            tripData: []
-        };
-    },
-    computed: {
-        title() {
-            return this.$t('global.modify');
-        }
-    },
-    mounted() {
-    },
-    methods: {
-        formatTime(time) {
-            return formatTime(time);
-        },
-        formatName(code) {
-            return formatName(code);
-        },
-        doShow() {
-            this.dialogShow = true;
-        },
-        doClose() {
-            this.loading = false;
-            this.dialogShow = false;
-        },
-        // 加任务
-        handleAddTask() {
-            this.$emit('dispatchDialog', { name: 'addTask', params: {} });
-        },
-        // 替换
-        handleReplace() {
-            this.$emit('dispatchDialog', { name: 'modifyingTask', params: {} });
-        },
-        // 删任务
-        handleDeleteTask() {
-            this.$emit('dispatchDialog', { name: 'deleteTask', params: {} });
-        },
-        // 改车次号
-        handleModifyingTripNumber() {
-            this.$emit('dispatchDialog', { name: 'modifyingTripNumber', params: {} });
-        },
-        // 确定修改
-        commit() {
-            this.doClose();
-        }
-    }
-};
-</script>
-<style rel="stylesheet/scss" lang="scss" scoped>
-    @import "src/styles/mixin.scss";
-
-    .view-button {
-        display: list-item;
-        width: 150px !important;
-        margin-left: 0px;
-    }
-
-    .view-label {
-        height: 32px;
-        line-height: 32px;
-    }
-
-    .view-box {
-        padding: 10px 0px;
-        border: 1px inset gray;
-        border-top: 1px outset gray;
-        border-left: 1px outset gray;
-    }
-
-    /deep/ {
-        .el-row {
-            margin: 5px 20px;
-        }
-    }
-</style>
diff --git a/src/jmap/theme/fuzhou_01/menusPlan/modifyingTask.vue b/src/jmap/theme/fuzhou_01/menusPlan/modifyingTask.vue
deleted file mode 100644
index 2ebad67a8..000000000
--- a/src/jmap/theme/fuzhou_01/menusPlan/modifyingTask.vue
+++ /dev/null
@@ -1,326 +0,0 @@
-<template>
-  <el-dialog
-    v-dialogDrag
-    class="fuzhou-01__schedule add-task"
-    :title="title"
-    :visible.sync="dialogShow"
-    width="1000px"
-    :before-close="doClose"
-    :z-index="2000"
-    :modal="false"
-    :close-on-click-modal="false"
-  >
-    <div style="margin: 10px">
-      <el-row>
-        <el-col :span="4">
-          <el-row>
-            <el-col :span="9">
-              <span>{{ $t('menu.tripNumber') + $t('global.colon') }}</span>
-            </el-col>
-            <el-col :span="15">
-              <el-select v-model="model.tripNumber" style="display: inline-black" :placeholder="this.$t('global.choose')">
-                <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="2">
-          <el-row>
-            <el-col :offset="4">
-              <el-checkbox v-model="model.trainManual">{{ this.$t('menu.manual') }}</el-checkbox>
-            </el-col>
-          </el-row>
-        </el-col>
-        <el-col :span="5">
-          <el-row>
-            <el-col :span="12">
-              <span>{{ $t('menu.defaultStopTime') + $t('global.colon') }}</span>
-            </el-col>
-            <el-col :span="12">
-              <el-select v-model="model.time" style="display: inline-black" :placeholder="this.$t('global.choose')">
-                <el-option
-                  v-for="item in timeList"
-                  :key="item.value"
-                  :label="item.label"
-                  :value="item.value"
-                />
-              </el-select>
-            </el-col>
-          </el-row>
-        </el-col>
-        <el-col :span="5">
-          <el-row>
-            <el-col :span="9" :offset="2">
-              <span>{{ $t('menu.serviceNumber') + $t('global.colon') }}</span>
-            </el-col>
-            <el-col :span="13">
-              <el-input v-model="model.serviceNumber" />
-            </el-col>
-          </el-row>
-        </el-col>
-        <el-col :span="8">
-          <el-row>
-            <el-col :span="22" :offset="2">
-              <el-row>
-                <el-col :span="6">
-                  <el-checkbox v-model="model.clearGuest">{{ $t('menu.clearGuest') }}</el-checkbox>
-                </el-col>
-                <el-col :span="8">
-                  <el-checkbox v-model="model.continuationPlan">{{ $t('menu.continuationPlan') }}</el-checkbox>
-                </el-col>
-                <el-col :span="6">
-                  <el-checkbox v-model="model.firstTrain">{{ $t('menu.firstTrain') }}</el-checkbox>
-                </el-col>
-              </el-row>
-            </el-col>
-          </el-row>
-        </el-col>
-      </el-row>
-      <el-row>
-        <el-col :span="4">
-          <el-row>
-            <el-col :span="9">
-              <span>{{ $t('menu.serialNumber') + $t('global.colon') }}</span>
-            </el-col>
-            <el-col :span="15">
-              <el-select v-model="model.serialNumber" style="display: inline-black" :placeholder="this.$t('global.choose')">
-                <el-option
-                  v-for="item in serialNumberList"
-                  :key="item.value"
-                  :label="item.label"
-                  :value="model.value"
-                />
-              </el-select>
-            </el-col>
-          </el-row>
-        </el-col>
-        <el-col :span="2">
-          <el-row>
-            <el-col :offset="4">
-              <el-checkbox v-model="model.serialManual">{{ this.$t('menu.manual') }}</el-checkbox>
-            </el-col>
-          </el-row>
-        </el-col>
-        <el-col :span="5">
-          <el-row>
-            <el-col :span="12">
-              <span>{{ $t('menu.defaultRunLevel') + $t('global.colon') }}</span>
-            </el-col>
-            <el-col :span="12">
-              <el-select v-model="model.level" style="display: inline-black" :placeholder="this.$t('global.choose')">
-                <el-option
-                  v-for="item in levelList"
-                  :key="item.value"
-                  :label="item.label"
-                  :value="item.value"
-                />
-              </el-select>
-            </el-col>
-          </el-row>
-        </el-col>
-        <el-col :span="5">
-          <el-row>
-            <el-col :span="9" :offset="2">
-              <span>{{ $t('global.startTime') + $t('global.colon') }}</span>
-            </el-col>
-            <el-col :span="13">
-              <el-time-select v-model="model.startTime" :placeholder="this.$t('global.selectionTime')" :clearable="false" />
-            </el-col>
-          </el-row>
-        </el-col>
-        <el-col :span="8">
-          <el-row>
-            <el-col :span="22" :offset="2">
-              <el-row>
-                <el-col :span="6">
-                  <el-checkbox v-model="model.inStock">{{ $t('menu.inTheLibrary') }}</el-checkbox>
-                </el-col>
-                <el-col :span="8">
-                  <el-checkbox v-model="model.outStock">{{ $t('menu.outOfTheLibrary') }}</el-checkbox>
-                </el-col>
-                <el-col :span="6">
-                  <el-checkbox v-model="model.lastTrain">{{ $t('menu.lastTrain') }}</el-checkbox>
-                </el-col>
-              </el-row>
-            </el-col>
-          </el-row>
-        </el-col>
-      </el-row>
-      <el-row style="margin-bottom: 5px;">
-        {{ $t('menu.crossing') + $t('global.colon') }}
-      </el-row>
-      <el-row>
-        <el-table :data="model.route" border :height="140">
-          <el-table-column prop="beginStationCode" :label="this.$t('menu.startStation')">
-            <template slot-scope="scope">
-              {{ formatName(scope.row.beginStationCode) }}
-            </template>
-          </el-table-column>
-          <el-table-column prop="beginStationStandCode" :label="this.$t('menu.startPlatform')" />
-          <el-table-column prop="endStationCode" :label="this.$t('menu.terminal')">
-            <template slot-scope="scope">
-              {{ formatName(scope.row.endStationCode) }}
-            </template>
-          </el-table-column>
-          <el-table-column prop="endStationStandCode" :label="this.$t('menu.endPlatform')" />
-          <el-table-column prop="describe" :label="this.$t('menu.description')" :width="280" />
-          <el-table-column :width="40" />
-        </el-table>
-      </el-row>
-      <el-row style=" margin-bottom: 5px;margin-top: 10px;">
-        {{ $t('global.details') + $t('global.colon') }}
-      </el-row>
-      <el-row>
-        <el-table :data="model.detail" border :height="140">
-          <el-table-column prop="stationCode" :label="this.$t('menu.platform')" :width="160">
-            <template slot-scope="scope">
-              {{ formatName(scope.row.stationCode) }}
-            </template>
-          </el-table-column>
-          <el-table-column prop="startTime" :label="this.$t('menu.arrivalTime')">
-            <template slot-scope="scope">
-              {{ formatTime(scope.row.startTime) }}
-            </template>
-          </el-table-column>
-          <el-table-column prop="stopTime" :label="this.$t('menu.stopTime')">
-            <template slot-scope="scope">
-              {{ formatTime(scope.row.stopTime) }}
-            </template>
-          </el-table-column>
-          <el-table-column prop="endTime" :label="this.$t('menu.departureTime')">
-            <template slot-scope="scope">
-              {{ formatTime(scope.row.endTime) }}
-            </template>
-          </el-table-column>
-          <el-table-column prop="level" :label="this.$t('menu.runLevel')" />
-          <el-table-column width="280" />
-        </el-table>
-      </el-row>
-      <el-row>
-        <el-col :offset="16">
-          <el-checkbox v-model="model.default">{{ $t('menu.displaysDefaultStopTimesAndRunLevels') }}</el-checkbox>
-        </el-col>
-      </el-row>
-    </div>
-    <el-row type="flex" justify="center" class="button-group">
-      <el-button @click="commit">{{ $t('global.confirm') }}</el-button>
-      <el-button @click="doClose">{{ $t('global.cancel') }}</el-button>
-    </el-row>
-  </el-dialog>
-</template>
-
-<script>
-import { formatTime, formatName } from '@/utils/runPlan';
-
-export default {
-    name: 'ModifyingTask',
-    components: {
-    },
-    data() {
-        return {
-            dialogShow: false,
-            loading: false,
-            model: {
-                tripNumber: '',
-                serialNumber: '',
-                trainManual: false,
-                serialManual: false,
-                clearGuest: false,
-                continuationPlan: false,
-                firstTrain: false,
-                lastTrain: false,
-                inStock: false,
-                outStock: false,
-                startTime: '',
-                route: [],
-                detail: []
-            },
-            timeList: [],
-            levelList: [],
-            tripNumberList: [],
-            serialNumberList: []
-        };
-    },
-    computed: {
-        title() {
-            return this.$t('menu.modifyTask');
-        }
-    },
-    mounted() {
-    },
-    methods: {
-        formatTime(time) {
-            return formatTime(time);
-        },
-        formatName(code) {
-            return formatName(code);
-        },
-        loadInitData(params) {
-            this.model.tripNumber = params.tripNumber;
-            this.model.serviceNumber = params.serviceNumber;
-            const editData = this.$store.state.runPlan.editData[params.serviceNumber];
-            if (editData) {
-                const trainInfo = editData.trainMap[params.tripNumber];
-                const lastIndex = trainInfo.stationTimeList.length - 1;
-                const taskObj = {
-                    tripNumber: params.tripNumber,
-                    beginStationCode: trainInfo.stationTimeList[0].stationCode,
-                    beginStationStandCode: '',
-                    endStationCode: trainInfo.stationTimeList[lastIndex].stationCode,
-                    endStationStandCode: ''
-                };
-                this.model.route.push(taskObj);
-
-                trainInfo.stationTimeList.forEach((elem, index) => {
-                    const stationObj = {
-                        stationCode: elem.stationCode,
-                        startTime: index == 0 ? null : trainInfo.stationTimeList[index - 1].secondTime,
-                        stopTime: index == 0 ? null : elem.secondTime - trainInfo.stationTimeList[index - 1].secondTime,
-                        endTime: elem.secondTime,
-                        level: ''
-                    };
-                    this.model.detail.push(stationObj);
-                });
-            }
-        },
-        doShow(params) {
-            this.loadInitData(params);
-            this.dialogShow = true;
-        },
-        doClose() {
-            this.loading = false;
-            this.dialogShow = false;
-        },
-        commit() {
-        }
-    }
-};
-</script>
-<style rel="stylesheet/scss" lang="scss" scoped>
-    @import "src/styles/mixin.scss";
-
-    /deep/ {
-        .el-button {
-            margin-left: 40px !important;
-            margin-right: 40px !important;
-        }
-
-        .el-row {
-            margin-bottom: 5px !important;
-        }
-
-        .el-input__inner {
-            height: 20px !important;
-            line-height: 20px !important;
-        }
-
-        .el-input {
-            width: 110px !important;
-        }
-    }
-</style>
diff --git a/src/jmap/theme/fuzhou_01/planConvert.js b/src/jmap/theme/fuzhou_01/planConvert.js
deleted file mode 100644
index a535ca5e1..000000000
--- a/src/jmap/theme/fuzhou_01/planConvert.js
+++ /dev/null
@@ -1,364 +0,0 @@
-import { createMartPoint, createSeriesModel, createMarkLineModels, hexColor, prefixTime, convertSheetToList } from '@/utils/runPlan';
-
-export default {
-    /** 边缘高度*/
-    EdgeHeight: 3,
-
-    /** 间隔高度*/
-    CoordMultiple: 3,
-
-    /** 偏移时间*/
-    TranslationTime: 60 * 60 * 2,
-
-    /** excel解析配置*/
-    ExcelConfig: {
-        beginRow: 1,
-        beginCol: 0,
-        // fieldNum: 10,
-        columns: {
-            '默认上行折返轨': { key: 'upTrack', formatter: (val) => { return val; } },
-            '默认下行折返轨': { key: 'downTrack', formatter: (val) => { return val; } }
-        }
-    },
-
-    /** 解析exal数据转换为Json后台数据*/
-    importData(Sheet, JsonData) {
-        const dataList = convertSheetToList(Sheet, true);
-        const needList = Object.keys(this.ExcelConfig.columns);
-        const tripObj = { upTrack: '', downTrack: '' };
-        if (dataList && dataList.length && dataList[1] && dataList[0]) {
-            const tIndex = dataList.findIndex(it => { return it[0]; });
-            if (dataList[0][0] == needList[0] && dataList[1][0] == needList[1]) {
-                for (var colIndex = this.ExcelConfig.beginCol; colIndex < dataList.length; colIndex += 1) {
-                    var isContinue = true;
-
-                    for (var rowIndex = this.ExcelConfig.beginRow; isContinue; rowIndex += 1) {
-                        isContinue = false;
-
-                        var title = dataList[colIndex][0];
-                        var value = dataList[colIndex][rowIndex];
-
-                        if (title && value) {
-                            // 数据列解析
-                            isContinue = true;
-                            var titleStr = `${title}`.replace(/\s*/g, '');
-                            var valueStr = `${value}`.replace(/\s*/g, '');
-
-                            // 取需要的字段
-                            if (needList.findIndex(elem => { return elem == titleStr; }) >= 0) {
-                                tripObj[this.ExcelConfig.columns[titleStr].key] = this.ExcelConfig.columns[titleStr].formatter(valueStr);
-                            }
-                        }
-
-                    }
-                }
-            } else {
-                /** 解析二维数组为json对象*/
-                const reg0 = /^[↑|↓|¡|ü|ý|]+(.*)/; // ↑|↓
-                const reg1 = /^([▼|▲|¡ø|¨‹]+)\s*(\d+:\d+:\d+)/; // ▲ 06:10:00
-                const reg2 = /^(\d+:\d+:\d+)\s*([▼|▲|¡ø|¨‹]+)/; // 06:10:00 ▲
-                const reg3 = /^(\d+:\d+:\d+)\s*(\d+:\d+:\d+|)/; // 06:10:00 06:12:00
-                const reg4 = /[▼|▲|¡|ø|¨|‹]+/; // ▲
-
-                dataList.forEach((elem, i) => {
-                    var begin = -1;
-                    /** 跳过名称所在的行*/
-                    if (i != tIndex && elem && elem.length > 0) {
-                        elem.forEach((item, j) => {
-                            /** 过滤空值*/
-                            if (item) {
-                                var value = `${item}`.trim();
-                                var title = `${dataList[tIndex][j]}`.replace(/\s*/g, '');
-                                /** 匹配到开始位置或者结束位置*/
-                                if (reg0.test(value)) {
-                                    if (begin == -1) {
-                                        begin = value; 	// 设置初始索引
-                                        JsonData.push({
-                                            code: reg0.exec(value)[1],
-                                            arrivalList: []
-                                        });
-                                    } else if (begin === value) {
-                                        begin = -1; 	// 清空初始索引
-                                    }
-                                } else if (begin !== -1) {
-                                    /** 匹配到中间位置*/
-                                    var begTime, endTime;
-                                    var runFlag = JsonData[JsonData.length - 1].code[2];
-                                    var stationName = title.replace(/\s/, '');
-                                    var need = false;
-                                    var flag = false;
-                                    if (reg1.test(value)) {
-                                        /** 含有特殊字符的时间格式*/
-                                        [, begTime, endTime] = reg1.exec(value);
-
-                                        begTime = reg4.test(begTime) ? '' : begTime;
-                                        endTime = reg4.test(endTime) ? '' : endTime;
-
-                                        /** 下行方向时间互换*/
-                                        if (runFlag === '2') {
-                                            [begTime, endTime] = [endTime, begTime];
-                                        }
-
-                                        /** 设置标志*/
-                                        [need, flag] = [true, true];
-                                    } else if (reg2.test(value)) {
-                                        /** 含有特殊字符的时间格式*/
-                                        [, begTime, endTime] = reg2.exec(value);
-
-                                        begTime = reg4.test(begTime) ? '' : begTime;
-                                        endTime = reg4.test(endTime) ? '' : endTime;
-
-                                        /** 下行方向时间互换*/
-                                        if (runFlag === '2') {
-                                            [begTime, endTime] = [endTime, begTime];
-                                        }
-
-                                        /** 设置标志*/
-                                        [need, flag] = [true, true];
-                                    } else if (reg3.test(value)) {
-                                        /** 正常时间格式*/
-                                        [, begTime, endTime] = reg3.exec(value);
-
-                                        /** 如果只存在一个数据时，则开始和结束设置一样*/
-                                        endTime = endTime || begTime;
-
-                                        /** 下行方向时间互换*/
-                                        if (runFlag === '2') {
-                                            [begTime, endTime] = [endTime, begTime];
-                                        }
-
-                                        /** 设置标志*/
-                                        [need, flag] = [true, false];
-                                    }
-
-                                    /** 添加json数据*/
-                                    if (need) { // 储存非空 数据
-                                        var stationObj = {
-                                            stationName: stationName
-                                        };
-
-                                        if (begTime) { stationObj['arriveTime'] = prefixTime(begTime); }
-                                        if (endTime) { stationObj['departureTime'] = prefixTime(endTime); }
-                                        if (flag) { stationObj['flag'] = flag; } // 是否转换轨
-                                        JsonData[JsonData.length - 1].arrivalList.push(stationObj);
-                                    }
-                                }
-                            }
-                        });
-                    }
-                });
-            }
-        }
-        JsonData.forEach(item => {
-            item['upTrack'] = tripObj.upTrack;
-            item['downTrack'] = tripObj.downTrack;
-        });
-
-        return JsonData;
-    },
-
-    /** 将后台数据解析成图表*/
-    convertDataToModels(data, stations, kmRangeCoordMap, lineStyle) {
-        var models = [];
-
-        if (data && data.serviceNumberDataList && data.serviceNumberDataList.length) {
-            /** 按服务遍历数据*/
-            data.serviceNumberDataList.forEach((service) => {
-                /** 按车次遍历数据*/
-                var isBackup = true;
-                var opt = { name: '', markPointData: [], data: [] };
-                if (service.tripNumberDataList && service.tripNumberDataList.length) {
-                    service.tripNumberDataList.forEach((train, j) => {
-                        var pointdata = {};
-                        var idx = 0;
-                        var lastPoint = null;
-                        var nextPoint = null;
-
-                        /** 创建标记点名称和坐标*/
-                        pointdata.name = `${service.serviceNumber}${train.directionCode}${train.tripNumber}`;
-                        pointdata.color = '#000' || lineStyle.color;
-                        pointdata.directionCode = train.directionCode;
-                        pointdata.coord = [train.stationTimeList[0].secondTime, this.getCoordYByElem(stations, kmRangeCoordMap, train.stationTimeList[0], train.directionCode, false)];
-
-                        /** 给服务对象添加服务名称和标记点*/
-                        opt.name = '' + service.serviceNumber;
-                        opt.markPointData.push(createMartPoint(pointdata));
-
-                        /** 计算非折返点车次点坐标集合*/
-                        train.stationTimeList.forEach((elem, index) => {
-                            idx = index;
-                            const aa = `${train.directionCode}${train.tripNumber}`;
-                            opt.data.push([elem.secondTime, this.getCoordYByElem(stations, kmRangeCoordMap, elem, elem.directionCode, false), elem.stationCode, aa]);
-                        });
-
-                        /** 计算折返点车次坐标点集合*/
-                        if (!train.backup && train.reentry && service.tripNumberDataList[j + 1] && service.tripNumberDataList[j + 1].stationTimeList) {
-                            lastPoint = train.stationTimeList[idx];
-                            nextPoint = service.tripNumberDataList[j + 1].stationTimeList[0];
-                            const aa = `${train.directionCode}${train.tripNumber}`;
-                            opt.data.push([lastPoint.secondTime, this.getCoordYByElem(stations, kmRangeCoordMap, lastPoint, train.directionCode, true), lastPoint.stationCode, aa, '折返轨']);
-                            opt.data.push([nextPoint.secondTime, this.getCoordYByElem(stations, kmRangeCoordMap, lastPoint, train.directionCode, true), lastPoint.stationCode, aa, '折返轨']);
-                        }
-
-                        /** 如果是备用车，按车次添加线*/
-                        if (train.backup) {
-                            /** 创建一条完成的服务数据*/
-                            opt.name += j;
-                            // var model = createSeriesModel(opt, Object.assign({ color: hexColor.toCreate() }, lineStyle));
-                            var model = createSeriesModel(opt, Object.assign({ color: '#000' }, lineStyle));
-                            if (model) {
-                                models.push(model);
-                                opt = { name: '', markPointData: [], data: [] };
-                            }
-                        }
-
-                        isBackup = train.backup;
-                    });
-
-                    // 不是备用车，按服务添加线
-                    if (!isBackup) {
-                        /** 创建一条完成的服务数据*/
-                        // var model = createSeriesModel(opt, Object.assign({ color: hexColor.toCreate() }, lineStyle));
-                        var model = createSeriesModel(opt, Object.assign({ color: '#000' }, lineStyle));
-                        if (model) {
-                            models.push(model);
-                        }
-                    }
-                }
-            });
-            return models;
-        } else {
-            return [];
-        }
-    },
-
-    /** 更新数据并解析成图表*/
-    updateDataToModels(data, stations, kmRangeCoordMap, runPlanData, series, lineStyle) {
-        if (data && data.length) {
-            data.forEach(elem => {
-                /** 判断此条记录的服务号是否存在*/
-                if (!runPlanData[elem.serviceNumber]) {
-                    /** 创建一个新服务号标记*/
-                    runPlanData[elem.serviceNumber] = {};
-
-                    /** 不存在此服务号，则需要创建一条新的line*/
-                    series.push(createSeriesModel({
-                        zlevel: 1,
-                        name: `run${elem.serviceNumber}`,
-                        data: [],
-                        markPointData: []
-                    }, Object.assign({ color: hexColor.toCreate() }, lineStyle)));
-                }
-
-                /** 添加数据*/
-                series.forEach(serie => {
-                    /** 找到服务号所在图数据的位置*/
-                    if (serie.name == `run${elem.serviceNumber}`) {
-                        /** 添加车组号记录标记*/
-                        if (!runPlanData[elem.serviceNumber][elem.tripNumber]) {
-                            runPlanData[elem.serviceNumber][elem.tripNumber] = [];
-                        }
-
-                        runPlanData[elem.serviceNumber][elem.tripNumber].push(elem);
-                        runPlanData[elem.serviceNumber][elem.tripNumber].sort((a, b) => {
-                            return parseInt(a.secondTime) - parseInt(b.secondTime);
-                        });
-
-                        /** 如果此记录车组号的数据为第一条时，则打上标签*/
-                        if (runPlanData[elem.serviceNumber][elem.tripNumber].length <= 1) {
-                            serie.markPoint.data.push(createMartPoint({
-                                directionCode: elem.directionCode,
-                                coord: [parseInt(elem.secondTime), this.getCoordYByElem(stations, kmRangeCoordMap, elem)],
-                                name: `(${elem.groupNumber})${elem.serviceNumber}${elem.directionCode}${elem.tripNumber}`,
-                                color: lineStyle.color || '#000'
-                            }));
-                        }
-
-                        /** 计算折返点*/
-                        var nextPoint = [parseInt(elem.secondTime), this.getCoordYByElem(stations, kmRangeCoordMap, elem), elem.directionCode];
-                        if (serie.data.length > 0) {
-                            var lastPoint = serie.data[serie.data.length - 1];
-                            if (lastPoint[2] !== nextPoint[2]) {
-                                serie.data.push([lastPoint[0], this.getYvalueByDirectionCode(lastPoint[1], lastPoint[2]), lastPoint[2]]);
-                                serie.data.push([nextPoint[0], this.getYvalueByDirectionCode(nextPoint[1], lastPoint[2]), lastPoint[2]]);
-                            }
-                        }
-
-                        /** 添加车组号数据到对应的服务图数据中*/
-                        serie.data.push(nextPoint);
-
-                        /** 保证原始数据排序*/
-                        serie.data.sort((a, b) => {
-                            return parseInt(a[0]) - parseInt(b[0]);
-                        });
-                    }
-                });
-            });
-        }
-
-        return series;
-    },
-
-    /** 将后台数据转换为试图序列模型*/
-    convertStationsToMap(stations) {
-        var map = {};
-        if (stations && stations.length) {
-            stations.forEach((elem, index) => {
-                map[`${elem.kmRange}`] = this.EdgeHeight + index * this.CoordMultiple;
-            });
-        }
-
-        return map;
-    },
-    /** 初始化Y轴*/
-    initializeYaxis(stations) {
-        return createMarkLineModels(stations, (elem, index) => {
-            return this.EdgeHeight + index * this.CoordMultiple;
-        });
-    },
-
-    /** 计算y轴最小值*/
-    computedYaxisMinValue() {
-        return 0;
-    },
-
-    /** 计算y轴最大值*/
-    computedYaxisMaxValue(stations) {
-        return this.EdgeHeight * 2 + (stations.length - 1) * this.CoordMultiple;
-    },
-
-    /** 格式化y轴数据*/
-    computedFormatYAxis(stations, params) {
-        var yText = '';
-        var index = Math.floor((parseInt(params.value) - this.EdgeHeight) / this.CoordMultiple);
-        if (index >= 0 && index < stations.length) {
-            yText = stations[index].kmRange + 'm';
-        }
-        return yText;
-    },
-
-    /** 根据方向计算y折返偏移量*/
-    getYvalueByDirectionCode(defaultVlue, directionCode) {
-        if (directionCode === '1') {
-            defaultVlue -= this.EdgeHeight / 2;
-        } else if (directionCode === '2') {
-            defaultVlue += this.EdgeHeight / 2;
-        }
-
-        return defaultVlue;
-    },
-
-    /** 根据elem计算y值*/
-    getCoordYByElem(stations, kmRangeCoordMap, elem, directionCode, isSpecial) {
-        var defaultVlue = 0;
-        var station = stations.find(it => { return it.code == elem.stationCode; });
-        if (station) {
-            defaultVlue = kmRangeCoordMap[`${station.kmRange}`];
-            if (isSpecial) {
-                defaultVlue = this.getYvalueByDirectionCode(defaultVlue, directionCode);
-            }
-        }
-
-        return defaultVlue;
-    }
-};
diff --git a/src/jmap/theme/fuzhou_01/planSchedule/index.vue b/src/jmap/theme/fuzhou_01/planSchedule/index.vue
deleted file mode 100644
index 0555c8878..000000000
--- a/src/jmap/theme/fuzhou_01/planSchedule/index.vue
+++ /dev/null
@@ -1,403 +0,0 @@
-<template>
-  <div class="plan-schedule" style="width: 100%">
-    <title-bar ref="titleBar" @back="back" />
-    <menu-bar ref="menuBar" :line-code="lineCode" @dispatchDialog="dispatchDialog" />
-    <schedule ref="schedule" :line-code="lineCode" :group="group" :max-height="height" :max-width="width" />
-    <status-bar ref="statusBar" :max-top="height" @setPosition="setPosition" />
-
-    <manage-plan-list ref="managePlanList" @dispatchDialog="dispatchDialog" />
-    <create-week-plan ref="createWeekPlan" @reloadTable="reloadTable" />
-    <create-today-plan ref="createTodayPlan" />
-    <modifying-plan ref="modifyingPlan" @dispatchDialog="dispatchDialog" />
-    <add-task ref="addTask" />
-    <delete-task ref="deleteTask" />
-    <modifying-task ref="modifyingTask" />
-  </div>
-</template>
-
-<script>
-import TitleBar from './titleBar';
-import MenuBar from './menuBar';
-import StatusBar from './statusBar';
-import Schedule from './schedule';
-import ManagePlanList from '../menusPlan/managePlanList';
-import CreateWeekPlan from '../menusPlan/createWeekPlan';
-import CreateTodayPlan from '../menusPlan/createTodayPlan';
-import ModifyingPlan from '../menusPlan/modifyingPlan';
-import AddTask from '../menusPlan/addTask';
-import DeleteTask from '../menusPlan/deleteTask';
-import ModifyingTask from '../menusPlan/modifyingTask';
-
-export default {
-    name: 'Menus',
-    components: {
-        TitleBar,
-        MenuBar,
-        StatusBar,
-        Schedule,
-        ManagePlanList,
-        CreateWeekPlan,
-        CreateTodayPlan,
-        ModifyingPlan,
-        AddTask,
-        DeleteTask,
-        ModifyingTask
-    },
-    props: {
-        group: {
-            type: String,
-            required: true
-        }
-    },
-    data() {
-        return {
-        };
-    },
-    computed: {
-        lineCode() {
-            return this.$route.query.lineCode || '02';
-        },
-        width() {
-            return this.$store.state.app.width;
-        },
-        height() {
-            return this.$store.state.app.height;
-        }
-    },
-    methods: {
-        setPosition() {
-            this.$nextTick(() => {
-                this.$refs.schedule.setPosition();
-            });
-        },
-        dispatchDialog(dialogObj) {
-            this.$nextTick(() => {
-                if (this.$refs[dialogObj.name]) {
-                    this.$refs[dialogObj.name].doShow(dialogObj.params);
-                }
-            });
-        },
-        reloadTable(dialogObj) {
-            if (this.$refs[dialogObj.name]) {
-                this.$refs[dialogObj.name].reloadTable();
-            }
-        },
-        confirm(params) {
-        },
-        back() {
-            this.$emit('back');
-        }
-    }
-};
-</script>
-
-<style>
-    .plan-schedule {
-        position: absolute;
-        background: gray;
-    }
-
-    .plan-schedule .pop-menu {
-        background: #F0F0F0;
-    }
-
-    .plan-schedule .pop-menu span {
-        color: #000;
-    }
-
-    .plan-schedule .system-close {
-        cursor: pointer;
-        position: absolute;
-        right: 0px;
-        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-schedule .system-close::before {
-        position: absolute;
-        height: 22px;
-        line-height: 22px;
-        top: 0px;
-        left: 0px;
-        font-size: x-large;
-    }
-
-    .plan-schedule .pop-menu .is-disabled span {
-        color: #B4B3B8;
-    }
-
-    .fuzhou-01__schedule {
-        overflow: hidden !important;
-    }
-
-    .fuzhou-01__schedule .el-dialog {
-        background: rgba(0, 85, 231, 1);
-        box-shadow: 1px hsla(240, 0%, 100%, 0.5) inset;
-        border: 2px solid #727375;
-        border-radius: 4px;
-        color: #000;
-        font-size: 14px;
-    }
-
-    .fuzhou-01__schedule .el-dialog .el-dialog__header {
-        height: 30px;
-        padding: 5px;
-    }
-
-    .fuzhou-01__schedule .el-dialog .el-dialog__footer {
-        background: #ECE9D8;
-        opacity: 1;
-    }
-
-    .fuzhou-01__schedule .el-dialog .el-dialog__body {
-        padding-top: 10px;
-        padding-bottom: 10px;
-        padding-left: 5px;
-        padding-right: 5px;
-        margin: 0px 3px 3px 3px;
-        border: 2px solid rgba(120, 121, 123, 0.5);
-        box-shadow: 1px hsla(240, 0%, 100%, 0.5) inset;
-        color: #000;
-        background: #ECE9D8;
-        opacity: 1;
-    }
-
-    .fuzhou-01__schedule .el-dialog .el-dialog__title {
-        font-size: 16px;
-    }
-
-    .fuzhou-01__schedule .el-dialog .el-dialog__headerbtn {
-        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;
-        top: 0px;
-        right: 3px;
-        line-height: 26px;
-        width: 26px;
-    }
-
-    .fuzhou-01__schedule .el-dialog .el-dialog__headerbtn .el-icon-close:before {
-        font-size: 16px;
-    }
-
-    .fuzhou-01__schedule .el-dialog .el-dialog__headerbtn .el-dialog__close {
-        color: #fff;
-    }
-
-    .fuzhou-01__schedule .el-dialog .el-form {
-        background: #ECE9D8 !important;
-    }
-
-    .fuzhou-01__schedule .el-dialog .el-card {
-        background: #ECE9D8 !important;
-    }
-
-    .fuzhou-01__schedule .el-dialog .el-button {
-        height: 32px;
-        line-height: 32px;
-        padding: 0px;
-        width: 80px;
-        border: 2px outset #E2E2E2;
-        border-radius: 0px !important;
-        color: #000;
-        background: #ECE9D8;
-    }
-
-    .fuzhou-01__schedule .el-dialog .expand {
-        width: 120px;
-    }
-
-    .fuzhou-01__schedule .el-dialog .el-button:focus span {
-        border: 1px dashed gray;
-    }
-
-    .fuzhou-01__schedule .el-dialog .el-button:active {
-        border: 2px inset #E2E2E2;
-    }
-
-    .fuzhou-01__schedule .el-dialog .el-button:disabled {
-        border: 2px inset #E2E2E2;
-    }
-
-    .fuzhou-01__schedule .el-dialog .el-button:disabled span {
-        border: 0px;
-    }
-
-    .fuzhou-01__schedule .el-dialog .button-group {
-        margin: 0px 5px;
-        text-align: center !important;
-    }
-
-    .fuzhou-01__schedule .el-dialog .el-input {
-        border: 2px inset #E9E9E9;
-    }
-
-    .fuzhou-01__schedule .el-dialog .el-input .el-input__inner {
-        color: #000;
-        background: #fff !important;
-        border: 0px;
-        border-radius: 0px !important;
-        box-sizing: border-box;
-    }
-
-    .fuzhou-01__schedule .el-dialog .el-input.is-disabled .el-input__inner {
-        background: #F0F0F0 !important;
-    }
-
-    .fuzhou-01__schedule .el-dialog .el-textarea {
-        border: 2px inset #E9E9E9;
-        border-radius: 0px;
-    }
-
-    .fuzhou-01__schedule .el-dialog .el-textarea .el-textarea__inner {
-        color: #000;
-        background: #fff !important;
-        border: 0px;
-        border-radius: 0px !important;
-        box-sizing: border-box;
-    }
-
-    .fuzhou-01__schedule .el-dialog .el-textarea.is-disabled .el-textarea__inner {
-        background: #F0F0F0 !important;
-    }
-
-    .fuzhou-01__schedule .el-dialog .el-table {
-        border: 2px inset #E9E9E9;
-        color: #000 !important;
-    }
-
-    .fuzhou-01__schedule .el-dialog .el-table .cell {
-        line-height: unset !important;
-    }
-
-    .fuzhou-01__schedule .el-dialog .el-table th.is-leaf {
-        background: #ECE9D8 !important;
-        border-right: 1px solid #BDBDBD !important;
-        border-bottom: 1px solid #BDBDBD !important;
-        color: #000 !important;
-        height: 20px !important;
-        padding: 0px;
-    }
-
-    .fuzhou-01__schedule .el-dialog .el-table tr td {
-        height: 20px !important;
-        padding: 0px;
-    }
-
-    .fuzhou-01__schedule .el-dialog .el-table .el-table__empty-text {
-        top: 15px !important;
-    }
-
-    .fuzhou-01__schedule .el-dialog .current-row>td {
-        background: #316AC5 !important;
-        color: #fff !important;
-    }
-
-    .fuzhou-01__schedule .el-dialog .el-checkbox__inner {
-        border: 1px inset #dcdfe6 !important;
-    }
-
-    .fuzhou-01__schedule .el-dialog .el-checkbox__label {
-        color: #000 !important;
-    }
-
-    .fuzhou-01__schedule .el-dialog .el-checkbox.is-disabled .el-checkbox__inner {
-        background: #E6E6E6 !important;
-    }
-
-    .fuzhou-01__schedule .el-dialog .el-checkbox.is-disabled .el-checkbox__label {
-        color: #C5C9CC !important;
-    }
-
-    .fuzhou-01__schedule .el-dialog .el-checkbox__input.is-checked .el-checkbox__inner {
-        background: #fff !important;
-        border: 1px inset #dcdfe6 !important;
-    }
-
-    .fuzhou-01__schedule .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__schedule .el-dialog .el-radio__inner {
-        border: 1px inset #dcdfe6 !important;
-    }
-
-    .fuzhou-01__schedule .el-dialog .el-radio__label {
-        color: #000 !important;
-    }
-
-    .fuzhou-01__schedule .el-dialog .el-radio__input.is-checked .el-radio__inner {
-        background: #fff !important;
-        border: 1px inset #dcdfe6 !important;
-    }
-
-    .fuzhou-01__schedule .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__schedule .el-dialog .el-radio.is-disabled .el-radio__inner {
-        background: #E6E6E6 !important;
-    }
-
-    .fuzhou-01__schedule .el-dialog .el-radio.is-disabled .el-radio__label {
-        color: #C5C9CC !important;
-    }
-
-    .fuzhou-01__schedule .el-dialog .base-label {
-        background: rgba(0, 0, 0, x);
-        position: relative;
-        left: -15px;
-        top: -18px;
-    }
-
-    .fuzhou-01__schedule .el-dialog .el-form-item label {
-        font-weight: normal !important;
-        color: #000 !important;
-    }
-
-    .fuzhou-01__schedule .el-dialog .context {
-        height: 100px;
-        border: 2px inset #E2E2E2;
-        overflow-y: scroll;
-    }
-
-    .fuzhou-01__schedule .el-dialog .table {
-        margin-top: 10px;
-    }
-
-    .fuzhou-01__schedule .el-dialog .notice {
-        margin-left: 62px;
-        line-height: 30px;
-    }
-
-    .fuzhou-01__schedule .el-dialog .button-group {
-        margin-top: 10px;
-    }
-
-    .fuzhou-01__schedule .el-dialog .el-tree__empty-block {
-        background: #E9E9E9 !important;
-        color: #000 !important;
-    }
-</style>
diff --git a/src/jmap/theme/fuzhou_01/planSchedule/menuBar.vue b/src/jmap/theme/fuzhou_01/planSchedule/menuBar.vue
deleted file mode 100644
index b58115ead..000000000
--- a/src/jmap/theme/fuzhou_01/planSchedule/menuBar.vue
+++ /dev/null
@@ -1,518 +0,0 @@
-<template>
-  <div id="PlanMenuBar">
-    <div class="nav">
-      <template v-for="(item,i) in menu">
-        <template v-if="noShowingChildren(item.children)">
-          <li :key="i" class="nav-li" @click="hookClick(item)">
-            <span class="nav-li-text">{{ item.title }}</span>
-          </li>
-        </template>
-        <template v-else>
-          <li :key="i" class="nav-li" @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="status">&ensp;</span>
-                    <span class="separator">&ensp;</span>
-                  </li>
-                  <li v-else-if="child.type === 'file'" :key="j" class="menu-li">
-                    <div class="menu-li-block">
-                      <span class="menu-li-text">
-                        <span class="status">&ensp;</span>
-                        <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)"
-                          >
-                          {{ child.title }}
-                        </el-button>
-                      </span>
-                    </div>
-                  </li>
-                  <li v-else :key="j" class="menu-li" @click.stop="popupMenuB(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.type === 'file'" :key="k" class="menu-li">
-                          <div class="menu-li-block">
-                            <span class="menu-li-text">
-                              <span class="status">&ensp;</span>
-                              <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)"
-                                >
-                                {{ grandchild.title }}
-                              </el-button>
-                            </span>
-                          </div>
-                        </li>
-                        <li v-else :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.type === 'file'" :key="j" class="menu-li">
-                    <div class="menu-li-block">
-                      <span class="menu-li-text">
-                        <span class="status">&ensp;</span>
-                        <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)"
-                          >
-                          {{ child.title }}
-                        </el-button>
-                      </span>
-                    </div>
-                  </li>
-                  <li v-else :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>
-  </div>
-</template>
-<script>
-import { mapGetters } from 'vuex';
-import { EventBus } from '@/scripts/event-bus';
-
-export default {
-    name: 'PlanMenuBar',
-    props: {
-        lineCode: {
-            type: String,
-            required: true
-        }
-    },
-    data() {
-        return {
-            classA: -1,
-            classB: -1,
-            tempClassA: -1,
-            tempClassB: -1,
-            menu: [
-                {
-                    title: this.$t('menu.file'),
-                    children: [
-                    ]
-                },
-                {
-                    title: this.$t('menu.view'),
-                    children: [
-                        // {
-                        //     title: '缩放',
-                        // },
-                        // {
-                        //     title: '单色显示历史计划',
-                        // },
-                        // {
-                        //     title: '彩色显示历史计划'
-                        // }
-                    ]
-                },
-                {
-                    title: this.$t('menu.edit'),
-                    children: [
-                        // {
-                        //     title: '修改',
-                        //     click: this.handleEditPlanningTrain
-                        // },
-                        // {
-                        //     title: '加任务',
-                        //     click: this.handleAddTask
-                        // },
-                        // {
-                        //     title: '删任务',
-                        //     click: this.handleDeleteTask
-                        // },
-                        // {
-                        //     title: '改表号',
-                        //     click: this.handleModifyingPlanId
-                        // },
-                        // {
-                        //     title: '平移多辆车',
-                        //     click: this.handleTranslationalMulTrain
-                        // }
-                    ]
-                },
-                {
-                    title: this.$t('menu.tool'),
-                    children: [
-                        {
-                            title: this.$t('menu.viewPlanList'),
-                            click: this.handleViewPlanSchedule,
-                            width: 150
-                        },
-                        {
-                            title: this.$t('menu.createAWeekPlan'),
-                            click: this.handleCreateWeekPlan,
-                            width: 150
-                        },
-                        {
-                            title: this.$t('menu.loadTheDayPlan'),
-                            click: this.handleReloadTodayPlan,
-                            width: 150
-                        }
-                        // {
-                        //     title: '有效性检查',
-                        //     click: this.handleValidityCheck
-                        // }
-                    ]
-                },
-                {
-                    title: this.$t('menu.help'),
-                    children: [
-                    ]
-                }
-            ]
-        };
-    },
-    computed: {
-        ...mapGetters('training', [
-            '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;
-            }
-        }
-    },
-    mounted() {
-        this.initMenu();
-    },
-    methods: {
-        initMenu() {
-            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();
-            // launchFullscreen();
-            setTimeout(() => {
-                if (item && typeof item.click == 'function') {
-                    item.click();
-                }
-            }, 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('menu.achieving'), this.$t('tip.hint'), {
-                confirmButtonText: this.$t('tip.confirm'),
-                callback: action => {
-                }
-            });
-        },
-        // 修改计划
-        handleEditPlanningTrain() {
-            this.$emit('dispatchDialog', { name: 'modifyingPlan' });
-        },
-        // 添加任务
-        handleAddTask() {
-            const params = this.$store.state.runPlan.selected;
-            this.$emit('dispatchDialog', { name: 'addTask', params });
-        },
-        // 删除任务
-        handleDeleteTask() {
-            const params = this.$store.state.runPlan.selected;
-            this.$emit('dispatchDialog', { name: 'deleteTask', params });
-        },
-        // 修改任务
-        handleModifyingTask() {
-            const params = this.$store.state.runPlan.selected;
-            this.$emit('dispatchDialog', { name: 'modifyingTask', params });
-        },
-        // 改表号
-        handleModifyingPlanId() {
-            this.$emit('dispatchDialog', { name: 'modifyingPlanId' });
-        },
-        // 平移多辆车
-        handleTranslationalMulTrain() {
-            this.$emit('dispatchDialog', { name: 'translationalMulTrain' });
-        },
-        // 查看计划列表
-        handleViewPlanSchedule() {
-            this.$emit('dispatchDialog', { name: 'managePlanList' });
-        },
-        // 创建一周计划
-        handleCreateWeekPlan() {
-            this.$emit('dispatchDialog', { name: 'createWeekPlan' });
-        },
-        // 创建当天计划
-        handleReloadTodayPlan() {
-            this.$emit('dispatchDialog', { name: 'createTodayPlan' });
-        },
-        // 有效性检查
-        handleValidityCheck() {
-        }
-    }
-};
-</script>
-
-<style scoped rel="stylesheet/scss" lang="scss">
-    @import "src/styles/mixin.scss";
-    $top: 25px;
-    $width: 30px;
-    $height: 20px;
-    $menuPadding: 10px;
-    $menuItemHeight: 30px;
-    $menuItemWidth: 170px;
-    $menuItemPadding: 5px;
-
-    #PlanMenuBar {
-        z-index: 10;
-        position: absolute;
-        top: $top;
-        width: 100%;
-        height: $height;
-        line-height: $height;
-    }
-
-    .nav {
-        display: block;
-        cursor: pointer;
-        color: #0000;
-        background: #EBEADB;
-        list-style: none;
-        border: 1px solid #B6BCCC !important;
-    }
-
-    .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;
-        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;
-        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: #CACACA;
-        margin-left: 5px;
-        height: 2px;
-        width: $menuItemWidth - $width - 30px;
-    }
-
-    .menu-li {
-        text-align: left;
-        background: #F0F0F0;
-        height: $menuItemHeight;
-        line-height: $menuItemHeight;
-    }
-
-    .menu-li-block {
-        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;
-        background: #EFECDE;
-    }
-
-    .menu-li-text .label {
-        display: inline-block;
-        margin-left: 5px;
-    }
-
-    .menu-li-text .button {
-        position: relative;
-        overflow: hidden;
-        margin-left: 10px;
-        line-height: 0px;
-        width: $menuItemWidth - $width;
-        top: -$menuItemHeight;
-        color: #000;
-        cursor: pointer;
-
-        input {
-            opacity: 0;
-            cursor: pointer;
-            position: absolute;
-            top: 0px;
-            width: $menuItemWidth - $width - 10px;
-        }
-    }
-
-    .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/jmap/theme/fuzhou_01/planSchedule/schedule.vue b/src/jmap/theme/fuzhou_01/planSchedule/schedule.vue
deleted file mode 100644
index d157b4e01..000000000
--- a/src/jmap/theme/fuzhou_01/planSchedule/schedule.vue
+++ /dev/null
@@ -1,482 +0,0 @@
-<template>
-  <div id="PlanSchedule" :style="{top: top+'px', height: height+'px'}">
-    <div class="left">
-      <div :id="runPlanId" />
-    </div>
-    <div class="right">
-      <data-table
-        ref="serviceTable"
-        :height="height/2"
-        :config="serviceNumberConfig"
-        :style="{top: top-height/2+'px'}"
-        @touch="scheduleTouch"
-      />
-      <data-table
-        ref="tripTable"
-        :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 { runDiagramGetTime } from '@/api/simulation';
-import DataTable from '../menusPlan/components/dataTable';
-import echarts from 'echarts';
-
-export default {
-    name: 'PlanSchedule',
-    components: {
-        DataTable
-    },
-    props: {
-        group: {
-            type: String,
-            required: true
-        },
-        lineCode: {
-            type: String,
-            required: true
-        },
-        maxWidth: {
-            type: Number,
-            required: true
-        },
-        maxHeight: {
-            type: Number,
-            required: true
-        }
-    },
-    data() {
-        return {
-            top: 0,
-            height: 0,
-            heights: [100, 100],
-            runPlanId: 'plan-schedule-id',
-            myChart: null,
-            PlanConvert: {},
-            serviceNumberConfig: {
-                data: [],
-                highlightCurrentRow: true,
-                handleChange: this.serviceNumberChange,
-                showClose: false,
-                columns: [
-                    {
-                        prop: 'serviceNumber',
-                        label: this.$t('menu.serviceNumber')
-                    },
-                    {
-                        width: 40
-                    }
-                ]
-            },
-            tripNumberConfig: {
-                data: [],
-                highlightCurrentRow: true,
-                handleChange: this.tripNumberChange,
-                showClose: false,
-                columns: [
-                    {
-                        prop: 'tripNumber',
-                        label: this.$t('menu.tripNumber')
-                    },
-                    {
-                        width: 40
-                    }
-                ]
-            },
-            realData: {},
-            kmRangeCoordMap: {},
-            option: {
-                title: {
-                    text: '',
-                    left: 'center'
-                },
-                grid: {
-                    top: '30px',
-                    left: '120px',
-                    right: '40px',
-                    bottom: '65px',
-                    containLabel: true,
-                    backgroundColor: 'floralwhite'
-                },
-                toolbox: {
-                    // right: '30px',
-                    // feature: {
-                    //     dataZoom: {
-                    //         yAxisIndex: 'none'
-                    //     },
-                    //     restore: {},
-                    //     saveAsImage: {}
-                    // }
-                },
-                tooltip: {
-                    axisPointer: {
-                        trigger: 'item',
-                        type: 'cross'
-                    },
-                    formatter: this.axisTooltip,
-                    borderWidth: 1
-                },
-                xAxis: [
-                    {
-                        type: 'category',
-                        boundaryGap: false,
-                        data: [],
-                        axisLine: {
-                            onZero: false,
-                            lineStyle: {
-                                width: 2,
-                                color: '#d14a61'
-                            }
-                        },
-                        axisLabel: {
-                            formatter: this.xAxisLableFormat,
-                            textStyle: {
-                                color: '#333'
-                            }
-                        },
-                        axisPointer: {
-                            snap: true,
-                            label: {
-                                formatter: this.xAxisPointFormat,
-                                backgroundColor: 'rgb(255,0,0,0.5)',
-                                color: 'white'
-                            }
-                        }
-                    }
-                ],
-                yAxis: {
-                    type: 'value',
-                    splitLine: {
-                        show: false
-                    },
-                    axisTick: {
-                        show: false
-                    },
-                    axisLine: {
-                        onZero: false,
-                        lineStyle: {
-                            width: 2,
-                            color: '#d14a61'
-                        }
-                    },
-                    axisLabel: {
-                        interval: 'auto',
-                        formatter: this.yAxisLableFormat
-                    },
-                    axisPointer: {
-                        xAxisIndex: 'all',
-                        label: {
-                            formatter: this.yAxisPointFormat,
-                            backgroundColor: 'rgb(0,100,0,0.5)',
-                            color: 'white'
-                        }
-                    },
-                    min: 0,
-                    max: 0
-                },
-                series: [],
-                dataZoom: [
-                    {
-                        type: 'inside'
-                    },
-                    {
-                        fiterMode: 'filter',
-                        handleIcon: 'M10.7,11.9v-1.3H9.3v1.3c-4.9,0.3-8.8,4.4-8.8,9.4c0,5,3.9,9.1,8.8,9.4v1.3h1.3v-1.3c4.9-0.3,8.8-4.4,8.8-9.4C19.5,16.3,15.6,12.2,10.7,11.9z M13.3,24.4H6.7V23h6.6V24.4z M13.3,19.6H6.7v-1.4h6.6V19.6z',
-                        handleSize: '80%',
-                        handleStyle: {
-                            color: '#fff',
-                            shadowBlur: 3,
-                            shadowColor: 'rgba(0, 0, 0, 0.6)',
-                            shadowOffsetX: 2,
-                            shadowOffsetY: 2
-                        },
-                        bottom: '20px'
-                    }
-                ]
-            },
-            absoluteTime: 2 * 3600,
-            indexKmRangeMap: {}
-        };
-    },
-    computed: {
-        ...mapGetters('runPlan', [
-            'stations'
-        ])
-    },
-    watch: {
-        maxWidth() {
-            this.setPosition();
-        },
-        maxHeight() {
-            this.setPosition();
-        },
-        '$store.state.runPlan.planLoadedCount': async function () {
-            await this.loadChartPage();
-        },
-        '$store.state.runPlan.planSizeCount': function () {
-            this.reSize({ width: this.$store.state.runPlan.width, height: this.$store.state.runPlan.height });
-        },
-        '$store.state.runPlan.selected.serviceNumber': function (val) {
-            const index = this.serviceNumberConfig.data.findIndex(elem => {
-                return elem.serviceNumber == val;
-            });
-
-            this.$refs.serviceTable.setCurrentRow(this.serviceNumberConfig.data[index]);
-        },
-        '$store.state.runPlan.selected.tripNumber': function (val) {
-            const index = this.tripNumberConfig.data.findIndex(elem => {
-                return elem.tripNumber == val;
-            });
-            this.$refs.tripTable.setCurrentRow(this.tripNumberConfig.data[index]);
-        }
-    },
-    mounted() {
-        this.PlanConvert = this.$theme.loadPlanConvert(this.lineCode);
-    },
-    beforeDestroy() {
-        this.destroy();
-    },
-    methods: {
-        serviceNumberChange(row) {
-            if (row) {
-                this.$store.dispatch('runPlan/setSelected', { 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 });
-            }
-        },
-        async analyticalServiceNumber(data) {
-            this.serviceNumberConfig.data = Object.keys(data || {})
-                .sort((a, b) => { return data[a].oldIndex - data[b].oldIndex; })
-                .map(serviceNumber => { return { serviceNumber }; });
-        },
-        async analyticalTripNumber(data) {
-            this.tripNumberConfig.data = Object.keys(data || {})
-                .sort((a, b) => { return data[a].oldIndex - data[b].oldIndex; })
-                .map(tripNumber => { return { tripNumber }; });
-        },
-        async setPosition() {
-            this.$nextTick(() => {
-                let top = 3;
-                const width = this.maxWidth * 0.85;
-                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, height });
-
-                if (this.top != top) {
-                    this.top = top;
-                }
-
-                if (this.height != height) {
-                    this.height = height - 20 * 2;
-                }
-            });
-        },
-        async loadChartPage() {
-            try {
-                let series = [];
-                const planData = this.$store.state.runPlan.planData || [];
-                const stations = this.$store.state.runPlan.stations || [];
-
-                this.viewDisabled = true;
-                this.kmRangeCoordMap = this.PlanConvert.convertStationsToMap(stations);
-                series = this.pushModels(series, [this.PlanConvert.initializeYaxis(stations)]);
-                series = this.pushModels(series, this.PlanConvert.convertDataToModels(planData, stations, this.kmRangeCoordMap, { width: 0.5 }));
-                await this.loadInitData(series);
-                await this.analyticalServiceNumber(this.$store.state.runPlan.editData);
-                this.viewDisabled = false;
-
-            } catch (error) {
-                this.viewDisabled = false;
-                this.$messageBox(this.$t('error.loadingOperationGraphFailed'));
-            }
-        },
-        async loadInitData(series) {
-            this.myChart && this.myChart.showLoading();
-            await this.xAxisInit();
-            await this.yAxisInit();
-            await this.loadInitChart(series);
-            this.myChart && this.myChart.hideLoading();
-        },
-        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(series) {
-            return new Promise((resolve, reject) => {
-                try {
-                    this.destroy();
-
-                    let startValue = 3600 + this.PlanConvert.TranslationTime;
-                    const offsetTime = 3600;
-
-                    runDiagramGetTime(this.group).then(resp => {
-                        startValue = resp.data - this.PlanConvert.TranslationTime;
-                        this.option.dataZoom[0].startValue = this.option.dataZoom[1].startValue = startValue - offsetTime;
-                        this.option.dataZoom[0].endValue = this.option.dataZoom[1].endValue = startValue + offsetTime;
-                        this.option.series = series;
-                        this.myChart = echarts.init(document.getElementById(this.runPlanId));
-                        if (this.myChart) {
-                            this.myChart.setOption(this.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.PlanConvert.computedFormatYAxis(this.stations, params);
-        },
-        xAxisLableFormat(value, index) {
-            if (value % 60 === 0) {
-                return timeFormat(value);
-            }
-        },
-        yAxisLableFormat(value, index) {
-            return '';
-        },
-        xAxisInit() {
-            const list = [];
-            for (var time = 0 + this.PlanConvert.TranslationTime; time < 3600 * 24 + this.PlanConvert.TranslationTime; time++) {
-                list.push(time);
-            }
-
-            const startValue = 3600 * 6;
-            const offsetTime = 3600 * 1;
-
-            this.option.xAxis[0].data = list;
-            if (!this.option.dataZoom[0].startValue) {
-                this.option.dataZoom[0].startValue = this.option.dataZoom[1].startValue = startValue - offsetTime;
-            }
-
-            if (!this.option.dataZoom[0].endValue) {
-                this.option.dataZoom[0].endValue = this.option.dataZoom[1].endValue = startValue + offsetTime;
-            }
-        },
-        yAxisInit() {
-            if (Object.keys(this.PlanConvert).length) {
-                this.option.yAxis.min = this.PlanConvert.computedYaxisMinValue(this.stations);
-                this.option.yAxis.max = this.PlanConvert.computedYaxisMaxValue(this.stations);
-            }
-        },
-        axisTooltip(param) {
-            const station = this.stations[Math.floor((param.data[1] - this.PlanConvert.EdgeHeight) / this.PlanConvert.CoordMultiple)] || { name: '', kmRange: '' };
-            return [
-                `Point Data <hr size=1 style=" margin: 3px 0">`,
-                `${this.$t('menu.stationName') + station.name}<br>`,
-                `${this.$t('menu.stationKilometerMark') + station.kmRange} km <br>`,
-                `${this.$t('menu.arrivalTime2') + timeFormat(param.data[0] + this.PlanConvert.TranslationTime)} (${param.data[0]})<br>`
-            ].join('');
-        },
-        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 {
-        z-index: 5;
-        position: absolute;
-        width: 100%;
-
-        .left {
-            height: 100%;
-            width: 85%;
-            float: left;
-        }
-
-        .right {
-            height: 100%;
-            width: 15%;
-            float: right;
-        }
-    }
-</style>
diff --git a/src/jmap/theme/fuzhou_01/planSchedule/statusBar.vue b/src/jmap/theme/fuzhou_01/planSchedule/statusBar.vue
deleted file mode 100644
index d21265950..000000000
--- a/src/jmap/theme/fuzhou_01/planSchedule/statusBar.vue
+++ /dev/null
@@ -1,107 +0,0 @@
-<template>
-  <data-table
-    id="PlanStatusBar"
-    ref="dataTable"
-    :height="height-11"
-    :config="stationListConfig"
-    :close="false"
-    :style="{top: maxmini? maxTop-110+'px':maxTop-21+'px'}"
-    @touch="touch"
-  />
-</template>
-
-<script>
-import DataTable from '../menusPlan/components/dataTable';
-import { formatTime, formatName } from '@/utils/runPlan';
-
-export default {
-    name: 'PlanStatusBar',
-    components: {
-        DataTable
-    },
-    props: {
-        maxTop: {
-            type: Number,
-            required: true
-        }
-    },
-    data() {
-        return {
-            maxmini: true,
-            height: 100,
-            stationListConfig: {
-                data: [],
-                showClose: true,
-                highlightCurrentRow: true,
-                columns: [
-                    {
-                        prop: 'stationName',
-                        label: this.$t('menu.platform'),
-                        width: 400
-                    },
-                    {
-                        prop: 'startTime',
-                        label: this.$t('menu.arrivalTime')
-                    },
-                    {
-                        prop: 'stopTime',
-                        label: this.$t('menu.stopTime')
-                    },
-                    {
-                        prop: 'endTime',
-                        label: this.$t('menu.departureTime')
-                    },
-                    {
-                        prop: 'level',
-                        label: this.$t('menu.runLevel')
-
-                    }
-                ]
-            }
-        };
-    },
-    watch: {
-        '$store.state.runPlan.selected': function (select) {
-            this.stationListConfig.data = [];
-            const serviceObj = this.$store.state.runPlan.editData[select.serviceNumber];
-            if (serviceObj) {
-                const trainMap = serviceObj.trainMap;
-                if (trainMap) {
-                    const trainObj = trainMap[select.tripNumber];
-                    if (trainObj) {
-                        const stationTimeList = trainObj.stationTimeList;
-                        if (stationTimeList && stationTimeList.length) {
-                            stationTimeList.forEach((elem, index) => {
-                                const stationObj = {
-                                    stationName: formatName(elem.stationCode),
-                                    startTime: formatTime(index == 0 ? null : stationTimeList[index - 1].secondTime),
-                                    stopTime: formatTime(index == 0 ? null : elem.secondTime - stationTimeList[index - 1].secondTime),
-                                    endTime: formatTime(elem.secondTime),
-                                    level: ''
-                                };
-                                this.stationListConfig.data.push(stationObj);
-                            });
-                        }
-                    }
-                }
-            }
-        }
-    },
-    methods: {
-        touch(maxmini) {
-            this.maxmini = maxmini;
-            this.$emit('setPosition');
-        }
-    }
-};
-</script>
-
-<style scoped rel="stylesheet/scss" lang="scss">
-    @import "src/styles/mixin.scss";
-
-    #PlanStatusBar {
-        z-index: 5;
-        position: absolute;
-        width: 100%;
-    }
-</style>
diff --git a/src/jmap/theme/fuzhou_01/planSchedule/titleBar.vue b/src/jmap/theme/fuzhou_01/planSchedule/titleBar.vue
deleted file mode 100644
index 56e459044..000000000
--- a/src/jmap/theme/fuzhou_01/planSchedule/titleBar.vue
+++ /dev/null
@@ -1,75 +0,0 @@
-<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() {
-        if (this.$route.query.mapId) {
-            getPublishMapInfo(this.$route.query.mapId).then(resp => {
-                this.mapName = resp.data.name;
-            });
-        }
-    },
-    methods: {
-        back() {
-            this.$emit('back');
-        }
-    }
-};
-</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: 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/jmap/transformHandle.js b/src/jmap/transformHandle.js
deleted file mode 100644
index 92cc58f01..000000000
--- a/src/jmap/transformHandle.js
+++ /dev/null
@@ -1,74 +0,0 @@
-
-import {createTransform, createBoundingRect} from './utils/parser';
-
-class TransformHandle {
-    constructor(painter) {
-        this.$painter = painter;
-
-        this.parentLevel = painter.getParentLevel();
-
-        this.rect = { x: 0, y: 0, width: 0, height: 0 };
-
-        this.transform = createTransform({ scaleRate: 1, offsetX: 0, offsetY: 0 });
-    }
-
-    checkVisible(view) {
-        if (view._type != 'Link') {
-            return createBoundingRect(view).intersect(this.rect);
-        } else {
-            return true;
-        }
-    }
-
-    revisibleView(view) {
-        if (this.checkVisible(view)) {
-            view.show();
-        } else {
-            view.hide();
-        }
-
-        view.dirty();
-    }
-
-    // 视图进行缩放/平移
-    transformView(view) {
-        if (view) {
-            view.transform = this.transform;
-            view.decomposeTransform();
-            this.revisibleView(view);
-        }
-    }
-
-    // 处理所有视图缩放/平移
-    transformAll() {
-        this.traverse(this.transformView, this);
-    }
-
-    // 重新计算显示图形
-    revisibleAll() {
-        this.traverse(this.revisibleView, this);
-    }
-
-    // 更新偏移量
-    updateTransform(opts) {
-        this.transform = createTransform(opts);
-        this.transformAll();
-    }
-
-    // 更新画布尺寸
-    updateZrSize(opts) {
-        this.rect = { x: 0, y: 0, width: opts.width, height: opts.height };
-        this.revisibleAll();
-    }
-
-    // 遍历group执行回调
-    traverse(cb, context) {
-        this.parentLevel.eachChild(level => {
-            level.eachChild((view) => {
-                cb.call(context, view);
-            }, context);
-        }, context);
-    }
-}
-
-export default TransformHandle;
diff --git a/src/jmap/utils/JTriangle.js b/src/jmap/utils/JTriangle.js
deleted file mode 100644
index 082e0e342..000000000
--- a/src/jmap/utils/JTriangle.js
+++ /dev/null
@@ -1,67 +0,0 @@
-/** 三角函数计算 */
-function JTriangle(beg, end) {
-    this.init(beg, end);
-}
-JTriangle.prototype = {
-    constructor: JTriangle,
-    beg: null,
-    end: null,
-    abspowx: 0,
-    abspowy: 0,
-    abspowz: 0,
-    drictx: 0,
-    dricty: 0,
-    drict: 0,
-
-    init (beg, end) {
-        this.beg = beg;
-        this.end = end;
-        this.abspowx = Math.pow(this.end.x - this.beg.x, 2);
-        this.abspowy = Math.pow(this.end.y - this.beg.y, 2);
-        this.abspowz = this.abspowx + this.abspowy;
-        this.absx = Math.abs(this.end.x - this.beg.x);
-        this.absy = Math.abs(this.end.y - this.beg.y);
-        this.absz = Math.sqrt(Math.pow(this.end.x - this.beg.x, 2), Math.pow(this.end.y - this.beg.y, 2));
-        this.drictx = this.end.x > this.beg.x ? 1 : -1;
-        this.dricty = this.end.y > this.beg.y ? 1 : -1;
-        this.drict = this.drictx * this.dricty;
-        this.diff_x = end.x - beg.x;
-        this.diff_y = end.y - beg.y;
-    },
-    getRotation () {
-        return Math.atan(this.diff_y / this.diff_x);
-    },
-    getAngle () {
-        return 360 * Math.atan(this.diff_y / this.diff_x) / (2 * Math.PI);
-    },
-    getCos (n) {
-        return this.drictx * Math.sqrt(Math.pow(n, 2) * this.abspowx / this.abspowz);
-    },
-    getSin (n) {
-        return this.dricty * Math.sqrt(Math.pow(n, 2) * this.abspowy / this.abspowz);
-    },
-    getCosRate () {
-        return Math.sqrt(this.abspowx / this.abspowz);
-    },
-    getSinRate () {
-        return Math.sqrt(this.abspowy / this.abspowz);
-    },
-    getTanRate () {
-        var diff_x = this.end.x - this.beg.x;
-        var diff_y = this.end.y - this.beg.y;
-        return Math.abs(diff_y / diff_x);
-    },
-    getCotRate () {
-        var diff_x = this.end.x - this.beg.x;
-        var diff_y = this.end.y - this.beg.y;
-        return Math.abs(diff_x / diff_y);
-    },
-    middlePoint () {
-        return {
-            x: Math.min(this.end.x, this.beg.x) + Math.abs(this.end.x - this.beg.x) / 2,
-            y: Math.min(this.end.y, this.beg.y) + Math.abs(this.end.y - this.beg.y) / 2
-        };
-    }
-};
-
-export default JTriangle;
diff --git a/src/jmap/utils/Uid.js b/src/jmap/utils/Uid.js
deleted file mode 100644
index 386cefc4a..000000000
--- a/src/jmap/utils/Uid.js
+++ /dev/null
@@ -1,11 +0,0 @@
-var base = 0;
-
-/**
- * @public
- * @param {string} type
- * @return {string}
- */
-export function getUID(type) {
-	// use Math.random to make id as unique as possible.
-	return [(type || ''), base++, Math.random().toFixed(5)].join('_');
-}
diff --git a/src/jmap/utils/Uname.js b/src/jmap/utils/Uname.js
deleted file mode 100644
index 0e7ee5a42..000000000
--- a/src/jmap/utils/Uname.js
+++ /dev/null
@@ -1,16 +0,0 @@
-/**
- * @public
- * @param {string} type
- * @return {string}
- */
-export function getUName(list) {
-	var base = 1;
-	if (list) {
-		list.forEach(elem => {
-			if (elem.hasOwnProperty('name') && Number.isInteger(parseInt(elem.name)) && parseInt(elem.name) >= base) {
-				base = parseInt(elem.name) + 1;
-			}
-		});
-	}
-	return base.toString();
-}
diff --git a/src/jmap/utils/parser.js b/src/jmap/utils/parser.js
deleted file mode 100644
index 71aabb2bb..000000000
--- a/src/jmap/utils/parser.js
+++ /dev/null
@@ -1,211 +0,0 @@
-import * as zrUtil from 'zrender/src/core/util';
-import * as matrix from 'zrender/src/core/matrix';
-import deviceType from '../constant/deviceType';
-import deviceRender from '../constant/deviceRender';
-import Vue from 'vue';
-import { deepClone } from '@/utils/index';
-
-export function createTransform(opts) {
-    let transform = matrix.create();
-    transform = matrix.scale(matrix.create(), transform, [opts.scaleRate, opts.scaleRate]);
-    transform = matrix.translate(matrix.create(), transform, [-opts.offsetX, -opts.offsetY]);
-    return transform;
-}
-
-export function createBoundingRect(view) {
-    const rect = view.getBoundingRect();
-    const scale = view.scale[0];
-    const offsetX = view.position[0];
-    const offsetY = view.position[1];
-    rect.x = rect.x * scale + offsetX;
-    rect.y = rect.y * scale + offsetY;
-    rect.width = rect.width * scale;
-    rect.height = rect.height * scale;
-    return rect;
-}
-
-export function calculateDCenter(viewRect, zrbound) {
-    var dx = (zrbound.width - viewRect.width) / 2 - viewRect.x;
-    var dy = 0;
-    return { dx: dx, dy: dy };
-}
-
-export function deviceFactory(type, elem) {
-    return {...deviceRender[type], ...elem};
-}
-
-export function createDevice(type, elem, propConvert) {
-    const device = deviceFactory(type, Object.assign(elem, { _type: type } ));
-    return propConvert ? propConvert.initPrivateProps(device) : device;
-}
-
-export function parser(data, skinCode) {
-    var mapDevice = {};
-    var propConvert = skinCode ? Vue.prototype.$theme.loadPropConvert(skinCode) : null;
-    if (data) {
-        zrUtil.each(data.linkList || [], elem => {
-            mapDevice[elem.code] = createDevice(deviceType.Link, elem, propConvert);
-        }, this);
-
-        zrUtil.each(data.sectionList || [], elem => {
-            mapDevice[elem.code] = createDevice(deviceType.Section, elem, propConvert);
-        }, this);
-
-        zrUtil.each(data.signalList || [], elem => {
-            mapDevice[elem.code] = createDevice(deviceType.Signal, elem, propConvert);
-        }, this);
-
-        zrUtil.each(data.stationList || [], elem => {
-            mapDevice[elem.code] = createDevice(deviceType.Station, elem, propConvert);
-        }, this);
-
-        zrUtil.each(data.stationStandList || [], elem => {
-            mapDevice[elem.code] = createDevice(deviceType.StationStand, elem, propConvert);
-        }, this);
-
-        zrUtil.each(data.stationControlList || [], elem => {
-            mapDevice[elem.code] = createDevice(deviceType.StationControl, elem, propConvert);
-        }, this);
-
-        zrUtil.each(data.counterList || [], elem => {
-            mapDevice[elem.code] = createDevice(deviceType.StationCounter, elem, propConvert);
-        }, this);
-
-        zrUtil.each(data.delayShowList || [], elem => {
-            mapDevice[elem.code] = createDevice(deviceType.StationDelayUnlock, elem, propConvert);
-        }, this);
-
-        zrUtil.each(data.lineList || [], elem => {
-            mapDevice[elem.code] = createDevice(deviceType.Line, elem, propConvert);
-        }, this);
-
-        zrUtil.each(data.textList || [], elem => {
-            mapDevice[elem.code] = createDevice(deviceType.Text, elem, propConvert);
-        }, this);
-
-        zrUtil.each(data.zcList || [], elem => {
-            mapDevice[elem.code] = createDevice(deviceType.ZcControl, elem, propConvert);
-        }, this);
-
-        zrUtil.each(data.buttonList || [], elem => {
-            mapDevice[elem.code] = createDevice(deviceType.ButtonControl, elem, propConvert);
-        }, this);
-
-        zrUtil.each(data.lcList || [], elem => {
-            mapDevice[elem.code] = createDevice(deviceType.LcControl, elem, propConvert);
-        }, this);
-
-        zrUtil.each(data.tempSpeedLimitList || [], elem => {
-            mapDevice[elem.code] = createDevice(deviceType.LimitControl, elem, propConvert);
-        }, this);
-
-        zrUtil.each(data.resourceList || [], elem => {
-            mapDevice[elem.code] = createDevice(deviceType.ImageControl, elem, propConvert);
-        }, this);
-
-        zrUtil.each(data.trainList || [], elem => {
-            mapDevice[elem.code] = createDevice(deviceType.Train, elem, propConvert);
-        }, this);
-
-        zrUtil.each(data.Line || [], elem => {
-            mapDevice[elem.code] = createDevice(deviceType.Line, elem, propConvert);
-        }, this);
-
-        zrUtil.each(data.Text || [], elem => {
-            mapDevice[elem.code] = createDevice(deviceType.Text, elem, propConvert);
-        }, this);
-
-        zrUtil.each(data.trainWindowList || [], elem => {
-            mapDevice[elem.code] = createDevice(deviceType.TrainWindow, elem, propConvert);
-            if (elem.sectionCode) {
-                const section = mapDevice[elem.sectionCode];
-                if (section) {
-                    section['trainWindowCode'] = elem.code;
-                }
-            }
-        }, this);
-
-        zrUtil.each(data.switchList || [], elem => {
-            mapDevice[elem.code] = createDevice(deviceType.Switch, elem, propConvert);
-            const cnodeSection = mapDevice[mapDevice[elem.code].sectionACode];
-            const lnodeSection = mapDevice[mapDevice[elem.code].sectionBCode];
-            const rnodeSection = mapDevice[mapDevice[elem.code].sectionCCode];
-
-            if (cnodeSection && lnodeSection && rnodeSection) {
-                cnodeSection['switch'] = lnodeSection['switch'] = rnodeSection['switch'] = mapDevice[elem.code];
-                const cnode = mapDevice[cnodeSection.linkCode];
-                if (cnode && cnode.leftFdCode === lnodeSection.linkCode && cnode.leftSdCode === rnodeSection.linkCode) {
-                    mapDevice[elem.code].intersection = {
-                        x: cnodeSection.points[0].x,
-                        y: cnodeSection.points[0].y
-                    };
-                    mapDevice[elem.code].skew = {
-                        x: rnodeSection.points[rnodeSection.points.length - 2].x,
-                        y: rnodeSection.points[rnodeSection.points.length - 2].y
-                    };
-                } else if (cnode && cnode.rightFdCode === lnodeSection.linkCode && cnode.rightSdCode === rnodeSection.linkCode) {
-                    mapDevice[elem.code].intersection = {
-                        x: cnodeSection.points[cnodeSection.points.length - 1].x,
-                        y: cnodeSection.points[cnodeSection.points.length - 1].y
-                    };
-                    mapDevice[elem.code].skew = {
-                        x: rnodeSection.points[1].x,
-                        y: rnodeSection.points[1].y
-                    };
-                }
-
-                const section = mapDevice[cnodeSection.parentCode];
-                if (section) {
-                    mapDevice[elem.code].sectionName = section.name;
-                    section['relSwitchCode'] = elem.code;
-                }
-
-                rnodeSection['layer'] = -1;
-            }
-        }, this);
-    }
-
-    return mapDevice;
-}
-
-// 同步绘制数据到原始数据
-export function updateForList(model, state, liststr) {
-    const list = state.map[liststr];
-    if (list && list instanceof Array) {
-        const i = list.findIndex(elem => { return elem.code == model.code; });
-        if (model._dispose) {
-            i >= 0 && list.splice(i, 1); // 删除
-        } else if (!list[i]) {
-            list.push(deepClone(model)); // 新增
-        } else if (i >= 0) {
-            list[i] = deepClone(model); // item map 数据  model 页面表单数据
-        }
-    } else {
-        state.map[liststr] = [model];
-    }
-}
-
-export function updateMapData(state, model) {
-    if (state.map && model) {
-        switch (model._type) {
-        case deviceType.Link: updateForList(model, state, 'linkList'); break;
-        case deviceType.Section: updateForList(model, state, 'sectionList'); break;
-        case deviceType.Switch: updateForList(model, state, 'switchList'); break;
-        case deviceType.Signal: updateForList(model, state, 'signalList'); break;
-        case deviceType.Station: updateForList(model, state, 'stationList'); break;
-        case deviceType.StationStand: updateForList(model, state, 'stationStandList'); break;
-        case deviceType.StationControl: updateForList(model, state, 'stationControlList'); break;
-        case deviceType.StationCounter: updateForList(model, state, 'stationCounterList'); break;
-        case deviceType.ZcControl: updateForList(model, state, 'zcControlList'); break;
-        case deviceType.StationDelayUnlock:updateForList(model, state, 'stationDelayUnlockList'); break;
-        case deviceType.LcControl: updateForList(model, state, 'lcControlList'); break;
-        case deviceType.ButtonControl: updateForList(model, state, 'buttonList'); break;
-        case deviceType.LimitControl: updateForList(model, state, 'tempSpeedLimitList'); break;
-        case deviceType.ImageControl: updateForList(model, state, 'imageControl'); break;
-        case deviceType.Train: updateForList(model, state, 'trainList'); break;
-        case deviceType.TrainWindow: updateForList(model, state, 'trainWindowList'); break;
-        case deviceType.Line: updateForList(model, state, 'lineList'); break;
-        case deviceType.Text: updateForList(model, state, 'textList'); break;
-        }
-    }
-}
diff --git a/src/jmapNew/config/deviceStyle.js b/src/jmapNew/config/deviceStyle.js
index 30d366b60..0a866fe5c 100644
--- a/src/jmapNew/config/deviceStyle.js
+++ b/src/jmapNew/config/deviceStyle.js
@@ -3,13 +3,15 @@ const mapDeviceStyle = {
     '02': 'fuzhou_01',
     '03': 'bejing_01',
     '04': 'chengdu_03',
+    '05': 'fuzhou_01',
     '06': 'ningbo_01',
     '07': 'haerbin_01',
     '08': 'foshan_01',
     '09': 'xian_02',
     '10': 'xian_01', // 西安一号线
     '11': 'xian_01', // 西安三号线
-    '12': 'ningbo_03' // 宁波三号线
+    '12': 'ningbo_03', // 宁波三号线
+    '13': 'race_01' // 2020国赛线路
 };
 
 export function selectLineCode(code) {
diff --git a/src/jmapNew/config/skinCode/bejing_01.js b/src/jmapNew/config/skinCode/bejing_01.js
index c06efa81f..7020047f3 100644
--- a/src/jmapNew/config/skinCode/bejing_01.js
+++ b/src/jmapNew/config/skinCode/bejing_01.js
@@ -19,7 +19,8 @@ class SkinCode extends defaultStyle {
                 fontColor: '#FFFFFF', 						// 字体颜色
                 textAlign: 'center', 						// 水平对齐方式
                 textPosition: 'inside', 					// 文字位置
-                textVerticalAlign: 'middle' 				// 文字垂直对齐方式
+                textVerticalAlign: 'middle', 				// 文字垂直对齐方式
+                approachColor: '#FFFFFF'
             },
             logicText: { // 逻辑区段名称
                 z: 10,
@@ -362,9 +363,6 @@ class SkinCode extends defaultStyle {
                 fontWeight: 'normal',						// 字体粗细
                 distance: 5 								// 灯跟文字距离
             }
-            // trainStop: {}, 											// 停车标志
-            // trainDepart: {}, 										// 停车计时
-
         };
 
         this[deviceType.StationCounter] = {
diff --git a/src/jmapNew/config/skinCode/chengdu_01.js b/src/jmapNew/config/skinCode/chengdu_01.js
index 6bf0a590a..e628cb1dd 100644
--- a/src/jmapNew/config/skinCode/chengdu_01.js
+++ b/src/jmapNew/config/skinCode/chengdu_01.js
@@ -19,7 +19,8 @@ class SkinCode extends defaultStyle {
                 fontColor: 'lightgreen', 						// 字体颜色
                 textAlign: 'center', 						// 水平对齐方式
                 textPosition: 'inside', 					// 文字位置
-                textVerticalAlign: 'middle' 				// 文字垂直对齐方式
+                textVerticalAlign: 'middle', 				// 文字垂直对齐方式
+                approachColor: '#FFFFFF'
             },
             logicText: {									// 逻辑区段名称
                 z: 10,
@@ -107,6 +108,7 @@ class SkinCode extends defaultStyle {
             },
             speedLimitName: {
                 z: 10,
+                limitValueDistance: -15,
                 kilometerFontSize: 8,						// 公里标大小
                 kilometerColor: '#fff', 					// 公里标颜色
                 nameNumberFontSize: 11,						// 限速值大小
diff --git a/src/jmapNew/config/skinCode/chengdu_03.js b/src/jmapNew/config/skinCode/chengdu_03.js
index d57469786..e0f8d37e6 100644
--- a/src/jmapNew/config/skinCode/chengdu_03.js
+++ b/src/jmapNew/config/skinCode/chengdu_03.js
@@ -19,7 +19,8 @@ class SkinCode extends defaultStyle {
                 fontColor: '#FFFFFF', 						// 字体颜色
                 textAlign: 'center', 						// 水平对齐方式
                 textPosition: 'inside', 					// 文字位置
-                textVerticalAlign: 'middle' 				// 文字垂直对齐方式
+                textVerticalAlign: 'middle', 				// 文字垂直对齐方式
+                approachColor: '#FFFFFF'
             },
             logicText: {
                 z: 10,
@@ -107,6 +108,7 @@ class SkinCode extends defaultStyle {
             },
             speedLimitName: {
                 z: 10,
+                limitValueDistance: -15,
                 kilometerFontSize: 8,						// 公里标大小
                 kilometerColor: '#fff', 					// 公里标颜色
                 nameNumberFontSize: 11,						// 限速值大小
diff --git a/src/jmapNew/config/skinCode/foshan_01.js b/src/jmapNew/config/skinCode/foshan_01.js
index 80e729f99..e8b94c833 100644
--- a/src/jmapNew/config/skinCode/foshan_01.js
+++ b/src/jmapNew/config/skinCode/foshan_01.js
@@ -19,7 +19,8 @@ class SkinCode extends defaultStyle {
                 fontColor: '#FFFFFF', 						// 字体颜色
                 textAlign: 'center', 						// 水平对齐方式
                 textPosition: 'inside', 					// 文字位置
-                textVerticalAlign: 'middle' 				// 文字垂直对齐方式
+                textVerticalAlign: 'middle', 				// 文字垂直对齐方式
+                approachColor: '#FFFFFF'
             },
             logicText: {
                 z: 10,
@@ -430,7 +431,8 @@ class SkinCode extends defaultStyle {
 
         // 延续保护计时
         this[deviceType.OverAp] = {
-            show: true
+            show: true,
+            textColor: '#FFF'
         };
 
         this[deviceType.Switch] = {
diff --git a/src/jmapNew/config/skinCode/fuzhou_01.js b/src/jmapNew/config/skinCode/fuzhou_01.js
index 27969c9cf..a4c9e1311 100644
--- a/src/jmapNew/config/skinCode/fuzhou_01.js
+++ b/src/jmapNew/config/skinCode/fuzhou_01.js
@@ -19,7 +19,8 @@ class SkinCode extends defaultStyle {
                 fontColor: '#FFFFFF', 						// 字体颜色
                 textAlign: 'center', 						// 水平对齐方式
                 textPosition: 'inside', 					// 文字位置
-                textVerticalAlign: 'middle' 				// 文字垂直对齐方式
+                textVerticalAlign: 'middle', 				// 文字垂直对齐方式
+                approachColor: '#FFFFFF'
             },
             logicText: {
                 z: 10,
diff --git a/src/jmapNew/config/skinCode/haerbin_01.js b/src/jmapNew/config/skinCode/haerbin_01.js
index 259d57b30..258e96671 100644
--- a/src/jmapNew/config/skinCode/haerbin_01.js
+++ b/src/jmapNew/config/skinCode/haerbin_01.js
@@ -19,7 +19,8 @@ class SkinCode extends defaultStyle {
                 fontColor: '#FFFFFF', 						// 字体颜色
                 textAlign: 'center', 						// 水平对齐方式
                 textPosition: 'inside', 					// 文字位置
-                textVerticalAlign: 'middle' 				// 文字垂直对齐方式
+                textVerticalAlign: 'middle', 				// 文字垂直对齐方式
+                approachColor: '#FFFFFF'
             },
             logicText: {
                 z: 10,
@@ -265,7 +266,7 @@ class SkinCode extends defaultStyle {
                 z:1,
                 position: 1,								// 停跳方向
                 text: 'S',									// 停跳显示内容
-                offset: { x: 10, y: 20 },
+                offset: { x: 20, y: 21 },
                 textColor: '#00FF00',						// 停跳文字颜色
                 fontWeight: 'bold',						// 文字居中
                 fontSize: 18								// 文字大小
diff --git a/src/jmapNew/config/skinCode/ningbo_01.js b/src/jmapNew/config/skinCode/ningbo_01.js
index 73a543f3b..f31865164 100644
--- a/src/jmapNew/config/skinCode/ningbo_01.js
+++ b/src/jmapNew/config/skinCode/ningbo_01.js
@@ -19,7 +19,8 @@ class SkinCode extends defaultStyle {
                 fontColor: 'lightgreen', 						// 字体颜色
                 textAlign: 'center', 						// 水平对齐方式
                 textPosition: 'inside', 					// 文字位置
-                textVerticalAlign: 'middle' 				// 文字垂直对齐方式
+                textVerticalAlign: 'middle', 				// 文字垂直对齐方式
+                approachColor: '#FFFFFF'
             },
             logicText: {									// 逻辑区段名称
                 z: 10,
@@ -300,6 +301,7 @@ class SkinCode extends defaultStyle {
             },
             arcBlcok: {										// 圆形封锁图形
                 show: true,									// 显示
+                shapeR: 5,
                 arcBorderColor: 'green',					// 默认边框颜色
                 locationColor: 'green',						// 定位封锁颜色
                 inversionColor: '#FFFF00'					// 反位封锁颜色
diff --git a/src/jmapNew/config/skinCode/ningbo_03.js b/src/jmapNew/config/skinCode/ningbo_03.js
index ea4cf05a7..7cc2e3bc6 100644
--- a/src/jmapNew/config/skinCode/ningbo_03.js
+++ b/src/jmapNew/config/skinCode/ningbo_03.js
@@ -20,7 +20,8 @@ class SkinCode extends defaultStyle {
                 fontColor: '#000', 						// 字体颜色
                 textAlign: 'center', 						// 水平对齐方式
                 textPosition: 'inside', 					// 文字位置
-                textVerticalAlign: 'middle' 				// 文字垂直对齐方式
+                textVerticalAlign: 'middle', 				// 文字垂直对齐方式
+                approachColor: '#FFFFFF'
             },
             logicText: {									// 逻辑区段名称
                 z: 10,
diff --git a/src/jmapNew/config/skinCode/race_01.js b/src/jmapNew/config/skinCode/race_01.js
new file mode 100644
index 000000000..b03a1a6d8
--- /dev/null
+++ b/src/jmapNew/config/skinCode/race_01.js
@@ -0,0 +1,795 @@
+import defaultStyle from '../defaultStyle';
+import deviceType from '../../constant/deviceType';
+
+class SkinCode extends defaultStyle {
+    constructor() {
+        super();
+        this.fontFamily = '宋体';
+        this[deviceType.Section] = {
+            elemnetType:['name', 'standTrackText', 'reentryTrackText', 'transferTrackText', 'destinationText', 'line', 'separator', 'speedLimit', 'speedLimitName'],
+            active: {
+                routeColor: false							// 进路触发颜色
+            },
+            name: { // 物理区段名称
+                z: 10,
+                position: -1, 								// 区段名称位置 1 上面 -1 下面 0 对称
+                distance: 11,								// 文字离区段距离
+                fontSize: 11, 								// 字体大小
+                fontWeight: 'normal',						// 字体粗细
+                fontColor: '#FFFFFF', 						// 字体颜色
+                textAlign: 'center', 						// 水平对齐方式
+                textPosition: 'inside', 					// 文字位置
+                textVerticalAlign: 'middle', 				// 文字垂直对齐方式
+                approachColor: '#0F0' 					 	// 接近区段文字颜色
+            },
+            logicText: { // 逻辑区段名称
+                z: 10,
+                position: -1, 								// 区段名称位置 1 上面 -1 下面 0 对称
+                distance: 11,								// 文字离区段距离
+                fontSize: 11, 								// 字体大小
+                fontWeight: 'normal',						// 字体粗细
+                fontColor: '#FFFFFF', 						// 字体颜色
+                textAlign: 'center', 						// 水平对齐方式
+                textPosition: 'inside', 					// 文字位置
+                textVerticalAlign: 'middle' 				// 文字垂直对齐方式
+            },
+            standTrackText: { // 站台轨名称
+                z: 10,
+                position: 1, 								// 区段名称位置 1 上面 -1 下面 0 对称
+                distance: 11,								// 文字离区段距离
+                fontSize: 11, 								// 字体大小
+                fontWeight: 'normal',						// 字体粗细
+                fontColor: '#FFFFFF', 						// 字体颜色
+                textAlign: 'center', 						// 水平对齐方式
+                textPosition: 'inside', 					// 文字位置
+                textVerticalAlign: 'middle' 				// 文字垂直对齐方式
+            },
+            reentryTrackText: { // 折返轨名称
+                z: 10,
+                position: 1, 								// 区段名称位置 1 上面 -1 下面 0 对称
+                distance: 11,								// 文字离区段距离
+                fontSize: 11, 								// 字体大小
+                fontWeight: 'normal',						// 字体粗细
+                fontColor: '#FFFFFF', 						// 字体颜色
+                textAlign: 'center', 						// 水平对齐方式
+                textPosition: 'inside', 					// 文字位置
+                textVerticalAlign: 'middle' 				// 文字垂直对齐方式
+            },
+            transferTrackText: { // 转换轨名称
+                z: 10,
+                position: 1, 								// 区段名称位置 1 上面 -1 下面 0 对称
+                distance: 11,								// 文字离区段距离
+                fontSize: 11, 								// 字体大小
+                fontWeight: 'normal',						// 字体粗细
+                fontColor: '#FFFFFF', 						// 字体颜色
+                textAlign: 'center', 						// 水平对齐方式
+                textPosition: 'inside', 					// 文字位置
+                textVerticalAlign: 'middle' 				// 文字垂直对齐方式
+            },
+            speedLimitName: {
+                z: 10,
+                limitValueDistance: 15,						// 限速值距离
+                kilometerFontSize: 0,						// 公里标大小
+                kilometerColor: '#000', 					// 公里标颜色
+                nameNumberFontSize: 11,						// 限速值大小
+                nameNumberColor: '#C0C000',					// 限速值颜色
+                nameBackground: 'rgba(0, 0, 0, 0)',					// 限速名称背景颜色
+                drogueWidth: 19,							// 浮标宽度
+                drogueHeight: 12							// 浮标高度
+            },
+            destinationText: { // 目的码名称
+                z: 10,
+                position: 1, 								// 区段名称位置 1 上面 -1 下面 0 对称
+                distance: 11,								// 文字离区段距离
+                fontSize: 11, 								// 字体大小
+                fontWeight: 'bold',							// 字体粗细
+                fontColor: 'yellow', 						// 字体颜色
+                textAlign: 'center', 						// 水平对齐方式
+                textPosition: 'inside', 					// 文字位置
+                textVerticalAlign: 'middle' 				// 文字垂直对齐方式
+            },
+            mouseOverStyle: {
+                borderColor: '#fff',
+                borderBackgroundColor: '#22DFDF',
+                textShadowColor: '#22DFDF',
+                nameShow: true,
+                lineDash: [3, 3],
+                lineWidthMore: 2.5
+            },
+            line: {
+                z: 0,
+                width: 5, 											// 区段宽度
+                beyondWidth: 0, 									// 区段宽超出宽度
+                invadeColor: '#EF0C08', 							// 区段侵入颜色
+                spareColor: '#808080', 								// 区段空闲颜色
+                communicationOccupiedColor: '#FF0000', 				// 区段通信车占用颜色
+                unCommunicationOccupiedColor: '#800080', 			// 区段非通讯车占用颜色
+                routeLockColor: '#FFFFFF', 							// 区段路由锁定颜色
+                faultLockColor: '#00FF00', 							// 区段故障锁定颜色
+                undefinedColor: '#0071C1', 							// 区段未定义颜色
+                protectionLockedColor: '#FEFF00', 					// 保护区段锁闭(未用)
+                blockColor: '#800080', 								// 区段封锁颜色
+                atcExcisionColor: '#A0522D', 						// 区段atc切除颜色
+                atsExcisionColor: '#A0522D', 						// 区段ats切除颜色
+                invalidColor: '#AC8F40', 						// 计轴故障颜色
+                timeReleaseColor: '#3F3F3F', 						// 区段延时释放颜色
+                protectiveLockColor: '#FFFF00', 					// 区段保护锁闭
+                protectiveTimeReleaseColor: '#0071C1', 				// 区段保护延时解锁
+                logicalColor: '#FFFF00', 							// 逻辑区段颜色 (未用)
+                logicalTextColor: '#C0C0C0' 						// 逻辑区段名称颜色 (未用)
+            },
+            speedLimit: { 											// 限速元素
+                z: 2,
+                width: 1, 											// 限速线的宽度
+                distance: 5, 										// 限速线距离区段距离
+                lineColor: '#FFFF00', 								// 限速线颜色
+                nameShow: false 									// 名称显示
+            },
+            separator: {
+                z: 3,												// 分割符层级
+                width: 1.5, 										// 分隔符宽度
+                endWidth: 1.5, 										// 尽头分隔符宽度
+                endColor: '#7F7F7F', 								// 尽头分隔符颜色
+                color: '#7F7F7F', 									// 区段边界符颜色
+                halfHeight: 5										// 区段分隔符高度的一半
+            },
+            trainPosition:{
+                display: false // 列车实时位置显示
+            }
+        };
+
+        this[deviceType.Signal] = {
+            distance: 0,											// 设备距离区段的距离
+            xColor: '#C0C0C0', // 信号灯x颜色
+            post: {
+                standardLength: 6, // 高柱长度
+                standardHeight: 6, // 灯柱高度
+                standardColor: '#969696',							// 灯灯柱颜色
+                standardWidth: 3									// 灯柱宽度
+            },
+            text: {
+                show: true,											// 信号机名称显示
+                distance: 3,										// 文字和灯杆的距离
+                isAlignCenter: false,								// 信号字体对其方式
+                fontSize: 11,										// 信号机名称字体大小
+                fontWeight: 'bold',									// 信号机名称字体粗细
+                defaultColor: '#C0C0C0',							// 信号灯字体默认色
+                blockColor: '#EF0C08',								// 信号灯字体锁定颜色
+                checkColor: '#00FF00'								// 信号字体
+            },
+            lamp: {
+                bgShow: false, // 是否被选中
+                guidName: 'defult',									// 默认引导类型
+                stopWidth: 1,										// 禁止线宽度
+                borderVariable: false,								// 信号灯边框可变
+                borderWidth: 1,										// 信号灯边框线宽度
+                borderColor: '#c0c0c0',								// 信号灯边框线颜色
+                radiusR: 5,											// 信号机宽度
+                blockColor: '#EF0C08',								// 信号灯锁闭
+                grayColor: '#7F7F7F',								// 信号灯灰色
+                redColor: '#FF0000',								// 信号灯红色
+                greenColor: '#00FF00',								// 信号灯绿色
+                yellowColor: '#FFFF00',								// 信号灯黄色
+                whiteColor: '#FFFFFF',								// 信号灯白色
+                blueColor: '#0070C0'								// 信号灯蓝色
+            },
+            route: {
+                direction: false,									// 自动进路方向
+                offset: { x: 1, y: -2 },							// 自动进路偏移量
+                routeColor: '#00FF00',								// 自动进路
+                radiusR: 6
+            },
+            auto: {
+                signalFrontTriangle: true,							// 信号灯前三角展示
+                direction: true,									// 自动通过方向
+                offset: { x: -4, y: 0 },							// 自动通过偏移量
+                width: 5,											// 自动宽度
+                autoRoute: '#00FF00',								// 自动进路
+                autoTrigger: '#FFFF00',								// 自动触发
+                manualControl: '#FFFF00',							// 人工控制
+                outConflict: '#C00808'								// 出车冲突
+            },
+            delay: {
+                direction: false,									// 延时解锁方向
+                offset: { x: 0, y: -5 },								// 延时解锁偏移量
+                fontSize: 9,										// 延迟解锁字体大小
+                fontColor: '#FF0000',								// 延迟解锁颜色
+                fontWeight: 'bold'									// 字体粗细
+            },
+            button: {
+                distance: 5,										// 信号灯按钮距离区段的距离
+                borderDashColor: '#FFFFFF',							// 信号灯按钮边线
+                buttonColor: 'darkgreen',							// 信号灯按钮颜色
+                buttonLightenColor: '#E4EF50'						// 信号灯按钮闪烁颜色
+            },
+            mouseOverStyle: {
+                borderLineColor: '#FFFFFF',
+                borderLineDash: [3, 3],
+                nameBackgroundColor: '#22DFDF',
+                lampBorderLineColor: '#22DFDF'
+            },
+            lowButton:{
+                display: true, // 现地 信号机按钮
+                strokeColor:'#ffffff',
+                fillColor:'#025e01',
+                fillActiveColor:'#ffff00'
+            }
+        };
+
+        this[deviceType.StationTurnBack] = {					// 站后折返
+            displayCondition: '01', // 显示条件 （01所有模式下显示 02 行调显示 03现地显示）
+            lamp: {
+                fill: '#f1f1f1', // 填充色
+                radiusR: 7									// 控制灯大小
+            },
+            text: {
+                titleTextShow: true,
+                fontWeight: 580,
+                fontSize: 10,
+                distance: 10
+            },
+            rect: {
+                fill: 'rgba(0,0,0,0)',
+                stroke: '#fff',
+                lineWidth: 0,
+                padding: 6
+            }
+        };
+
+        this[deviceType.AutoTurnBack] = {
+            // 是否显示
+            visibleConditions: '03',
+            text: {
+                fontSize: 11,								// 字体大小
+                fontWeight: 'normal',						// 字体粗细
+                distance: 5 								// 灯跟文字距离
+            },
+            subtitleText: {
+                fontSize: 11,								// 字体大小
+                fontWeight: 'normal',						// 字体粗细
+                distance: 17 // 等于副标题距离
+            },
+            lamp: {
+                lineDash: null, // 灯的包围框
+                borderShow: false, // 是否显示边框
+                stroke: '#FFFFFF', // 框的颜色
+                fill: 'rgba(0,0,0,0)', // 填充色
+                radiusR: 6,									// 控制灯大小
+                controlColor: '#b5b3b3',					// 控制灯颜色 (灰色)
+                lightUpColor: '#ffff00'						// 点亮灯颜色
+            },
+            OutFrame: {
+
+            }
+        };
+
+        /** 引导总锁 */
+        this[deviceType.GuideLock] = {
+            // 是否显示
+            displayCondition: '03', // 显示条件 prdType
+            text: {
+                fontSize: 11,								// 字体大小
+                fontWeight: 'normal',						// 字体粗细
+                distance: 5 								// 灯跟文字距离
+            },
+            lamp: {
+                fill: 'rgba(0,0,0,0)', // 填充色
+                radiusR: 6,									// 控制灯大小
+                controlColor: '#b5b3b3',					// 控制灯颜色 (灰色)
+                lightUpColor: '#FF0000'						// 点亮灯颜色
+            }
+        };
+
+        // 供电线路
+        this[deviceType.Power] = {
+            lineColor: '#FFFFFF',								// 线条颜色
+            strokeColor: 'red',								// 线条颜色
+            extendLength: 10									// 延伸长度
+        };
+
+        // 延续保护计时
+        this[deviceType.OverAp] = {
+            show: true,
+            textColor: '#FF0',
+            textPadding: [1, 3],
+            textBorderColor: '#FF0',
+            textBorderWidth: 1
+        };
+
+        // 屏蔽门
+        this[deviceType.Psd] = {
+            // 北京线屏蔽门
+            elemnetType:['safetyDoorNormal'],
+            safetyDoorNormal: { 											// 屏蔽门
+                z:0,
+                height: 1.6, 										// 站台屏蔽门高度
+                distance: 9, 										// 站台和屏蔽门之间的距离
+                defaultColor: '#00FF00',							// 屏蔽门默认颜色
+                splitDoorColor: '#F61107' 							// 屏蔽门切除颜色
+            }
+        };
+
+        // 站台
+        this[deviceType.StationStand] = {
+            // 北京线站台元素 站台 站台紧急关闭 扣车元素 停站时间 运行等级
+            elemnetType:['solidStand', 'emergentRhombus', 'detainNormal', 'stopTime', 'level', 'jump'],
+            // 站台
+            solidStand:{
+                // 层级
+                z:0,
+                spareColor: '#FFF', 								// 站台空闲颜色
+                jumpStopColor: '#AB82FF', 						// 站台跳停颜色
+                designatedJumpStopColor: '#AB82FF', 			// 站台指定列车跳停颜色
+                headFontSize: 8, 									// 站台首端字体大小
+                stopColor: '#FEFE00'								// 站台列车停站颜色
+            },
+            // 站台紧急关闭
+            emergentRhombus:{
+                z:1,
+                mergentR: 4,										// 站台紧急关闭半径
+                mergentN: 4, 										// 站台紧急关闭边数
+                insideOffset: { x: 0, y: -40 }, 					// 内站台紧急关闭偏移量
+                outsideOffset: { x: 0, y: 20 }, 					// 外站台紧急关闭偏移量
+                closeColor: '#F61107' 								// 站台紧急关闭颜色
+            },
+            // 扣车元素 普通扣车
+            detainNormal:{
+                z:0,
+                position: -1,										// 扣车标识在站台上显示方向
+                text: 'H', 											// 扣车显示内容
+                offset: { x: -8, y: 13 }, 							// 扣车偏移量
+                centerTrainColor: '#00FF00', 						// 中心扣车颜色
+                andCenterTrainColor: '#00FF00', 					// 车站+中心扣车颜色
+                detainTrainTextColor: '#00FF00', 					// 车站扣车文字颜色
+                fontSize: 25,								// 字体大小
+                fontWeight: 'normal'
+            },
+            // 停站时间
+            stopTime:{
+                z:1,
+                textFontSize: 8, 									// 停站时间字体大小
+                textColor: '#FFFFFF', 								// 停站时间字体颜色
+                position: 1, 										// 停站时间方向
+                offset: { x: -8, y: 25 } 							// 停站时间偏移量
+            },
+            jump: {
+                z:1,
+                position: 1,								// 停跳方向
+                text: 'S',									// 停跳显示内容
+                offset: {x: -8, y: -8},
+                textColor: '#FA80F5',						// 停跳文字颜色
+                arcColor: '#000000',						// 停跳圆圈颜色
+                fillColor: 'rgba(0,0,0,0)',					// 透明填充颜色
+                fontWeight: 'normal',						// 文字居中
+                fontSize: 25								// 文字大小
+            },
+            // 运行等级
+            level:{
+                z:1,
+                textFontSize: 8, // 运行等级字体大小
+                position: 1, 										// 运行等级方向
+                offset: { x: -8, y: 10 }, 							// 运行等级偏移量
+                textColor: '#FFFFFF' 								// 停站等级字体颜色
+            },
+            // 鼠标事件样式
+            mouseOverStyle: {
+                borderLineColor: '#FFFFFF',
+                borderLineDash: [3, 3]
+            },
+            // reentry: {}, 											// 站台折返策略
+            common: { 												// 通用属性
+                textFontSize: 8, 									// 站台默认字体大小
+                functionButtonShow: '03'							// 功能灯按钮显示条件（01所有模式下显示 02 行调显示 03现地显示）
+            },
+            lamp: {
+                radiusR: 6,									// 控制灯大小
+                lampColor: '#5A5D5A' // 功能按钮颜色
+            },
+            text: {
+                fontSize: 11,								// 字体大小
+                fontWeight: 'normal',						// 字体粗细
+                distance: 5 								// 灯跟文字距离
+            }
+            // trainStop: {}, 											// 停车标志
+            // trainDepart: {}, 										// 停车计时
+
+        };
+
+        this[deviceType.StationCounter] = {
+            text: {
+                distance: 2,							 			// 计数器名称和文字的距离
+                fontColor: '#FFFFFF',		 			 			// 计数器字体颜色
+                borderColor: '#E4EF50'	 				 			// 计数器边框颜色
+            }
+        };
+
+        this[deviceType.StationDelayUnlock] = {
+            text: {
+                distance: 3,										// 延迟解锁和设备之间的距离
+                fontColor: '#FFFFFF',								// 延时解锁字体颜色
+                borderColor: '#FFFFFF'								// 延迟解锁边框颜色
+            }
+        };
+
+        this[deviceType.Station] = {
+            // text: {
+            // 	show: true											// 公里标名称显示
+            // },
+            kmPostShow: true,										// 公里标显示
+            kilometerPosition: 'down', 							 	// 公里标位置
+            fontWeight: 'bold',										// 文字错细
+            text: {
+                fontSize: 11,								// 字体大小
+                fontWeight: 'normal',						// 字体粗细
+                distance: 5 								// 灯跟文字距离
+            },
+            lamp: {
+                radiusR: 6,									// 控制灯大小
+                controlColor: '#FFFF00'						// 控制灯颜色
+            },
+            turnBack: { // 按图折返
+                lamp: 1, // 灯数量
+                lampSpace: 60 // 灯间距
+            },
+            StationControl: {
+                text: {
+                    distance: 2,										// 灯和文字之间的距离
+                    fontSize: 10,										// 控制模式字体大小
+                    fontFormat: 'consolas',								// 控制模式字体格式
+                    fontColor: '#ffffff',								// 控制模式字体颜色
+                    fontWeight: 'normal',								// 控制模式字体粗细
+                    textAlign: 'middle',								// 控制模式水平对齐
+                    textVerticalAlign: 'top'							// 控制模式垂直对齐
+                },
+                lamp: {
+                    count: 3,											// 控制模式灯个数
+                    offset: { x: 0, y: 0 },								// 偏移量
+                    radiusR: 6,											// 控制模式灯的半径
+                    distance: 46,										// 控制模式之间灯之间的距离
+                    grayColor: '#7F7F7F',								// 控制模式灰色
+                    greenColor: '#00FF00',								// 控制模式绿色
+                    redColor: '#FF0000',								// 控制模式红色
+                    yellowColor: '#FFFF00',								// 控制模式黄色
+                    textColorNoChange: true								// 控制灯颜色不随控制灯改变
+                },
+                emergencyControl: {									// 紧急站控
+                    show: true,
+                    offset: { x: 92, y: 0 },
+                    text: '紧急站控',
+                    arrowShow: false,
+                    grayColor: '#7F7F7F'
+                },
+                centerControl: {									// 中控
+                    show: true,
+                    offset: { x: -46, y: 0 },
+                    text: '遥控',
+                    buttonShow: false,
+                    arrowShow: false,
+                    grayColor: '#7F7F7F'
+                },
+                substationControl: {								// 站控按钮
+                    show: true,
+                    offset: { x: -46, y: 0 },
+                    text: '站控',
+                    arrowShow: false,
+                    grayColor: '#7F7F7F'
+                },
+                interconnectedControl: {							// 联锁控
+                    show: false,
+                    offset: { x: 0, y: 0 },
+                    text: '联锁控',
+                    arrowShow: false,
+                    grayColor: '#7F7F7F'
+                },
+                mouseOverStyle: {										// 鼠标悬浮样式
+                    fontSize: 10,
+                    fontFormat: 'consolas',
+                    fontColor: '#FFF000',
+                    fontWeight: 'normal',
+                    textAlign: 'middle',
+                    textVerticalAlign: 'top'
+                }
+            }
+        };
+
+        this[deviceType.Switch] = {
+            text: {
+                show: true,											// 道岔名称显示
+                position: 0, 									// 区段名称位置 1 上面 -1 下面 0 对称
+                offset: { x: 5, y: -10 },							// 道岔名称与区段距离
+                fontSize: 11,									// 字体大小
+                fontColor: '#C0C0C0',							// 道岔名称颜色
+                fontWeight: 'normal',							// 字体粗细
+                borderColor: '#FE0000',							// 道岔边框颜色
+                lossColor: '#FE0000',							// 道岔失去颜色
+                locateColor: '#00FF00',							// 道岔定位颜色
+                inversionColor: '#FFFF00',						// 道岔反位颜色
+                monolockLocationColor: '#c00000',				// 道岔单锁'定位'颜色 (红色)
+                monolockInversionColor: '#c00000',				// 道岔单锁'反位'颜色 (红色)
+                block: true,									// 封锁名称
+                faultFlashing: true							// 故障闪烁
+            },
+            sectionAction: {
+                flag: false, // 道岔 关联区段显示
+                spareColor: '#5b5b5b' // 区段显示颜色
+            },
+            core: {
+                length: 6,										// 道岔单边长度
+                graphShow: true // 图形显示
+            },
+            jointImg: {										// 道岔 A B C D四元素属性配置
+                trapezoidLength: 8,							// 直角梯形元素默认长度
+                fork: true,									// 挤岔专用（如有挤岔操作 变为true）
+                faultStatus: true,							// 挤岔表示
+                forKColor: 'red'							// 挤岔颜色 配合挤岔专用
+            },
+            arcBlcok: {										// 圆形封锁图形
+                show: true,								// 显示
+                shapeR: 15,
+                arcBorderColor: 'green',					// 默认边框颜色
+                locationColor: 'green',						// 定位封锁颜色
+                inversionColor: '#FFFF00'					// 反位封锁颜色
+            },
+            rectLock: {										// 矩形封锁框图形
+                rectWidth: 22, 								// 矩形框 宽高
+                rectBorderColor: '#fff',					// 矩形边框颜色
+                monolock: false, 							// 单锁显示
+                block: false								// 封锁显示
+            }
+        };
+
+        this[deviceType.LcControl] = {
+            text: {
+                fontSize: 10,										// 灯字体大小
+                fontWeight: 'normal',								// 字体粗细
+                distance: 5 										// 灯跟文字距离
+            },
+            lamp: {
+                radiusR: 6,											// 灯大小
+                controlColor: '#FFFF00'								// 灯颜色
+            },
+            mouseOverStyle: {
+                fontSize: 10,
+                fontFormat: 'consolas',
+                fontColor: '#FFF000',
+                fontWeight: 'normal',
+                textAlign: 'middle',
+                textVerticalAlign: 'top',
+                arcColor: '#00FFFF',
+                textColor: '#000000'
+            }
+        };
+        this[deviceType.ZcControl] = {
+            // 是否显示
+            visible: true,
+            text: {
+                fontSize: 10,										// 字体大小
+                fontWeight: 'normal',								// 字体粗细
+                distance: 5 										// 灯跟文字距离
+            },
+            lamp: {
+                radiusR: 6,											// 灯大小
+                controlColor: '#00FF00',								// 灯颜色
+                activeColor:'#ff0000' // 控制灯激活颜色
+            },
+            mouseOverStyle: {
+                fontSize: 10,
+                fontFormat: 'consolas',
+                fontColor: '#FFF000',
+                fontWeight: 'normal',
+                textAlign: 'middle',
+                textVerticalAlign: 'top',
+                arcColor: '#00FFFF',
+                textColor: '#000000'
+            }
+        };
+
+        this[deviceType.LimitControl] = {
+            text: {
+                fontSize: 10,										// 字体大小
+                fontWeight: 'normal',								// 字体粗细
+                distance: 5 										// 灯跟文字距离
+            },
+            lamp: {
+                radiusR: 6,											// 灯大小
+                controlColor: '#ECE9D8'								// 灯颜色
+            },
+            mouseOverStyle: {
+                fontSize: 10,
+                fontFormat: 'consolas',
+                fontColor: '#FFF000',
+                fontWeight: 'normal',
+                textAlign: 'middle',
+                textVerticalAlign: 'top',
+                textColor: '#000000',
+                arcColor: '#00FFFF'
+            }
+        };
+
+        this[deviceType.Line] = {
+            lineColor: '#FFFFFF'									// 线条颜色
+        };
+        this[deviceType.AutomaticRoute] = {
+            // 是否显示
+            displayCondition: '03', // 显示条件 prdType
+            text: {
+                fontSize: 11,								// 字体大小
+                fontWeight: 'normal',						// 字体粗细
+                distance: 5 								// 灯跟文字距离
+            },
+            lamp: {
+                fill: 'rgba(0,0,0,0)', // 填充色
+                radiusR: 6,									// 控制灯大小
+                controlColor: '#b5b3b3'						// 控制灯颜色 (灰色)
+            }
+        };
+        this[deviceType.TrainWindow] = {
+            lineColor: '#FFF',										// 车次窗颜色
+            lineDash: [3, 3],										// 车次窗虚线间隔
+            lineWidth: 1,											// 车次窗线宽
+            trainWindowSmooth: 0.01,									// 车次窗矩形圆滑程度
+            show: true											// 车次窗是否显示
+        };
+        this[deviceType.SplitStation] = {
+            lineLength: 15,	// 箭头线长度
+            lineWidth: 2, // 线宽
+            height: 35, // 分隔整体高度
+            strokeColor: '#00FF00', // 线颜色
+            triangleFillColor: '#00FF00', // 三角填充颜色
+            textFill: '#FFFFFF', // 文字颜色
+            verticalDistance: 10, // 箭头三角垂直高度
+            horizontalDistance: 7// 箭头三角水平高度
+        };
+        this[deviceType.Train] = {
+            trainBody: {
+                fontFamily: 'consolas',
+                trainBodyLineWidth: 1, // 车身line宽
+                changeTrainWidth: false, // 是否根据车身上车组号、服务号、车次号、目的地码显示情况改变列车长度
+                specialTrainType: [
+                    {
+                        type: '03',
+                        serviceNumber: 'M0',
+                        nameFormat: 'serviceNumber:groupNumber'
+                    },
+                    {
+                        type: '02',
+                        nameFormat: 'targetCode:groupNumber'
+                    }
+                ], // 特殊列车类型需设置显示格式
+                lrPadding: 4, // 两边间隔
+                upPadding: 4, // 上边距离
+                trainBodyFillColor: 'rgba(0,0,0,0)', // 列车车身填充颜色
+                trainNameFormat: 'serviceNumber:tripNumber', // 列车显示格式
+                trainSidelineColor:'#A5A5A5' // 列车边框颜色
+            },
+            soonerOrLater: {
+                level: 6,
+                // serviceNumber: true,
+                smallLateColor:'#FFFF00',
+                bigEarlyColor:'#00C900',
+                bigLateColor:'#FF0000',
+                normalColor: '#A5A5A5'
+            },
+            directionArrow: {
+            },
+            hsda: {
+                lrPaddingHSDA: 3, // HSDA两边间隔
+                upPaddingHSDA: 4, // HSDA上边距离
+                trainHSDATextFontSize: 9, // 列车HDSA字号
+                textHContent: 'H', // textH文本
+                textSContent: 'S', // textS文本
+                textDContent: 'D', // textD文本
+                textAContent: 'A'// textA文本
+            },
+            trainNumber: {
+                targetCodePrefix: '000', // 目的地码前缀
+                trainNumberOffset: { x: 0, y: 1 }// 目的地码偏移量
+            },
+            trainServer: {
+                serviceNumberPrefix: '00', // 服务号(表号)前缀
+                defaultServiceNumber: 'AA', // 默认服务号（表号）
+                defaultServiceHeadNum: 'MM', // 人工车号
+                trainServerOffset: { x: 4, y: 4 }// 列车服务号偏移
+            },
+            trainTarget: {
+                tripNumberPrefix: '0000', // 车次号前缀
+                defaultTripNumber: 'BBBB', // 默认车次号2
+                trainTargetOffset: { x: 36, y: 4 }, // 列车车次号偏移
+                trainTargetTextAlign: 'left'// 车次号文字显示位置
+            },
+            trainTargetNumber: {
+                groupNumberPrefix: '000', // 车组号前缀
+                defaultGroupNumber: 'EEE', // 默认车组号
+                trainTargetNumberOffset: { x: -4, y: 4 }// 车组号偏移量
+            },
+            trainHead: {
+                trainHeadRectHeight: 20, // 列车车头矩形高度
+                trainConntWidth: 3, // 列车竖杠的宽度
+                trainHeadFillColor: '#000000', // 列车车头矩形填充颜色
+                directionStopType:'normal', // special 西安二号线 停车 列车方向图标不消失  normal 正常
+                trainHeadHeight: 'trainBox', // 列车车头高度取决于trainBox高度
+                trainHeadArrowWidth: 6, // 列车车头三角宽度
+                trainHeadArrowOffsetX: 7 // 列车车头三角偏移
+            },
+            common: {
+                trainHeight: 20, // 列车高度
+                trainHeadDistance: 4, // 列车和车头之间的间距
+                trainWidth: 48, // 列车长度
+                trainTextFontSize: 12, // 列车字号
+                fontFamily: 'consolas', // 默认字体 族类
+                haveTextHSDA: true, // 是否需创建textHSDA对象
+                haveArrowText: true, // 是否需创建arrowText对象
+                textOffset: 4, // 字体偏移（用以控制字体据车头的距离）
+                trainWidthMoreText: 8, // 计算列车长度时--列车长比text多出尺寸
+                displayPosition: 'margin', // 非同通信车在物理区段（有逻辑区段）上显示的位置 margin:行驶方向边缘车次窗 center: 中间位置车次窗
+                trainTip:true // 鼠标悬停列车状态信息框是否显示
+            },
+            trainStatusStyle: {
+                destinationStatus: [
+                    { status: '01', showColor: '#FFFFFF' },
+                    { status: '02', showColor: '#00FF00' },
+                    { status: '03', showColor: '#A0522D' },
+                    { status: '04', showColor: '#FFFF00' }
+                ], // 目的地状态 01准点 02早点 03晚点 04头码车
+                defaultDestinationColor: '#FFFFFF', // 默认目的地状态显示颜色
+                destinationStatusSetText: 'trainTarget', // 目的地状态设置的对应哪个text的颜色
+                directionType: [
+                    {
+                        type: 1,
+                        lineLShow: false,
+                        lineRShow: true,
+                        arrowLShow: false,
+                        arrowRShow: true
+                    },
+                    {
+                        type: 0,
+                        lineLShow: true,
+                        lineRShow: false,
+                        arrowLShow: true,
+                        arrowRShow: false
+                    }
+                ], // 列车运行方向状态类型对应车头显示状态 1从左往右  0从右往左
+                directionStopType: [
+                    { type: 1, lineLShow: false, lineRShow: true },
+                    { type: 0, lineLShow: true, lineRShow: false }
+                ], // 列车停止方向类型对应车头显示状态   1从左往右 0从右往左
+                driveModeStatus: [
+                    {
+                        status: 'AM',
+                        trainLColor: '#00FF00',
+                        trainRColor: '#00FF00'
+                    },
+                    {
+                        status: 'CM',
+                        trainLColor: '#FFFF00',
+                        trainRColor: '#FFFF00'
+                    },
+                    {
+                        status: 'RM',
+                        trainLColor: '#A0522D',
+                        trainRColor: '#A0522D'
+                    },
+                    {
+                        status: 'NRM',
+                        trainLColor: '#A0522D',
+                        trainRColor: '#A0522D'
+                    }
+                ], // 列车运行模式对应车头颜色 ATO自动驾驶模式AM ATP监控下的人工驾驶模式CM 限制人工驾驶模式RM 非限制人工驾驶模式NRM
+                communicationStatus: [
+                    {status: 'CBTC', trainColor: '#725A64'},
+                    {status: 'ITC', trainColor: '#C0C0C0'},
+                    {status: 'IL', trainColor: '#C0C0C0'}
+                ], // 设置通信状态  cbtc级别CBTC  点式通信ITC 联锁级IL
+                serverNoType: [
+                    { type: '01', showColor: '#FFFFFF' },
+                    { type: '02', showColor: '#FFF000' }
+                ], // 服务号状态类型 01显示服务号 计划车 02显示车组号: 头码车与人工车
+                defaultServerNoColor: '#FFFFFF' // 默认服务号状态显示颜色
+            }
+        };
+        this[deviceType.FloodGate] = {};
+        this[deviceType.DirectionRod] = {};
+    }
+}
+
+export default new SkinCode();
diff --git a/src/jmapNew/config/skinCode/xian_01.js b/src/jmapNew/config/skinCode/xian_01.js
index 84323ae0c..0cebb94a4 100644
--- a/src/jmapNew/config/skinCode/xian_01.js
+++ b/src/jmapNew/config/skinCode/xian_01.js
@@ -19,7 +19,8 @@ class SkinCode extends defaultStyle {
                 fontColor: '#FFFFFF', 						// 字体颜色
                 textAlign: 'center', 						// 水平对齐方式
                 textPosition: 'inside', 					// 文字位置
-                textVerticalAlign: 'middle' 				// 文字垂直对齐方式
+                textVerticalAlign: 'middle', 				// 文字垂直对齐方式
+                approachColor: '#FFFFFF'
             },
             logicText: {
                 z: 10,
diff --git a/src/jmapNew/config/skinCode/xian_02.js b/src/jmapNew/config/skinCode/xian_02.js
index 0dad06395..56be9107e 100644
--- a/src/jmapNew/config/skinCode/xian_02.js
+++ b/src/jmapNew/config/skinCode/xian_02.js
@@ -19,7 +19,8 @@ class SkinCode extends defaultStyle {
                 fontColor: '#FFFFFF', 					// 字体颜色
                 textAlign: 'center', 						// 水平对齐方式
                 textPosition: 'inside', 					// 文字位置
-                textVerticalAlign: 'middle' 				// 文字垂直对齐方式
+                textVerticalAlign: 'middle', 				// 文字垂直对齐方式
+                approachColor: '#FFFFFF'
             },
             logicText: {									// 逻辑区段名称
                 z: 10,
diff --git a/src/jmapNew/map.js b/src/jmapNew/map.js
index 125263262..1fe49d8ea 100644
--- a/src/jmapNew/map.js
+++ b/src/jmapNew/map.js
@@ -248,15 +248,6 @@ class Jlmap {
         (list || []).forEach(elem => {
             const code = elem.code;
             const type = elem._type;
-            if (type == 'OverAp') {
-                const overlapRoute = store.state.map.overlapData[code];
-                const model = this.mapDevice[overlapRoute.pathList[0].sectionList[0]];
-                if (overlapRoute.pathList[0].right) {
-                    elem['points'] = { x: model.points[0].x, y: model.points[0].y };
-                } else {
-                    elem['points'] = { x: model.points[model.points.length - 1].x, y: model.points[model.points.length - 1].y };
-                }
-            }
             // const oDevice = this.mapDevice[code] || deviceFactory(type, elem, this.showConfig);
             const oDevice = deviceFactory(type, elem, this.showConfig);
             // const nDevice = deepAssign(oDevice || {}, elem);
@@ -347,7 +338,7 @@ class Jlmap {
         });
     }
     setUpdateMapDevice(list) {
-        store.dispatch('map/updateMapDevice', list);
+        store.commit('map/updateMapDevice', list);
         (list || []).forEach(elem => {
             const code = elem.code;
             const type = elem._type;
@@ -492,8 +483,7 @@ class Jlmap {
             } else {
                 if (elem.deviceType === 'TRAIN') {
                     this.isUpdateShowTrainList = true;
-                    store.dispatch('map/updateActiveTrainList', elem);
-                    // store.dispatch('map/updateTrainState', elem);
+                    store.commit('map/updateActiveTrainList', elem);
                 } else if (elem.deviceType === 'STAND') {
                     store.dispatch('map/updateStationStand', elem);
                     const psdDevice = this.mapDevice[this.mapDevice[elem.code].psdCode];
@@ -514,9 +504,7 @@ class Jlmap {
                 if (elem.dispose) {
                     this.$painter.delete(oDevice);
                 } else {
-                    // if (this.hookHandle(oDevice, elem)) {
                     this.$painter.update(oDevice);
-                    // }
                 }
             }
         });
diff --git a/src/jmapNew/mouseController.js b/src/jmapNew/mouseController.js
index 4b7918e82..7ef0a8514 100644
--- a/src/jmapNew/mouseController.js
+++ b/src/jmapNew/mouseController.js
@@ -85,8 +85,8 @@ class MouseController extends Eventful {
     mousedown(e) {
         // if (eventTool.notLeftMouse(e)) {
         //     return;
-		// }
-		this.$zr.dom.focus();
+        // }
+        this.$zr.dom.focus();
         if (e.which == 1 || e.which == 3) {
             var x = e.offsetX;
             var y = e.offsetY;
@@ -287,7 +287,7 @@ class MouseController extends Eventful {
             }
         });
         this.deviceList = includeDeviceList;
-        store.dispatch('map/setSeclectDeviceList', this.deviceList); // 给store设置框选的 model
+        store.commit('map/setSeclectDeviceList', this.deviceList); // 给store设置框选的 model
     }
     // 生成包围盒对象坐标
     createFakeBoundingRect(instance) {
diff --git a/src/jmapNew/shape/AutomacticRoute/index.js b/src/jmapNew/shape/AutomacticRoute/index.js
index 6463e7ae4..eac3df196 100644
--- a/src/jmapNew/shape/AutomacticRoute/index.js
+++ b/src/jmapNew/shape/AutomacticRoute/index.js
@@ -18,7 +18,7 @@ export default class AutomacticRoute extends Group {
         this.model = model;
         this.style = style;
         this.isShowShape = true;
-        if (isShowThePrdType(model.prdType, style.AutomaticRoute.displayCondition) || model.previewOrMapDraw) {
+        if (isShowThePrdType(model.prdType, (style.AutomaticRoute || {}).displayCondition) || model.previewOrMapDraw) {
             this.create();
             this.createMouseEvent();
             this.setState(model);
@@ -134,7 +134,7 @@ export default class AutomacticRoute extends Group {
 
     setShowMode() {
         const showMode = this.model.showMode;
-        const showConditions = this.style.AutomaticRoute.displayCondition;
+        const showConditions = (this.style.AutomaticRoute || {}).displayCondition;
         if (!showConditions || showConditions === '01' || showMode === showConditions) {
             this.showMode();
         } else {
diff --git a/src/jmapNew/shape/AxleReset/index.js b/src/jmapNew/shape/AxleReset/index.js
index 2b7ba7688..e4ae37973 100644
--- a/src/jmapNew/shape/AxleReset/index.js
+++ b/src/jmapNew/shape/AxleReset/index.js
@@ -18,7 +18,7 @@ export default class AxleReset extends Group {
         this.model = model;
         this.style = style;
         this.isShowShape = true;
-        if (isShowThePrdType(model.prdType, style.AxleReset.displayCondition) || model.previewOrMapDraw) {
+        if (isShowThePrdType(model.prdType, (style.AxleReset || {}).displayCondition) || model.previewOrMapDraw) {
             this.create();
             this.createMouseEvent();
             this.setState(model);
@@ -129,7 +129,7 @@ export default class AxleReset extends Group {
     }
     setShowMode() {
         const showMode = this.model.showMode;
-        const showConditions = this.style.AxleReset.displayCondition;
+        const showConditions = (this.style.AxleReset || {}).displayCondition;
         if (!showConditions || showConditions === '01' || showMode === showConditions) {
             this.showMode();
         } else {
diff --git a/src/jmapNew/shape/DirectionRod/index.js b/src/jmapNew/shape/DirectionRod/index.js
index 25fb310c1..63518ce31 100644
--- a/src/jmapNew/shape/DirectionRod/index.js
+++ b/src/jmapNew/shape/DirectionRod/index.js
@@ -13,7 +13,7 @@ export default class DirectionRod extends Group {
         this.model = model;
         this.style = style;
         this.isShowShape = true;
-        if (isShowThePrdType(model.prdType, style.DirectionRod.displayCondition) || model.previewOrMapDraw) {
+        if (isShowThePrdType(model.prdType, (style.DirectionRod || {}).displayCondition) || model.previewOrMapDraw) {
             this.create();
             this.createMouseEvent();
             this.setState(model);
@@ -91,7 +91,7 @@ export default class DirectionRod extends Group {
 
     setShowMode() {
         const showMode = this.model.showMode;
-        const showConditions = this.style.DirectionRod.displayCondition;
+        const showConditions = (this.style.DirectionRod || {}).displayCondition;
         if (!showConditions || showConditions === '01' || showMode === showConditions) {
             this.showMode();
         } else {
diff --git a/src/jmapNew/shape/FloodGate/index.js b/src/jmapNew/shape/FloodGate/index.js
index 9457a382d..8aec39cb2 100644
--- a/src/jmapNew/shape/FloodGate/index.js
+++ b/src/jmapNew/shape/FloodGate/index.js
@@ -16,7 +16,7 @@ export default class FloodGate extends Group {
         this.model = model;
         this.style = style;
         this.isShowShape = true;
-        if (isShowThePrdType(model.prdType, style.FloodGate.displayCondition) || model.previewOrMapDraw) {
+        if (isShowThePrdType(model.prdType, (style.FloodGate || {}).displayCondition) || model.previewOrMapDraw) {
             this.create();
             this.createMouseEvent();
             this.setState(model);
@@ -58,7 +58,7 @@ export default class FloodGate extends Group {
 
     setShowMode() {
         const showMode = this.model.showMode;
-        const showConditions = this.style.FloodGate.displayCondition;
+        const showConditions = (this.style.FloodGate || {}).displayCondition;
         if (!showConditions || showConditions === '01' || showMode === showConditions) {
             this.showMode();
         } else {
diff --git a/src/jmapNew/shape/GuideLock/index.js b/src/jmapNew/shape/GuideLock/index.js
index b95937551..0f7e0dcf7 100644
--- a/src/jmapNew/shape/GuideLock/index.js
+++ b/src/jmapNew/shape/GuideLock/index.js
@@ -18,7 +18,7 @@ export default class GuideLock extends Group {
         this.model = model;
         this.style = style;
         this.isShowShape = true;
-        if (isShowThePrdType(model.prdType, style.GuideLock.displayCondition) || model.previewOrMapDraw) {
+        if (isShowThePrdType(model.prdType, (style.GuideLock || {}).displayCondition) || model.previewOrMapDraw) {
             this.create();
             this.createMouseEvent();
             this.setState(model);
@@ -134,7 +134,7 @@ export default class GuideLock extends Group {
     }
     setShowMode() {
         const showMode = this.model.showMode;
-        const showConditions = this.style.GuideLock.displayCondition;
+        const showConditions = (this.style.GuideLock || {}).displayCondition;
         if (!showConditions || showConditions === '01' || showMode === showConditions) {
             this.showMode();
         } else {
diff --git a/src/jmapNew/shape/OverAp/index.js b/src/jmapNew/shape/OverAp/index.js
index 317ef97fa..af29915e6 100644
--- a/src/jmapNew/shape/OverAp/index.js
+++ b/src/jmapNew/shape/OverAp/index.js
@@ -33,9 +33,12 @@ export default class OverAp extends Group {
                 textPosition: style.Section.name.textPosition,
                 fontSize: 12,
                 fontFamily: style.fontFamily,
-                textFill: '#FFF',
+                textFill: style.OverAp.textColor,
                 textAlign: 'center',
-                textVerticalAlign: 'middle'
+                textVerticalAlign: 'middle',
+                textPadding: style.OverAp.textPadding,
+                textBorderColor: style.OverAp.textBorderColor,
+                textBorderWidth: style.OverAp.textBorderWidth
             });
             this.add(this.text);
         }
diff --git a/src/jmapNew/shape/Power/index.js b/src/jmapNew/shape/Power/index.js
index 89b0af2eb..bf4b0114e 100644
--- a/src/jmapNew/shape/Power/index.js
+++ b/src/jmapNew/shape/Power/index.js
@@ -85,6 +85,20 @@ export default class Line2 extends Group {
         }
     }
 
+    getBoundingRect() {
+        const rect = this.line.getBoundingRect().clone();
+        if (this.model.leftTerminal) {
+            const subheadText = this.leftTerminal.getBoundingRect().clone();
+            rect.union(subheadText);
+            return rect;
+        }
+        if (this.model.rightTerminal) {
+            const subheadText = this.rightTerminal.getBoundingRect().clone();
+            rect.union(subheadText);
+        }
+        return rect;
+    }
+
     setLineType(type) {
         switch (type) {
         case '01': break;
diff --git a/src/jmapNew/shape/SaidLamp/index.js b/src/jmapNew/shape/SaidLamp/index.js
index 82e818890..a395e12e3 100644
--- a/src/jmapNew/shape/SaidLamp/index.js
+++ b/src/jmapNew/shape/SaidLamp/index.js
@@ -23,7 +23,7 @@ export default class SaidLamp extends Group {
         this.deviceStyle = style[model._type];
         if (this.deviceStyle) {
             this.isShowShape = true;
-            if (isShowThePrdType(model.prdType, this.deviceStyle.displayCondition) || model.previewOrMapDraw) {
+            if (isShowThePrdType(model.prdType, (this.deviceStyle || {}).displayCondition) || model.previewOrMapDraw) {
                 this.create();
                 this.createMouseEvent();
                 this.setState(model);
@@ -206,7 +206,7 @@ export default class SaidLamp extends Group {
     setShowMode() {
         const showMode = this.model.showMode;
         if (this.deviceStyle) {
-            const showConditions = this.deviceStyle.displayCondition;
+            const showConditions = (this.deviceStyle || {}).displayCondition;
             if (showConditions === '01' || showMode === showConditions) {
                 this.control && this.control.show();
             } else {
diff --git a/src/jmapNew/shape/Section/ELimitLines.js b/src/jmapNew/shape/Section/ELimitLines.js
index c42947db7..6a5302730 100644
--- a/src/jmapNew/shape/Section/ELimitLines.js
+++ b/src/jmapNew/shape/Section/ELimitLines.js
@@ -89,7 +89,7 @@ export default class ELimitLines extends Group {
             const beg = Object.assign({}, model.points[0]);
             const end = Object.assign({}, model.points[model.points.length - 1]);
             if (model.isSwitchSection && beg.y !== end.y) {
-                const swch = Vue.prototype.$jlmap.mapDevice[model.switch.code]; // 获取道岔model 及状态数据
+                const swch = Vue.prototype.$jlmap.mapDevice[model.relSwitchCode]; // 获取道岔model 及状态数据
 
                 if (swch && swch.instance) {
                     const traingle = new JTriangle(swch.intersection, swch.skew);
diff --git a/src/jmapNew/shape/Section/ELimitName.js b/src/jmapNew/shape/Section/ELimitName.js
index b81f6a7b6..6b2640a1e 100644
--- a/src/jmapNew/shape/Section/ELimitName.js
+++ b/src/jmapNew/shape/Section/ELimitName.js
@@ -14,87 +14,118 @@ export default class ELimitName extends Group {
     create() {
         /** 创建区段*/
         const model = this.model.modelData;
-        // 开头 起点位置
-        const speedLimitNameLeft = this.createName({
-            drict: -1,
-            x: model.points[0].x,
-            y: model.points[0].y - 15
-        });
-        // 终点位置
-        const speedLimitNameRight = this.createName({
-            drict: 1,
-            x: model.points[model.points.length - 1].x,
-            y: model.points[model.points.length - 1].y - 15
-        });
-        speedLimitNameLeft.forEach(item => {
-            this.add(item);
-        });
-        speedLimitNameRight.forEach(item => {
-            this.add(item);
-        });
-    }
-
-    createName(model) {
-        const dataList = [];
         const style = this.model.style;
 
         const rectW = style.Section.speedLimitName.drogueWidth;
         const rectH = style.Section.speedLimitName.drogueHeight;
-
-        dataList.push(new Polygon({
+        const x1 = model.points[0].x;
+        const y1 = model.points[0].y + style.Section.speedLimitName.limitValueDistance;
+        const x2 = model.points[model.points.length - 1].x;
+        const y2 = model.points[model.points.length - 1].y + style.Section.speedLimitName.limitValueDistance;
+        this.leftPolygon = new Polygon({
             zlevel: this.zlevel,
             z: this.z + 9,
             shape: {
                 points: [
-                    [model.x, model.y],
-                    [model.x - model.drict * rectW, model.y],
-                    [model.x - model.drict * (rectW + rectH / 2), model.y - rectH / 2],
-                    [model.x - model.drict * rectW, model.y - rectH],
-                    [model.x, model.y - rectH]
+                    [x1, y1],
+                    [x1 + rectW, y1],
+                    [x1 + (rectW + rectH / 2), y1 - rectH / 2],
+                    [x1 + rectW, y1 - rectH],
+                    [x1, y1 - rectH]
                 ]
             },
             style: {
                 lineWidth: 0,
                 fill: style.Section.speedLimitName.nameBackground
             }
-        }));
-
-        // 公里标内容
-        dataList.push(new Text({
+        });
+        this.rightPolygon = new Polygon({
+            zlevel: this.zlevel,
+            z: this.z + 9,
+            shape: {
+                points: [
+                    [x2, y2],
+                    [x2 - rectW, y2],
+                    [x2 - (rectW + rectH / 2), y2 - rectH / 2],
+                    [x2 - rectW, y2 - rectH],
+                    [x2, y2 - rectH]
+                ]
+            },
+            style: {
+                lineWidth: 0,
+                fill: style.Section.speedLimitName.nameBackground
+            }
+        });
+        this.leftLimitValue = new Text({
             zlevel: this.zlevel,
             z: this.z + 10,
             style: {
-                x: model.x - model.drict * 2,
-                y: model.y,
+                x: x1 + 2,
+                y: y1,
                 fontWeight: 'normal',
                 fontSize: style.Section.speedLimitName.nameNumberFontSize,
                 fontFamily: style.fontFamily,
-                text: '15',
+                text: '',
                 textFill: style.Section.speedLimitName.nameNumberColor,
-                textAlign: model.drict == -1 ? 'left' : 'right',
+                textAlign: 'left',
                 textPosition: style.Section.name.textPosition || 'inside',
                 textVerticalAlign: 'bottom'
             }
-        }));
-
-        // 公里值
-        dataList.push(new Text({
+        });
+        this.rightLimitValue = new Text({
             zlevel: this.zlevel,
             z: this.z + 10,
             style: {
-                x: model.x,
-                y: model.y + 12,
+                x: x2 - 2,
+                y: y2,
+                fontWeight: 'normal',
+                fontSize: style.Section.speedLimitName.nameNumberFontSize,
+                fontFamily: style.fontFamily,
+                text: '',
+                textFill: style.Section.speedLimitName.nameNumberColor,
+                textAlign: 'right',
+                textPosition: style.Section.name.textPosition || 'inside',
+                textVerticalAlign: 'bottom'
+            }
+        });
+        this.leftKilometerValue = new Text({
+            zlevel: this.zlevel,
+            z: this.z + 10,
+            style: {
+                x: x1,
+                y: y1 + 12,
                 fontWeight: 'normal',
                 fontSize: style.Section.speedLimitName.kilometerFontSize,
                 fontFamily: style.fontFamily,
                 text: '17.981km',
                 textFill: style.Section.speedLimitName.kilometerColor,
-                textAlign: model.drict == -1 ? 'left' : 'right',
+                textAlign: 'left',
                 textPosition: style.Section.name.textPosition || 'inside',
                 textVerticalAlign: 'bottom'
             }
-        }));
-        return dataList;
+        });
+        this.rightKilometerValue = new Text({
+            zlevel: this.zlevel,
+            z: this.z + 10,
+            style: {
+                x: x2,
+                y: y2 + 12,
+                fontWeight: 'normal',
+                fontSize: style.Section.speedLimitName.kilometerFontSize,
+                fontFamily: style.fontFamily,
+                text: '17.981km',
+                textFill: style.Section.speedLimitName.kilometerColor,
+                textAlign: 'right',
+                textPosition: style.Section.name.textPosition || 'inside',
+                textVerticalAlign: 'bottom'
+            }
+        });
+        this.add(this.leftPolygon);
+        this.add(this.rightPolygon);
+        this.add(this.leftLimitValue);
+        this.add(this.rightLimitValue);
+        this.add(this.leftKilometerValue);
+        this.add(this.rightKilometerValue);
     }
 
     hide() {
@@ -102,9 +133,11 @@ export default class ELimitName extends Group {
             child.hide();
         });
     }
-    show() {
+    show(speedUpLimit) {
         this.eachChild((child) => {
             child.show();
         });
+        this.leftLimitValue && this.leftLimitValue.setStyle({text: speedUpLimit});
+        this.rightLimitValue && this.rightLimitValue.setStyle({text: speedUpLimit});
     }
 }
diff --git a/src/jmapNew/shape/Section/ELines.js b/src/jmapNew/shape/Section/ELines.js
index 9f9a76431..4f31954d4 100644
--- a/src/jmapNew/shape/Section/ELines.js
+++ b/src/jmapNew/shape/Section/ELines.js
@@ -243,7 +243,7 @@ export default class ELines extends Group {
 
     animateStyle(loop, animates) {
         if (animates && animates.length) {
-            if (this.section.animateStyle && this.section.isLine) {
+            if (this.section && this.section.animateStyle && this.section.isLine) {
                 let an = this.section.animateStyle(loop);
                 animates.forEach(elem => {
                     an = an.when(elem.time, elem.styles);
diff --git a/src/jmapNew/shape/Section/ETextName.js b/src/jmapNew/shape/Section/ETextName.js
index 6f2d5bb4d..06523e0ab 100644
--- a/src/jmapNew/shape/Section/ETextName.js
+++ b/src/jmapNew/shape/Section/ETextName.js
@@ -126,7 +126,7 @@ class ETextName extends Group {
                     fontSize: styleModel.fontSize,
                     fontFamily: styleModel.fontFamily || this.model.style.fontFamily,
                     text: styleName,
-                    textFill: styleModel.fontColor,
+                    textFill:  model.approach && this.model.type === 'name' ? styleModel.approachColor : styleModel.fontColor,
                     textAlign: styleModel.textAlign,
                     textPosition: styleModel.textPosition || 'inside',
                     textVerticalAlign: styleModel.textVerticalAlign || null
diff --git a/src/jmapNew/shape/Section/index.js b/src/jmapNew/shape/Section/index.js
index 75508f463..9772e0ba8 100644
--- a/src/jmapNew/shape/Section/index.js
+++ b/src/jmapNew/shape/Section/index.js
@@ -228,12 +228,12 @@ export default class Section extends Group {
     }
 
     /** 设置限速*/
-    setSpeedUpperLimit() {
+    setSpeedUpperLimit(speedUpLimit) {
         if (this.style.Section.line.speedLimitColor) { // 宁波三号线 独有
             this.line.setStyle({stroke: this.style.Section.line.speedLimitColor});
         } else {
             this.speedLimit && this.speedLimit.show();
-            this.speedLimitName && this.speedLimitName.show();
+            this.speedLimitName && this.speedLimitName.show(speedUpLimit);
         }
     }
 
@@ -272,7 +272,7 @@ export default class Section extends Group {
         /** 区段切除*/
         model.cutOff && this.sectionCutOff();
         /** 是否限速*/
-        model.speedUpLimit > 0 && this.setSpeedUpperLimit();
+        model.speedUpLimit > 0 && this.setSpeedUpperLimit(model.speedUpLimit);
         // 区段计轴预复位状态 (未处理)
         // 区段故障锁闭
         model.fault && this.faultLock();
@@ -290,7 +290,7 @@ export default class Section extends Group {
     getShapeTipPoint() {
         let rect = this.getBoundingRect();
         const distance = this.style.Section.line.width / 2;
-        if (this.line) {
+        if (this.line && this.line.getBoundingRect()) {
             rect = this.line.getBoundingRect();
         }
         return {
diff --git a/src/jmapNew/shape/Signal/ESigLamp.js b/src/jmapNew/shape/Signal/ESigLamp.js
index d21838664..7cc6492a3 100644
--- a/src/jmapNew/shape/Signal/ESigLamp.js
+++ b/src/jmapNew/shape/Signal/ESigLamp.js
@@ -64,14 +64,14 @@ class ESigLamp extends Group {
                     y: model.originY
                 },
                 shape: {
-                    x1: model.x + (style.Signal.lamp.radiusR + 1) * Math.cos(Math.PI / 4),
-                    y1: model.y + (style.Signal.lamp.radiusR + 1) * Math.sin(Math.PI / 4),
-                    x2: model.x - (style.Signal.lamp.radiusR + 1) * Math.cos(Math.PI / 4),
-                    y2: model.y - (style.Signal.lamp.radiusR + 1) * Math.sin(Math.PI / 4)
+                    x1: model.x + (style.Signal.lamp.radiusR + 0.5) * Math.cos(Math.PI / 4),
+                    y1: model.y + (style.Signal.lamp.radiusR + 0.5) * Math.sin(Math.PI / 4),
+                    x2: model.x - (style.Signal.lamp.radiusR + 0.5) * Math.cos(Math.PI / 4),
+                    y2: model.y - (style.Signal.lamp.radiusR + 0.5) * Math.sin(Math.PI / 4)
                 },
                 style: {
                     lineWidth: style.Signal.lamp.stopWidth,
-                    stroke: style.backgroundColor
+                    stroke: style.Signal.xColor || style.backgroundColor
                 }
             });
             this.rstop = new Line({
@@ -84,14 +84,14 @@ class ESigLamp extends Group {
                     y: model.originY
                 },
                 shape: {
-                    x1: model.x + (style.Signal.lamp.radiusR + 1) * Math.cos(Math.PI / 4),
-                    y1: model.y + (style.Signal.lamp.radiusR + 1) * (Math.sin(Math.PI / 4) - Math.sqrt(2)),
-                    x2: model.x - (style.Signal.lamp.radiusR + 1) * Math.cos(Math.PI / 4),
-                    y2: model.y - (style.Signal.lamp.radiusR + 1) * (Math.sin(Math.PI / 4) - Math.sqrt(2))
+                    x1: model.x + (style.Signal.lamp.radiusR + 0.5) * Math.cos(Math.PI / 4),
+                    y1: model.y + (style.Signal.lamp.radiusR + 0.5) * (Math.sin(Math.PI / 4) - Math.sqrt(2)),
+                    x2: model.x - (style.Signal.lamp.radiusR + 0.5) * Math.cos(Math.PI / 4),
+                    y2: model.y - (style.Signal.lamp.radiusR + 0.5) * (Math.sin(Math.PI / 4) - Math.sqrt(2))
                 },
                 style: {
                     lineWidth: style.Signal.lamp.stopWidth,
-                    stroke: style.backgroundColor
+                    stroke: style.Signal.xColor || style.backgroundColor
                 }
             });
         }
diff --git a/src/jmapNew/shape/Signal/index.js b/src/jmapNew/shape/Signal/index.js
index 8ce875cd5..6c852fe24 100644
--- a/src/jmapNew/shape/Signal/index.js
+++ b/src/jmapNew/shape/Signal/index.js
@@ -371,6 +371,10 @@ class Signal extends Group {
                 } else {
                     this.lamps[0].setColor(this.style.Signal.lamp.redColor);
                 }
+            } else if (this.count == 3) {
+                this.lamps[0] && this.lamps[0].setColor(this.style.Signal.lamp.redColor);
+                this.lamps[1] && this.lamps[1].setColor(this.style.backgroundColor);
+                this.lamps[2] && this.lamps[2].setColor(this.style.backgroundColor);
             }
         }
     }
diff --git a/src/jmapNew/shape/Station/ESingleControl.js b/src/jmapNew/shape/Station/ESingleControl.js
index 3d87a0ec7..68188592d 100644
--- a/src/jmapNew/shape/Station/ESingleControl.js
+++ b/src/jmapNew/shape/Station/ESingleControl.js
@@ -72,7 +72,7 @@ export default class ESingleControl extends Group {
     }
 
     setTextColor(color) {
-        if (color) {
+        if (color && !this.model.style.Station.StationControl.lamp.textColorNoChange) {
             this.text.setStyle('textFill', color);
         }
     }
diff --git a/src/jmapNew/shape/StationStand/EEarlyStart.js b/src/jmapNew/shape/StationStand/EEarlyStart.js
new file mode 100644
index 000000000..351541379
--- /dev/null
+++ b/src/jmapNew/shape/StationStand/EEarlyStart.js
@@ -0,0 +1,76 @@
+import Group from 'zrender/src/container/Group';
+import Text from 'zrender/src/graphic/Text';
+
+class EEarlyStart extends Group {
+    constructor(model) {
+        super();
+        this.model = model;
+        this.detain = null;
+        this.isNew = false;
+    }
+
+    create(deviceParam) {
+        if (!this.isNew) {
+            const model = this.model.modelData;
+            const style = this.model.style;
+            this.isNew = true;
+
+            /** 提前发车*/
+            const startD = model.right ? 1 : -1;
+            const startX = model.position.x - startD * (deviceParam.offset.x - model.width / 2);
+            const startY = model.position.y + startD * (deviceParam.offset.y - model.height / 2);
+
+            this.earlyStart = new Text({
+                zlevel: this.model.zlevel,
+                z: this.model.z,
+                position: [0, 0],
+                style: {
+                    x: startX,
+                    y: startY,
+                    text: deviceParam.text,
+                    fontSize: deviceParam.fontSize,
+                    fontFamily: style.fontFamily,
+                    fontWeight: deviceParam.fontWeight,
+                    textFill: deviceParam.centerTrainColor,
+                    textStroke: style.backgroundColor,
+                    textAlign: style.textStyle.textAlign,
+                    textVerticalAlign: deviceParam.textVerticalAlign || style.textStyle.textVerticalAlign
+                }
+            });
+            this.add(this.earlyStart);
+        }
+    }
+
+    setColor(color) {
+        this.earlyStart.setStyle('textFill', color);
+    }
+
+    recover() {
+        this.hideMode();
+    }
+
+    hideMode() {
+        this.earlyStart && this.earlyStart.hide();
+    }
+
+    showMode(deviceParam) {
+        this.create(deviceParam);
+        this.earlyStart && this.earlyStart.show();
+    }
+
+    setState(model, deviceParam = this.model.style.StationStand.detainNormal) {
+        // /** 设置扣车*/
+        // if (model.stationHoldTrain && model.centerHoldTrain) {
+        //     this.showMode(deviceParam);
+        //     this.setColor(deviceParam.andCenterTrainColor);
+        // } else if (model.stationHoldTrain) {
+        //     this.showMode(deviceParam);
+        //     this.setColor(deviceParam.detainTrainTextColor);
+        // } else if (model.centerHoldTrain) {
+        //     this.showMode(deviceParam);
+        //     this.setColor(deviceParam.centerTrainColor);
+        // }
+    }
+}
+
+export default EEarlyStart;
diff --git a/src/jmapNew/shape/StationStand/detain/EDetain.js b/src/jmapNew/shape/StationStand/detain/EDetain.js
index b2594f417..9e152d560 100644
--- a/src/jmapNew/shape/StationStand/detain/EDetain.js
+++ b/src/jmapNew/shape/StationStand/detain/EDetain.js
@@ -37,7 +37,6 @@ class EDetain extends Group {
                     textVerticalAlign: deviceParam.textVerticalAlign || style.textStyle.textVerticalAlign
                 }
             });
-            console.log(this.detain, '************');
             this.add(this.detain);
         }
     }
diff --git a/src/jmapNew/shape/StationStand/functionButton/ECancelStopJumpLamp.js b/src/jmapNew/shape/StationStand/functionButton/ECancelStopJumpLamp.js
new file mode 100644
index 000000000..17e0922e4
--- /dev/null
+++ b/src/jmapNew/shape/StationStand/functionButton/ECancelStopJumpLamp.js
@@ -0,0 +1,45 @@
+
+import Group from 'zrender/src/container/Group';
+import EControl from '../../element/EControl';
+
+class ECancelStopJumpLamp extends Group {
+    constructor(model) {
+        super();
+        this.model = model;
+        this.create();
+    }
+    create() {
+        const model = this.model.modelData;
+        const style = this.model.style;
+        this.cancelStopJumpLamp = new EControl({
+            zlevel: this.model.zlevel,
+            z: this.model.z,
+            arc: {
+                shape: {
+                    cx: model.cancelStopJumpLampPoint.x,
+                    cy: model.cancelStopJumpLampPoint.y,
+                    r: style.Station.lamp.radiusR
+                },
+                subType: 'CancelStopJumpLamp',
+                lineWidth: 0,
+                fill: style.StationStand.lamp.lampColor
+            },
+            text: {
+                position: [0, 0],
+                x: model.cancelStopJumpLampPoint.x,
+                y: model.cancelStopJumpLampPoint.y + style.StationStand.lamp.radiusR + style.StationStand.text.distance,
+                fontWeight: style.StationStand.text.fontWeight,
+                fontSize: style.StationStand.text.fontSize,
+                fontFamily: style.fontFamily,
+                text: '取消跳停',
+                textFill: '#fff',
+                textAlign: 'middle',
+                textVerticalAlign: 'top'
+            },
+            style: style
+        });
+        this.add(this.cancelStopJumpLamp);
+    }
+}
+
+export default ECancelStopJumpLamp;
diff --git a/src/jmapNew/shape/StationStand/functionButton/EDownDetainLamp.js b/src/jmapNew/shape/StationStand/functionButton/EDownDetainLamp.js
new file mode 100644
index 000000000..5ee6e6a5c
--- /dev/null
+++ b/src/jmapNew/shape/StationStand/functionButton/EDownDetainLamp.js
@@ -0,0 +1,45 @@
+import Group from 'zrender/src/container/Group';
+import EControl from '../../element/EControl';
+
+class EDownDetainLamp extends Group {
+    constructor(model) {
+        super();
+        this.model = model;
+        this.create();
+    }
+    create() {
+        const model = this.model.modelData;
+        const style = this.model.style;
+
+        this.downDetainLamp = new EControl({
+            zlevel: this.model.zlevel,
+            z: this.model.z,
+            arc: {
+                shape: {
+                    cx: model.downDetainLampPoint.x,
+                    cy: model.downDetainLampPoint.y,
+                    r: style.Station.lamp.radiusR
+                },
+                subType: 'DownDetainLamp',
+                lineWidth: 0,
+                fill: style.StationStand.lamp.lampColor
+            },
+            text: {
+                position: [0, 0],
+                x: model.downDetainLampPoint.x,
+                y: model.downDetainLampPoint.y + style.StationStand.lamp.radiusR + style.StationStand.text.distance,
+                fontWeight: style.StationStand.text.fontWeight,
+                fontSize: style.StationStand.text.fontSize,
+                fontFamily: style.fontFamily,
+                text: '下行扣车',
+                textFill: '#fff',
+                textAlign: 'middle',
+                textVerticalAlign: 'top'
+            },
+            style: style
+        });
+        this.add(this.downDetainLamp);
+    }
+}
+
+export default EDownDetainLamp;
diff --git a/src/jmapNew/shape/StationStand/functionButton/EStopJumpLamp.js b/src/jmapNew/shape/StationStand/functionButton/EStopJumpLamp.js
new file mode 100644
index 000000000..ab2d39054
--- /dev/null
+++ b/src/jmapNew/shape/StationStand/functionButton/EStopJumpLamp.js
@@ -0,0 +1,45 @@
+
+import Group from 'zrender/src/container/Group';
+import EControl from '../../element/EControl';
+
+class EStopJumpLampButton extends Group {
+    constructor(model) {
+        super();
+        this.model = model;
+        this.create();
+    }
+    create() {
+        const model = this.model.modelData;
+        const style = this.model.style;
+        this.stopJumpLampButton = new EControl({
+            zlevel: this.model.zlevel,
+            z: this.model.z,
+            arc: {
+                shape: {
+                    cx: model.stopJumpLampPoint.x,
+                    cy: model.stopJumpLampPoint.y,
+                    r: style.Station.lamp.radiusR
+                },
+                subType: 'StopJumpLamp',
+                lineWidth: 0,
+                fill: style.StationStand.lamp.lampColor
+            },
+            text: {
+                position: [0, 0],
+                x: model.stopJumpLampPoint.x,
+                y: model.stopJumpLampPoint.y + style.StationStand.lamp.radiusR + style.StationStand.text.distance,
+                fontWeight: style.StationStand.text.fontWeight,
+                fontSize: style.StationStand.text.fontSize,
+                fontFamily: style.fontFamily,
+                text: '跳停',
+                textFill: '#fff',
+                textAlign: 'middle',
+                textVerticalAlign: 'top'
+            },
+            style: style
+        });
+        this.add(this.stopJumpLampButton);
+    }
+}
+
+export default EStopJumpLampButton;
diff --git a/src/jmapNew/shape/StationStand/functionButton/EUpDetainLamp.js b/src/jmapNew/shape/StationStand/functionButton/EUpDetainLamp.js
new file mode 100644
index 000000000..42edf8fcc
--- /dev/null
+++ b/src/jmapNew/shape/StationStand/functionButton/EUpDetainLamp.js
@@ -0,0 +1,45 @@
+import Group from 'zrender/src/container/Group';
+import EControl from '../../element/EControl';
+
+class EUpDetainLamp extends Group {
+    constructor(model) {
+        super();
+        this.model = model;
+        this.create();
+    }
+    create() {
+        const model = this.model.modelData;
+        const style = this.model.style;
+
+        this.upDetainLamp = new EControl({
+            zlevel: this.model.zlevel,
+            z: this.model.z,
+            arc: {
+                shape: {
+                    cx: model.upDetainLampPoint.x,
+                    cy: model.upDetainLampPoint.y,
+                    r: style.Station.lamp.radiusR
+                },
+                subType: 'UpDetainLamp',
+                lineWidth: 0,
+                fill: style.StationStand.lamp.lampColor
+            },
+            text: {
+                position: [0, 0],
+                x: model.upDetainLampPoint.x,
+                y: model.upDetainLampPoint.y + style.StationStand.lamp.radiusR + style.StationStand.text.distance,
+                fontWeight: style.StationStand.text.fontWeight,
+                fontSize: style.StationStand.text.fontSize,
+                fontFamily: style.fontFamily,
+                text: '上行扣车',
+                textFill: '#fff',
+                textAlign: 'middle',
+                textVerticalAlign: 'top'
+            },
+            style: style
+        });
+        this.add(this.upDetainLamp);
+    }
+}
+
+export default EUpDetainLamp;
diff --git a/src/jmapNew/shape/StationStand/index.js b/src/jmapNew/shape/StationStand/index.js
index dde33a609..8f92346e6 100644
--- a/src/jmapNew/shape/StationStand/index.js
+++ b/src/jmapNew/shape/StationStand/index.js
@@ -26,11 +26,15 @@ import EMouse from './EMouse';
 import EHighlight from '../element/EHighlight';
 import ETrainStop from './ETrainStop';
 import ETrainDepart from './ETrainDepart';
-import EControl from '../element/EControl';
 
 import EPatternFilter from './EPatternFilter';
+import EStopJumpLamp from './functionButton/EStopJumpLamp';
+import ECancelStopJumpLamp from './functionButton/ECancelStopJumpLamp';
+import EUpDetainLamp from './functionButton/EUpDetainLamp';
+import EDownDetainLamp from './functionButton/EDownDetainLamp';
+
 import {isShowThePrdType} from '../../utils/handlePath';
-import {traverseLineElements} from '../utils/ShapeStatusCovert';
+import {traverseLineElements, traverseStatusElements} from '../utils/ShapeStatusCovert';
 
 class StationStand extends Group {
     constructor(model, style) {
@@ -44,17 +48,17 @@ class StationStand extends Group {
         this.isShowShape = true;
         this.create();
         this.createMouseEvent();
-        if (isShowThePrdType(model.prdType, style.StationStand.common.functionButtonShow) || model.previewOrMapDraw) {
-            this.createFunctionButton();
-        }
-        if (model.previewOrMapDraw) {
-            this.setShowMode();
-        }
+        // if (isShowThePrdType(model.prdType, style.StationStand.common.functionButtonShow) || model.previewOrMapDraw) {
+        //     this.createFunctionButton();
+        // }
+        // if (model.previewOrMapDraw) {
+        //     this.setShowMode();
+        // }
         this.setVisible(model.visible);
         this.setState(model);
-        this.checkIsDrawMap();
     }
     create() {
+        // 加载皮肤控制的元素
         const model = this.model;
         const style = this.style;
         // // 站台所有的绘图元素
@@ -85,139 +89,34 @@ class StationStand extends Group {
         };
         // 遍历当前线路下的绘图元素 组合模式
         traverseLineElements(style.StationStand, elementTypeList, model, style, this);
+
+        // 加载后端返回的状态控制的绘图
+        const statusElementList = {
+            'stopJumpLamp':EStopJumpLamp,
+            'cancelStopJumpLamp':ECancelStopJumpLamp,
+            'upDetainLamp':EUpDetainLamp,
+            'downDetainLamp':EDownDetainLamp
+        };
+        // 遍历后端返回的状态控制的绘图
+        if (model.previewOrMapDraw || isShowThePrdType(model.prdType, style.StationStand.common.functionButtonShow)) {
+            traverseStatusElements(statusElementList, model, style, this);
+        }
     }
 
     createMouseEvent() {
-        if (this.style.StationStand.mouseOverStyle) {
-            this.mouseEvent = new EMouse(this);
-            this.add(this.mouseEvent);
-            this.on('mouseout', (e) => { this.mouseEvent.mouseout(e); });
-            this.on('mouseover', (e) => { this.mouseEvent.mouseover(e); });
-        }
-    }
-
-    createFunctionButton() {
-        const model = this.model;
-        const style = this.style;
-        if (model.stopJumpLamp) {
-            this.stopJumpLampButton = new EControl({
-                zlevel: this.zlevel,
-                z: this.z,
-                arc: {
-                    shape: {
-                        cx: model.stopJumpLampPoint.x,
-                        cy: model.stopJumpLampPoint.y,
-                        r: style.Station.lamp.radiusR
-                    },
-                    subType: 'StopJumpLamp',
-                    lineWidth: 0,
-                    fill: style.StationStand.lamp.lampColor
-                },
-                text: {
-                    position: [0, 0],
-                    x: model.stopJumpLampPoint.x,
-                    y: model.stopJumpLampPoint.y + style.StationStand.lamp.radiusR + style.StationStand.text.distance,
-                    fontWeight: style.StationStand.text.fontWeight,
-                    fontSize: style.StationStand.text.fontSize,
-                    fontFamily: style.fontFamily,
-                    text: '跳停',
-                    textFill: '#fff',
-                    textAlign: 'middle',
-                    textVerticalAlign: 'top'
-                },
-                style: this.style
-            });
-            this.add(this.stopJumpLampButton);
-        }
-        if (model.cancelStopJumpLamp) {
-            this.cancelStopJumpLampButton = new EControl({
-                zlevel: this.zlevel,
-                z: this.z,
-                arc: {
-                    shape: {
-                        cx: model.cancelStopJumpLampPoint.x,
-                        cy: model.cancelStopJumpLampPoint.y,
-                        r: style.Station.lamp.radiusR
-                    },
-                    subType: 'CancelStopJumpLamp',
-                    lineWidth: 0,
-                    fill: style.StationStand.lamp.lampColor
-                },
-                text: {
-                    position: [0, 0],
-                    x: model.cancelStopJumpLampPoint.x,
-                    y: model.cancelStopJumpLampPoint.y + style.StationStand.lamp.radiusR + style.StationStand.text.distance,
-                    fontWeight: style.StationStand.text.fontWeight,
-                    fontSize: style.StationStand.text.fontSize,
-                    fontFamily: style.fontFamily,
-                    text: '取消跳停',
-                    textFill: '#fff',
-                    textAlign: 'middle',
-                    textVerticalAlign: 'top'
-                },
-                style: this.style
-            });
-            this.add(this.cancelStopJumpLampButton);
-        }
-        if (model.upDetainLamp) {
-            this.upDetainLampButton = new EControl({
-                zlevel: this.zlevel,
-                z: this.z,
-                arc: {
-                    shape: {
-                        cx: model.upDetainLampPoint.x,
-                        cy: model.upDetainLampPoint.y,
-                        r: style.Station.lamp.radiusR
-                    },
-                    subType: 'UpDetainLamp',
-                    lineWidth: 0,
-                    fill: style.StationStand.lamp.lampColor
-                },
-                text: {
-                    position: [0, 0],
-                    x: model.upDetainLampPoint.x,
-                    y: model.upDetainLampPoint.y + style.StationStand.lamp.radiusR + style.StationStand.text.distance,
-                    fontWeight: style.StationStand.text.fontWeight,
-                    fontSize: style.StationStand.text.fontSize,
-                    fontFamily: style.fontFamily,
-                    text: '上行扣车',
-                    textFill: '#fff',
-                    textAlign: 'middle',
-                    textVerticalAlign: 'top'
-                },
-                style: this.style
-            });
-            this.add(this.upDetainLampButton);
-        }
-        if (model.downDetainLamp) {
-            this.downDetainLampButton = new EControl({
-                zlevel: this.zlevel,
-                z: this.z,
-                arc: {
-                    shape: {
-                        cx: model.downDetainLampPoint.x,
-                        cy: model.downDetainLampPoint.y,
-                        r: style.Station.lamp.radiusR
-                    },
-                    subType: 'DownDetainLamp',
-                    lineWidth: 0,
-                    fill: style.StationStand.lamp.lampColor
-                },
-                text: {
-                    position: [0, 0],
-                    x: model.downDetainLampPoint.x,
-                    y: model.downDetainLampPoint.y + style.StationStand.lamp.radiusR + style.StationStand.text.distance,
-                    fontWeight: style.StationStand.text.fontWeight,
-                    fontSize: style.StationStand.text.fontSize,
-                    fontFamily: style.fontFamily,
-                    text: '下行扣车',
-                    textFill: '#fff',
-                    textAlign: 'middle',
-                    textVerticalAlign: 'top'
-                },
-                style: this.style
-            });
-            this.add(this.downDetainLampButton);
+        const path = window.location.href;
+        if (path.includes('/map/draw')) {
+            this.highlight = new EHighlight(this);
+            this.add(this.highlight);
+            this.on('mouseout', () => { this.highlight.mouseout(); });
+            this.on('mouseover', () => { this.highlight.mouseover(); });
+        } else {
+            if (this.style.StationStand.mouseOverStyle) {
+                this.mouseEvent = new EMouse(this);
+                this.add(this.mouseEvent);
+                this.on('mouseout', (e) => { this.mouseEvent.mouseout(e); });
+                this.on('mouseover', (e) => { this.mouseEvent.mouseover(e); });
+            }
         }
     }
 
@@ -266,19 +165,19 @@ class StationStand extends Group {
         }
         switch (opts.subDeviceType) {
         case 'StopJumpLamp': {
-            rect = this.stopJumpLampButton.getBoundingRect();
+            rect = this.stopJumpLamp.getBoundingRect();
             break;
         }
         case 'CancelStopJumpLamp': {
-            rect = this.cancelStopJumpLampButton.getBoundingRect();
+            rect = this.cancelStopJumpLamp.getBoundingRect();
             break;
         }
         case 'UpDetainLamp': {
-            rect = this.upDetainLampButton.getBoundingRect();
+            rect = this.upDetainLamp.getBoundingRect();
             break;
         }
         case 'DownDetainLamp': {
-            rect = this.downDetainLampButton.getBoundingRect();
+            rect = this.downDetainLamp.getBoundingRect();
             break;
         }
         default: {
@@ -299,31 +198,18 @@ class StationStand extends Group {
         this.highlight && this.highlight.drawSelected(selected);
     }
 
-    checkIsDrawMap() {
-        const path = window.location.href;
-        if (path.includes('/map/draw')) {
-            this.highlight = new EHighlight(this);
-            this.add(this.highlight);
-            this.on('mouseout', () => { this.highlight.mouseout(); });
-            this.on('mouseover', () => { this.highlight.mouseover(); });
-        }
-    }
     // 设置显示模式
     setShowMode() {
         const showMode = this.model.showMode;
         const showConditions = this.style.StationStand.common.functionButtonShow;
         if (!showConditions || showConditions === '01' || showMode === showConditions) {
-            this.stopJumpLampButton && this.stopJumpLampButton.show();
-            this.cancelStopJumpLampButton && this.cancelStopJumpLampButton.show();
-            this.upDetainLampButton && this.upDetainLampButton.show();
-            this.downDetainLampButton && this.downDetainLampButton.show();
+            this.stopJumpLamp && this.stopJumpLamp.show();
+            this.cancelStopJumpLamp && this.cancelStopJumpLamp.show();
             this.upDetainLamp && this.upDetainLamp.show();
             this.downDetainLamp && this.downDetainLamp.show();
         } else {
-            this.stopJumpLampButton && this.stopJumpLampButton.hide();
-            this.cancelStopJumpLampButton && this.cancelStopJumpLampButton.hide();
-            this.upDetainLampButton && this.upDetainLampButton.hide();
-            this.downDetainLampButton && this.downDetainLampButton.hide();
+            this.stopJumpLamp && this.stopJumpLamp.hide();
+            this.cancelStopJumpLamp && this.cancelStopJumpLamp.hide();
             this.upDetainLamp && this.upDetainLamp.hide();
             this.downDetainLamp && this.downDetainLamp.hide();
         }
diff --git a/src/jmapNew/shape/StationTurnBack/index.js b/src/jmapNew/shape/StationTurnBack/index.js
index 518949840..ab88a8ad8 100644
--- a/src/jmapNew/shape/StationTurnBack/index.js
+++ b/src/jmapNew/shape/StationTurnBack/index.js
@@ -160,7 +160,7 @@ export default class StationTurnBack extends Group {
 
     setShowMode() {
         const showMode = this.model.showMode;
-        const showConditions = this.style.StationTurnBack.displayCondition;
+        const showConditions = (this.style.StationTurnBack || {}).displayCondition;
         if (!showConditions || showConditions == '01' || showMode === showConditions) {
             this.eachChild(item => item.show() );
         } else {
diff --git a/src/jmapNew/shape/Switch/index.js b/src/jmapNew/shape/Switch/index.js
index b66d244aa..7eeb5e62c 100644
--- a/src/jmapNew/shape/Switch/index.js
+++ b/src/jmapNew/shape/Switch/index.js
@@ -198,12 +198,12 @@ export default class Switch extends Group {
         this.add(this.lockRect);
         this.lockRect.hide();
         if (this.style.Switch.arcBlcok || this.style.Switch.interlocking) {
-            this.lockArc = new ELockArc({ // 单锁圆形 只有宁波线路使用
+            this.lockArc = new ELockArc({ // 单锁圆形 只有宁波线路使用 国赛线
                 zlevel: this.zlevel,
                 z: this.z + 6,
                 x: this.model.intersection.x,
                 y: this.model.intersection.y,
-                shapeR: 5,
+                shapeR: this.style.Switch.arcBlcok.shapeR,
                 lineWidth: 1.2,
                 stroke: this.style.Switch.arcBlcok.arcBorderColor,
                 fill: this.style.transparentColor
@@ -278,6 +278,7 @@ export default class Switch extends Group {
             this.shapeModelB.show();
             this.shapeModelB.setColor(this.style.Section.line.spareColor);
             this.shapeModelC.show();
+            this.shapeModelC.setColor(this.style.backgroundColor);
         }
         if (this.style.Switch.core.graphShow) { // 佛山线路显示
             this.shapeModelB.show();
@@ -324,8 +325,8 @@ export default class Switch extends Group {
             .when(1000, { stroke: this.style.backgroundColor })
             .start();
     }
-    setSwitchFault(split) {
-        if (this.style.Switch.jointImg.faultStatus && split) { // 宁波线失表状态
+    setSwitchFault(split, normalPosition, reversePosition) {
+        if (this.style.Switch.jointImg.faultStatus && split && !reversePosition && !normalPosition ) { // 宁波线失表状态
             this.setForkAction(); // 道岔挤岔
         } else {
             if (this.model.switchFaultCode && split) {
@@ -374,7 +375,7 @@ export default class Switch extends Group {
     }
 
     /** 单锁*/
-    setMonolock() {
+    setMonolock(normalPosition, reversePosition) {
         if (this.style.Switch.rectLock.monolock) { // 判断单锁矩形是否显示
             this.lockRect.show();
             if (this.style.Switch.rectLock.rectBorderFillColor) { // 西安二号线 专用显示
@@ -386,7 +387,11 @@ export default class Switch extends Group {
         }
         if (this.style.Switch.arcBlcok.show) { // 圆形单锁是否显示
             this.lockArc.show();
-            this.lockArc.setStyle({ stroke: this.style.Switch.arcBlcok.locationColor });
+            if (normalPosition) {
+                this.lockArc.setStyle({ stroke: this.style.Switch.arcBlcok.locationColor });
+            } else if (reversePosition) {
+                this.lockArc.setStyle({ stroke: this.style.Switch.arcBlcok.inversionColor });
+            }
         }
         this.model.normalPosition && this.setTextColor(this.style.Switch.text.monolockLocationColor); // 定位 设置道岔名称颜色
         this.model.reversePosition && this.setTextColor(this.style.Switch.text.monolockInversionColor); // 反位 设置道岔名称颜色
@@ -511,6 +516,7 @@ export default class Switch extends Group {
     setState(model) {
         if (!this.isShowShape) return;
         this.recover();
+        this.setSwitchFault(model.split, model.normalPosition, model.reversePosition);
         if (model.normalPosition) {
             this.setLocationAction(model); 	/** 定位*/
         } else if (model.reversePosition) {
@@ -519,9 +525,8 @@ export default class Switch extends Group {
             this.setLossAction(); // 失去
         }
         model.isCiConfirm && this.setCiConfirm(); // 道岔使能显示
-        this.setSwitchFault(model.split);
 
-        model.singleLock && this.setMonolock(); // 道岔单锁
+        model.singleLock && this.setMonolock(model.normalPosition, model.reversePosition); // 道岔单锁
         model.blockade && this.block(); // 道岔封锁
         model.singleLock && model.blockade && this.blockMonolock(); // 单锁&锁闭状态
         const path = window.location.href;
diff --git a/src/jmapNew/shape/Train/TrainBody.js b/src/jmapNew/shape/Train/TrainBody.js
index 7e9cdd3b2..1b5a6e889 100644
--- a/src/jmapNew/shape/Train/TrainBody.js
+++ b/src/jmapNew/shape/Train/TrainBody.js
@@ -40,12 +40,22 @@ export default class TrainBody extends Group {
     create() {
         const model = this.model;
         const style = this.model.style;
-        const serviceNumber = style.Train.trainServer.serviceNumberPrefix + (model.serviceNumber || model.model.specialServiceNumber || style.Train.trainServer.defaultServiceNumber);//	服务号(表号)
+        this.nameFormat = model.nameFormat;
         const tripNumber = style.Train.trainTarget.tripNumberPrefix + (style.Train.trainTarget.defaultDirectionCode
             ? (model.directionCode || style.Train.trainTarget.defaultDirectionCode) + (model.tripNumber || style.Train.trainTarget.defaultTripNumber)
-            : model.tripNumber || style.Train.trainTarget.defaultTripNumber); //  车次号
-        let targetCode = style.Train.trainNumber.targetCodePrefix + (model.destinationCode || style.Train.trainNumber.defaultTargetCode); //  目的地码
+            : model.tripNumber || style.Train.trainTarget.defaultTripNumber); // 车次号
         const groupNumber = style.Train.trainTargetNumber.groupNumberPrefix + (style.Train.trainTargetNumber.lineNumber || '') + (model.groupNumber || style.Train.trainTargetNumber.defaultGroupNumber); //  车组号
+        let serviceNumber = ''; //	服务号(表号)
+        if (this.model.type == 'PLAN') { // 计划车
+            serviceNumber = style.Train.trainServer.serviceNumberPrefix + (model.serviceNumber || model.model.specialServiceNumber || style.Train.trainServer.defaultServiceNumber);
+        } else if (this.model.type == 'HEAD') { // 头码车
+            serviceNumber = style.Train.trainServer.serviceNumberPrefix + (model.destinationCode || style.Train.trainNumber.defaultTargetCode);
+            this.nameFormat = 'serviceNumber:groupNumber';
+        } else if (this.model.type == 'MANUAL') { // 人工车
+            serviceNumber = style.Train.trainServer.serviceNumberPrefix + (model.serviceNumber || model.model.specialServiceNumber || style.Train.trainServer.defaultServiceHeadNum);
+            this.nameFormat = 'serviceNumber:groupNumber';
+        }
+        let targetCode = style.Train.trainNumber.targetCodePrefix + (model.destinationCode || style.Train.trainNumber.defaultTargetCode); //  目的地码
         if (Vue.prototype.$jlmap.lineCode == '09') { // 暂时先写死 后面有了删掉就好
             targetCode = '01';
         }
@@ -378,6 +388,16 @@ export default class TrainBody extends Group {
                 this.style.Train.soonerOrLater.destinationCode && this.textTrainTarget && this.textTrainTarget.setStyle({textFill: this.style.Train.soonerOrLater.lateColor});
                 this.style.Train.soonerOrLater.trainBody && this.trainBodyBox && this.trainBodyBox.setColor({stroke: this.style.Train.soonerOrLater.lateColor});
             }
+        } else if (this.style.Train.soonerOrLater && this.style.Train.soonerOrLater.level === 6) {
+            if (dt <= 59 && dt >= -59) {
+                this.style.Train.soonerOrLater.trainBody && this.trainBodyBox && this.trainBodyBox.setColor({stroke: this.style.Train.soonerOrLater.normalColor});
+            } else if (dt < -59 && dt >= -300) {
+                this.style.Train.soonerOrLater.trainBody && this.trainBodyBox && this.trainBodyBox.setColor({stroke: this.style.Train.soonerOrLater.smallLateColor});
+            } else if (dt > 300) {
+                this.style.Train.soonerOrLater.trainBody && this.trainBodyBox && this.trainBodyBox.setColor({stroke: this.style.Train.soonerOrLater.bigEarlyColor});
+            } else if (dt < -300) {
+                this.style.Train.soonerOrLater.trainBody && this.trainBodyBox && this.trainBodyBox.setColor({stroke: this.style.Train.soonerOrLater.bigLateColor});
+            }
         }
     }
     formatChangePosition(model, style) {
diff --git a/src/jmapNew/shape/element/ETextName.js b/src/jmapNew/shape/element/ETextName.js
index 9966bc56f..ddf41b2e9 100644
--- a/src/jmapNew/shape/element/ETextName.js
+++ b/src/jmapNew/shape/element/ETextName.js
@@ -19,7 +19,10 @@ export default function ETextName(model) {
             textFill: model.textFill,
             textAlign: model.textAlign,
             textPosition: model.textPosition || 'inside',
-            textVerticalAlign: model.textVerticalAlign || null
+            textVerticalAlign: model.textVerticalAlign || null,
+            textBorderColor: model.textBorderColor || null,
+            textBorderWidth: model.textBorderWidth || null,
+            textPadding: model.textPadding || 0
         }
     });
     return TextName;
diff --git a/src/jmapNew/shape/utils/ShapeStatusCovert.js b/src/jmapNew/shape/utils/ShapeStatusCovert.js
index 6e315a972..181e218c3 100644
--- a/src/jmapNew/shape/utils/ShapeStatusCovert.js
+++ b/src/jmapNew/shape/utils/ShapeStatusCovert.js
@@ -14,3 +14,20 @@ export function traverseLineElements(currentType, elementTypeList, model, style,
         obj.add(obj[element]);
     });
 }
+// 遍历后端返回的状态控制的绘图
+export function traverseStatusElements(statusElementList, model, style, obj) {
+    // if (model.showMode == undefined || model.showMode) {
+    Object.keys(statusElementList).forEach(element => {
+        const ClassName = statusElementList[element];
+        if (model[element]) {
+            obj[element] = new ClassName({
+                zlevel: model.zlevel,
+                z: 1,
+                style: style,
+                modelData:model
+            });
+            obj.add(obj[element]);
+        }
+    });
+    // }
+}
diff --git a/src/jmapNew/theme/aus_00/planConvert-.js b/src/jmapNew/theme/aus_00/planConvert-.js
deleted file mode 100644
index 218bf41ef..000000000
--- a/src/jmapNew/theme/aus_00/planConvert-.js
+++ /dev/null
@@ -1,139 +0,0 @@
-import { createMartPointReverse, createSeriesModel, createMarkLineModels, hexColor, convertSheetToList, prefixTime } from '@/utils/runPlan';
-
-export default {
-    /** 边缘高度*/
-    EdgeHeight: 600,
-
-    /** 间隔高度*/
-    CoordMultiple: 1,
-
-    /** 偏移时间*/
-	TranslationTime: 0,
-
-    /** 将后台数据解析成图表*/
-    convertDataToModels(tripList, stations, kmRangeCoordMap, lineStyle) {
-        var models = [];
-		/** 按车次遍历数据*/
-		if (tripList && tripList.length) {
-			tripList.forEach(trip => {
-				const opt = { 
-                    name: `run-${trip.tripNo}`, 
-                    type: 'line', 
-                    legendHoverLink: false, 
-                    symbolSize: 6, 
-                    lineStyle: {
-                        color: '#000',
-                        width: 1,
-                    },
-                    markPoint: { data: [] },
-                    data: []
-                };
-
-				// const length = trip.stationTimeList.length;
-				// if (trip.tripNo &&
-				// 	trip.stationTimeList.length) {
-				// 	opt.markPoint.data.push(createMartPointReverse({
-				// 		name: `${trip.tripNo}`,
-				// 		color: '#000' || lineStyle.color,
-				// 		coord: [
-				// 			trip.stationTimeList[0].arrivalTime,
-				// 			this.getCoordYByElem(stations, kmRangeCoordMap, trip.stationTimeList[0])
-				// 		]
-				// 	}));
-				// }
-
-				/** 计算停站点坐标集合*/
-				trip.stationTimeList.forEach((elem,idx) => {
-					if (elem.arrivalTime) {
-						opt.data.push([elem.arrivalTime, this.getCoordYByElem(stations, kmRangeCoordMap, elem), elem.stationCode, trip.tripNo]);
-					}
-
-					if (elem.departureTime) {
-						opt.data.push([elem.departureTime, this.getCoordYByElem(stations, kmRangeCoordMap, elem), elem.stationCode, trip.tripNo]);
-					}
-				});
-
-				models.push(opt);
-			});
-		}
-
-		return models;
-},
-
-    /** 更新数据并解析成图表*/
-    updateDataToModels(tripList, stations, kmRangeCoordMap, runPlanData, series, lineStyle) {
-        if (tripList && tripList.length) {
-        }
-        return series;
-    },
-
-    /** 初始化Y轴*/
-    initializeYaxis(stations) {
-        return createMarkLineModels(stations, (elem) => {
-            return this.EdgeHeight + elem.kmRange * this.CoordMultiple;
-        });
-    },
-
-    /** 将后台数据转换为试图序列模型*/
-    convertStationsToMap(stations) {
-        var map = {};
-        if (stations && stations.length) {
-            stations.forEach((elem) => {
-                map[`${elem.kmRange}`] = this.EdgeHeight + elem.kmRange * this.CoordMultiple;
-            });
-        }
-
-        return map;
-    },
-
-    /** 计算y轴最小值*/
-    computedYaxisMinValue(stations) {
-        return stations[0].kmRange * this.CoordMultiple;
-    },
-
-    /** 计算y轴最大值*/
-    computedYaxisMaxValue(stations) {
-        return stations[stations.length - 1].kmRange * this.CoordMultiple + this.EdgeHeight * 2;
-    },
-
-    /** 格式化y轴数据*/
-    computedFormatYAxis(stations, params) {
-        var yText = '0m';
-
-        stations.forEach(elem => {
-            if (elem.kmRange < parseInt(params.value) / this.CoordMultiple - this.EdgeHeight) {
-                yText = Math.floor(elem.kmRange) + 'm';
-            }
-        });
-
-        return yText;
-    },
-
-    /** 根据是否和上一个车次是否相交，计算下一个车次的折返的高度*/
-    computedReentryNumber(code) {
-        // return parseInt(code || 1) % 2 ? 1 : 2;
-        return 1;
-    },
-
-    /** 根据方向计算y折返偏移量*/
-    getYvalueByDirectionCode(defaultVlue, directionCode, num) {
-        if (directionCode === '1') {
-            defaultVlue += this.EdgeHeight / 2 * num;
-        } else if (directionCode === '2') {
-            defaultVlue -= this.EdgeHeight / 2 * num;
-        }
-
-        return defaultVlue;
-    },
-
-    /** 根据elem计算y值*/
-    getCoordYByElem(stations, kmRangeCoordMap, elem) {
-        var defaultVlue = 0;
-        var station = stations.find(it => { return it.code == elem.stationCode; });
-        if (station) {
-            defaultVlue = kmRangeCoordMap[`${station.kmRange}`];
-        }
-
-        return defaultVlue;
-    }
-};
diff --git a/src/jmapNew/theme/aus_00/planConvert.js b/src/jmapNew/theme/aus_00/planConvert.js
index 686a10a81..64c674c71 100644
--- a/src/jmapNew/theme/aus_00/planConvert.js
+++ b/src/jmapNew/theme/aus_00/planConvert.js
@@ -1,119 +1,285 @@
-import { createMartPoint, createSeriesModel, createMarkLineModels, hexColor, prefixTime, convertSheetToList } from '@/utils/runPlan';
+import { createSeriesModel, createMarkLineModels, createRectArea, createMartPoint } from './utils';
+import { toTimeStamp } from '@/utils/date';
 
 export default {
+	/** 最小时间*/
+	MinTime: 0,
+
+	/** 最大时间*/
+	MaxTime: 3600*24-1,
+
     /** 边缘高度*/
-    EdgeHeight: 3,
+    EdgeHeight: 600,
 
     /** 间隔高度*/
-    CoordMultiple: 3,
+    CoordMultiple: 1,
 
     /** 偏移时间*/
-    TranslationTime: 0,
+	TranslationTime: 0,
 
-    /** 将后台数据解析成图表*/
-    convertDataToModels(tripList, stations, kmRangeCoordMap, lineStyle) {
-        var models = [];
-		/** 按车次遍历数据*/
-		if (tripList && tripList.length) {
-			tripList.forEach(trip => {
-				const opt = {
-                    name: `run-${trip.tripNo}`,
-                    type: 'line',
-                    legendHoverLink: false,
-                    symbolSize: 6,
-                    lineStyle: {
-                        color: '#000',
-                        width: 1,
-                    },
-                    markPoint: { data: [] },
-                    data: []
-                };
+	/** 转换model为Rect数据*/
+	calcAreaArgsByModel(chart, model) {
+		const fartherKmRange = model.fartherKmRange;
+		const closerKmRange = model.closerKmRange;
+		const startTime = model.startTime;
+		const endTime = model.endTime;
+		const point1 = [ startTime, this.getCoordinateYByKmRange(fartherKmRange)];
+		const point2 = [ endTime, this.getCoordinateYByKmRange(closerKmRange)]
+		const position1 = chart.convertToPixel('grid', point1);
+		const position2 = chart.convertToPixel('grid', point2);
+		const position = position1;
+		const width = Math.abs(position1[0] - position2[0]);
+		const height = Math.abs(position1[1] - position2[1]);
 
-				/** 计算停站点坐标集合*/
-				trip.stationTimeList.forEach((elem,idx) => {
-					if (elem.arrivalTime) {
-						opt.data.push([elem.arrivalTime, this.getCoordYByElem(stations, kmRangeCoordMap, elem), elem.stationCode, trip.tripNo]);
-					}
+		return {
+			model,
+			position,
+			point1,
+			point2,
+			width,
+			height
+		}
+	},
 
-					if (elem.departureTime) {
-						opt.data.push([elem.departureTime, this.getCoordYByElem(stations, kmRangeCoordMap, elem), elem.stationCode, trip.tripNo]);
-					}
-				});
+	/** 将后台数据解析成图形*/
+	parseDataToGraph(chart, planData) {
+		const graphs = [];
+		if (planData &&
+			planData.areaList &&
+			planData.areaList.length) {
+			planData.areaList.forEach(model => {
+				if (typeof model.startTime == 'string') model.startTime = toTimeStamp(model.startTime);
+				if (typeof model.endTime == 'string') model.endTime = toTimeStamp(model.endTime);
+				graphs.push(createRectArea(this.calcAreaArgsByModel(chart, model)));
+			})
+		}
 
-				models.push(opt);
-			});
+		return graphs;
+	},
+
+    /** 将后台数据解析成折线*/
+    parseDataToSeries(chart, planData, stations) {
+		const models = [];
+		if (planData &&
+			planData.serviceList &&
+			planData.serviceList.length) {
+			planData.serviceList.forEach((service,i) => {
+				if (service.tripList &&
+					service.tripList.length) {
+
+					const opt = {
+						name: `service${service.serviceNo}`,
+						type: 'line',
+						symbolSize: 1,
+						showAllSymbol: true,
+						markPoint: { data: [] },
+						data: []
+					};
+
+					service.tripList.forEach((trip,j) => {
+                        var lastPoint = null;
+                        var nextPoint = null;
+						var pointData = {
+							name: `${service.serviceNo}-${trip.tripNo}`,
+							color: '#000',
+							direction: trip.direction,
+							coord: [trip.stationTimeList[0].departureTime, this.getCoordinateYByStationId(stations, trip.stationTimeList[0].stationId)],
+						};
+
+						opt.markPoint.data.push(createMartPoint(pointData));
+
+						trip.stationTimeList.forEach(elem => {
+							if (elem.arrivalTime) {
+								opt.data.push([elem.arrivalTime, this.getCoordinateYByStationId(stations, elem.stationId), {
+									stationId: elem.stationId,
+									serviceNo: service.serviceNo,
+									tripNo: trip.tripNo,
+									direction: trip.direction,
+									silent: false
+								}]);
+							}
+
+							if (elem.departureTime) {
+								opt.data.push([elem.departureTime, this.getCoordinateYByStationId(stations, elem.stationId), {
+									stationId: elem.stationId,
+									serviceNo: service.serviceNo,
+									tripNo: trip.tripNo,
+									direction: trip.direction,
+									silent: false
+								}]);
+							}
+						});
+
+						if (service.tripList[j + 1] &&
+							service.tripList[j + 1].stationTimeList) {
+
+							lastPoint = trip.stationTimeList[trip.stationTimeList.length-1];
+							nextPoint = service.tripList[j + 1].stationTimeList[0];
+
+							opt.data.push({
+								value: [lastPoint.arrivalTime, this.getCoordinateYByStationId(stations, lastPoint.stationId, true, trip.direction), {
+									stationId: lastPoint.stationId,
+									serviceNo: service.serviceNo,
+									tripNo: trip.tripNo,
+									direction: trip.direction,
+									silent: true
+								}],
+								symbol: 'none',
+								symbolSize: 1,
+							});
+							opt.data.push({
+								value: [nextPoint.departureTime, this.getCoordinateYByStationId(stations, lastPoint.stationId, true, trip.direction), {
+									stationId: lastPoint.stationId,
+									serviceNo: service.serviceNo,
+									tripNo: trip.tripNo,
+									direction: trip.direction,
+									silent: true
+								}],
+								symbol: 'none',
+								symbolSize: 1,
+							});
+						}
+					});
+
+					const model = createSeriesModel(opt,
+						{ color: '#000', width: 1 },
+						{ color: '#000', fill: '#000'}
+					);
+					models.push(model);
+				}
+			})
 		}
 
 		return models;
-    },
+},
 
-    /** 更新数据并解析成图表*/
-    updateDataToModels(tripList, stations, kmRangeCoordMap, runPlanData, series, lineStyle) {
-        if (tripList && tripList.length) {
+    /** 更新数据并解析成折线*/
+    updateDataToModels(chart, planData, stations, series) {
+        if (planData && planData.length) {
         }
         return series;
     },
 
-    /** 将后台数据转换为试图序列模型*/
-    convertStationsToMap(stations) {
-        var map = {};
-        if (stations && stations.length) {
-            stations.forEach((elem, index) => {
-                map[`${elem.kmRange}`] = this.EdgeHeight + index * this.CoordMultiple;
-            });
-        }
-
-        return map;
-    },
     /** 初始化Y轴*/
     initializeYaxis(stations) {
-        return createMarkLineModels(stations, (elem, index) => {
-            return this.EdgeHeight + index * this.CoordMultiple;
+        return createMarkLineModels(stations, (elem) => {
+            return elem.kmRange * this.CoordMultiple;
         });
     },
 
     /** 计算y轴最小值*/
-    computedYaxisMinValue() {
-        return 0;
+    computedYaxisMinValue(stations) {
+        return stations[0].kmRange * this.CoordMultiple - this.EdgeHeight;
     },
 
     /** 计算y轴最大值*/
     computedYaxisMaxValue(stations) {
-        return this.EdgeHeight * 2 + (stations.length - 1) * this.CoordMultiple;
+        return stations[stations.length - 1].kmRange * this.CoordMultiple + this.EdgeHeight;
     },
 
     /** 格式化y轴数据*/
     computedFormatYAxis(stations, params) {
         var yText = '0m';
-        var index = Math.floor((parseInt(params.value) - this.EdgeHeight) / this.CoordMultiple);
-        if (index >= 0 && index < stations.length) {
-            yText = Math.floor(stations[index].kmRange) + 'm';
-        }
-        return yText;
-    },
 
-    /** 根据方向计算y折返偏移量*/
-    getYvalueByDirectionCode(defaultVlue, directionCode) {
-        if (directionCode === '1') {
-            defaultVlue -= this.EdgeHeight / 2;
-        } else if (directionCode === '2') {
-            defaultVlue += this.EdgeHeight / 2;
-        }
-
-        return defaultVlue;
-    },
-
-    /** 根据elem计算y值*/
-    getCoordYByElem(stations, kmRangeCoordMap, elem, directionCode, isSpecial) {
-        var defaultVlue = 0;
-        var station = stations.find(it => { return it.code == elem.stationCode; });
-        if (station) {
-            defaultVlue = kmRangeCoordMap[`${station.kmRange}`];
-            if (isSpecial) {
-                defaultVlue = this.getYvalueByDirectionCode(defaultVlue, directionCode);
+        stations.forEach(elem => {
+            if (elem.kmRange < parseInt(params.value) / this.CoordMultiple) {
+                yText = Math.floor(elem.kmRange) + 'm';
             }
+        });
+
+        return yText;
+	},
+
+	/** 根据方向计算y折返偏移量*/
+	getOffsetY(isSpecial, direction) {
+		if (isSpecial) {
+			if (direction === '1') {
+				return -this.EdgeHeight / 2;
+			} else if (direction === '2') {
+				return +this.EdgeHeight / 2;
+			}
+		}
+
+		return 0;
+	},
+
+	/** 通过y坐标获取车站公里表*/
+	getKmRangeByCoordinateY(y) {
+		return parseInt(y/this.CoordMultiple);
+	},
+
+	/** 通过公里表获取坐标值*/
+	getCoordinateYByKmRange(k) {
+		return k * this.CoordMultiple
+	},
+
+	/** 通过站信息获取y坐标*/
+    getCoordinateYByStationId(stations, stationId, isSpecial=false, direction='01') {
+		var value = 0;
+        var station = stations.find(it => { return it.id == stationId; });
+        if (station) {
+			value = this.getCoordinateYByKmRange(station.kmRange) + this.getOffsetY(isSpecial, direction);
         }
 
-        return defaultVlue;
-    }
+        return value;
+	},
+
+	/** 通过y坐标获取站信息 */
+	getStationByCoordinateY(stations, y) {
+		for(var i = stations.length-1; i >= 0; i--) {
+			const station = stations[i];
+			const edge = this.EdgeHeight/2;
+			const preKm = i == 0? edge*2: Math.abs(station.kmRange-stations[i-1].kmRange)/2;
+			const nxtKm = i == stations.length-1? edge: Math.abs(station.kmRange-stations[i+1].kmRange)/2;
+			const min = edge + station.kmRange - preKm;
+			const max = edge + station.kmRange + nxtKm;
+			if (y >= min && y <= max) {
+				return station;
+			}
+		}
+		return null;
+	},
+
+	/**限制区域范围 */
+	limitAreaTime(model) {
+		if (model) {
+			model.startTime = model.startTime < this.MinTime
+				? this.MinTime
+				: model.startTime > this.MaxTime
+					? this.MaxTime
+					: model.startTime;
+
+			model.endTime = model.endTime < this.MinTime
+				? this.MinTime
+				: model.endTime > this.MaxTime
+					? this.MaxTime
+					: model.endTime;
+		}
+		return model;
+	},
+
+	/** 检查公里表是否超出范围*/
+	limitAreaKmRange(stations, model) {
+		const closerKmRange = model.closerKmRange;
+		const fartherKmRange = model.fartherKmRange;
+		const length = stations.length;
+		const first = stations[0]||{};
+		const last = stations[length-1]||{};
+		const minRange = first.kmRange-this.EdgeHeight;
+		const maxRange = last.kmRange;
+		const tolerant = 0;
+
+		if (closerKmRange < minRange - tolerant) {
+			const offset = closerKmRange - minRange;
+			model.closerKmRange = minRange;
+			model.fartherKmRange -= offset;
+			return true;
+		} else if (fartherKmRange > maxRange + tolerant) {
+			const offset = fartherKmRange - maxRange;
+			model.fartherKmRange = maxRange;
+			model.closerKmRange -= offset;
+			return true;
+		}
+		return false;
+	}
 };
diff --git a/src/jmapNew/theme/aus_00/utils.js b/src/jmapNew/theme/aus_00/utils.js
new file mode 100644
index 000000000..e6bc7efc2
--- /dev/null
+++ b/src/jmapNew/theme/aus_00/utils.js
@@ -0,0 +1,228 @@
+import store from '@/store/index_APP_TARGET';
+import { timeFormat } from '@/utils/date';
+
+/** 创建一个车次数据点*/
+export function createMartPoint(opt) {
+    const rotate = opt.direction == '2' ? 45 : (opt.direction == '1' ? -45 : 0);
+    const position = opt.type ? 'insideBottomLeft' : 'insideTopLeft';
+    return {
+        coord: opt.coord,
+        name: opt.name,
+        label: {
+            normal: {
+                rotate: rotate,
+                formatter: '{b}',
+                backgroundColor: 'rgb(242,242,242,0.1)',
+                color: 'black',
+                position: position
+            }
+        }
+    };
+}
+
+/** 创建一个服务数据序列*/
+export function createSeriesModel(opt, lineStyle={}, itemStyle={}) {
+	return {
+		z: opt.z || 2,
+		type: 'line',
+		name: opt.name,
+		data: opt.data,
+		sampling: 'average',
+		symbolSize: opt.symbolSize,
+		showAllSymbol: opt.showAllSymbol||'auto',
+		lineStyle: lineStyle,
+		itemStyle: itemStyle,
+		animation: false,
+		markPoint: {
+			symbol: 'roundRect',
+			symbolSize: 1,
+			data: opt.markPoint.data
+		}
+	};
+}
+
+/**
+ * 创建一个区域
+ */
+export function createRectArea(opt, style={}) {
+	return {
+		type: 'rect',
+		subType: 'area',
+		position: opt.position,
+		point1: opt.point1,
+		point2: opt.point2,
+		model: opt.model,
+		culling: true,
+		progressive: true,
+		shape: {
+			x: 0,
+			y: 0,
+			width: opt.width,
+			height: opt.height
+		},
+		style: {
+			fill: 'rgb(255,0,0, 0.3)',
+			stroke: 'rgb(255, 0, 0, 0.8)',
+			textPadding: [3, 6],
+			textOffset: [-opt.width/2, -opt.height/2],
+			text: opt.model.text,
+			textFill: 'rgb(0, 0, 0)',
+			fontSize: 18,
+			fontWeight: 500,
+			textVerticalAlign: 'top',
+			textAlign: 'left',
+			...style
+		},
+		z: 50
+	}
+}
+
+/** 创建标记横线*/
+export function createMarkLineModels(stations, computedYaxis) {
+    const markLineModel = {};
+    if (stations && stations.length) {
+        markLineModel.type = 'line';
+		markLineModel.name = 'markline';
+		markLineModel.silent = true;
+		markLineModel.animation = false;
+        markLineModel.markLine = {};
+        markLineModel.markLine.silent = true;
+        markLineModel.markLine.data = [];
+        markLineModel.markLine.lineStyle = { color: '#B0C4DE', width: 0.5 };
+		markLineModel.markLine.symbol = 'none';
+		markLineModel.elements = []
+        stations.forEach((elem, index) => {
+            markLineModel.markLine.data.push(
+                {
+                    label: {
+                        show: true,
+                        position: 'start',
+                        formatter: elem.name,
+						color: elem.transferable ? '#000': '#000',
+						backgroundColor: elem.transferable ? '#008800': '',
+						padding: [5,3,3,3],
+                    },
+                    lineStyle: {
+						type: 'solid',
+						color: elem.transferable? '#008800': '#000',
+                        width: 0.5,
+                        opacity: 0.5
+                    },
+                    yAxis: computedYaxis(elem, index)
+                }
+            );
+        });
+    }
+    return markLineModel;
+}
+
+/** 对list数据进行排序, 相同元素保持原有顺序*/
+export function sortListByCb(list, callback) {
+    list.map((elem, index) => { elem[`oldIndex`] = index; });
+    list.sort((a, b) => {
+        return callback(a, b) || a.oldIndex - b.oldIndex;
+    });
+    return list;
+}
+
+/** 将数字转换成asc码*/
+export function numToAsc(num) {
+    const nmA = 'A'.charCodeAt(0);
+    const nmZ = 'Z'.charCodeAt(0);
+    const len = nmZ - nmA + 1;
+    let str = '';
+
+    while (num >= 0) {
+        str = String.fromCharCode(num % len + nmA) + str;
+        num = Math.floor(num / len) - 1;
+    }
+
+    return str;
+}
+
+/** 将asc码转换成数字*/
+export function ascToNum(asc) {
+    const base = 'A'.charCodeAt() - 1;
+    let idx = asc.length - 1;
+    let num = 0;
+    let mulFactor = 1;
+    while (idx >= 0) {
+        num += (asc[idx].charCodeAt() - base) * mulFactor;
+        mulFactor *= 26;
+        idx -= 1;
+    }
+
+    return num;
+}
+
+/** 根据索引获取单元格的数据*/
+export function getCellValue(Sheet, index) {
+    let value;
+    const cell = Sheet[index];
+    if (cell) {
+        value = cell.w || cell.v;
+    }
+
+    return value;
+}
+
+/** 转换sheet数据为json数据*/
+export function convertSheetToList(Sheet, isReverse) {
+    const dataList = [];
+
+    if (Sheet) {
+        const refarea = Sheet['!ref'];
+        const regular = /([a-zA-Z]+)([0-9]+):([a-zA-Z]+)([0-9]+)/i;
+
+        if (refarea == null) return []; // "A1:M698"
+        if (regular.test(refarea)) {
+            /** 正则转换解析行列数据*/
+            const CoordList = regular.exec(refarea);
+            /** 转换数据为二维数组*/
+            const colBeg = ascToNum(CoordList[1]);
+            const colEnd = ascToNum(CoordList[3]);
+            const rowBeg = Number(CoordList[2]);
+            const rowEnd = Number(CoordList[4]);
+
+            if (isReverse) {
+                for (let i = colBeg - 1; i < colEnd; i++) {
+                    dataList.push([]);
+                    for (let j = rowBeg; j <= rowEnd; j++) {
+                        dataList[dataList.length - 1].push(getCellValue(Sheet, numToAsc(i) + j));
+                    }
+                }
+            } else {
+                for (let i = rowBeg; i <= rowEnd; i++) {
+                    dataList.push([]);
+                    for (let j = colBeg - 1; j < colEnd; j++) {
+                        dataList[dataList.length - 1].push(getCellValue(Sheet, numToAsc(j) + i));
+                    }
+                }
+            }
+        }
+    }
+
+    return dataList;
+}
+
+/** 通过time将时间格式化*/
+export function formatTime(time) {
+    if (Number.isInteger(time)) {
+        return timeFormat(time);
+    } else {
+        return '';
+    }
+}
+
+/** 将时间格式化前补零*/
+export function prefixTime(time) {
+    let str = `${time}` || '';
+    if (str) {
+        const list = str.split(':');
+        str = list.map(elem => {
+            return `00000${elem}`.substr(-2);
+        }).join(':');
+    }
+
+    return str;
+}
diff --git a/src/jmapNew/theme/beijing_01/menus/menuSection.vue b/src/jmapNew/theme/beijing_01/menus/menuSection.vue
index fa2ef6ef8..88a30e2ac 100644
--- a/src/jmapNew/theme/beijing_01/menus/menuSection.vue
+++ b/src/jmapNew/theme/beijing_01/menus/menuSection.vue
@@ -7,6 +7,7 @@
     <notice-info ref="noticeInfo" pop-class="beijing-01__systerm" />
     <set-fault ref="setFault" pop-class="beijing-01__systerm" />
     <train-add-plan ref="trainAddPlan" pop-class="beijing-01__systerm" />
+    <load-spare-train ref="loadSpareTrain" pop-class="beijing-01__systerm" />
   </div>
 </template>
 
@@ -25,6 +26,7 @@ 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';
 
 export default {
     name: 'SectionMenu',
@@ -35,7 +37,8 @@ export default {
         AlxeEffective,
         NoticeInfo,
         SetFault,
-        TrainAddPlan
+        TrainAddPlan,
+        LoadSpareTrain
     },
     props: {
         selected: {
@@ -74,6 +77,11 @@ export default {
                         label: '设置临时限速',
                         handler: this.setSpeed,
                         cmdType: CMD.Section.CMD_SECTION_SET_LIMIT_SPEED
+                    },
+                    {
+                        label: '取消临时限速',
+                        handler: this.cancelSpeed,
+                        cmdType: CMD.Section.CMD_SECTION_CANCEL_LIMIT_SPEED
                     }
                 ]
             },
@@ -92,6 +100,11 @@ export default {
                     label: '触发故障管理',
                     handler: this.triggerFaultManagement,
                     cmdType: CMD.Fault.CMD_TRIGGER_FAULT
+                },
+                {
+                    label: '设置备用车',
+                    handler: this.loadSpare,
+                    cmdType: CMD.Section.CMD_TRAIN_LOAD_SPARE_TRAIN
                 }
             ]
         };
@@ -183,6 +196,13 @@ export default {
                 }
             });
         },
+        loadSpare() {
+            commitOperate(menuOperate.Section.loadSpareTrain, {sectionCode:this.selected.code}).then(({valid, operate})=>{
+                if (valid) {
+                    this.$refs.loadSpareTrain.doShow(operate, this.selected);
+                }
+            });
+        },
         // // 设置计轴失效
         // alxeFailure() {
         //     const operate = {
@@ -290,6 +310,17 @@ export default {
         },
         triggerFaultManagement() {
             this.$store.dispatch('training/setTriggerFaultCount', this.selected);
+        },
+        cancelSpeed() {
+            let sectionCode = this.selected.code;
+            if (this.selected.type == '02' || this.selected.type == '03') {
+                sectionCode = this.selected.parentCode;
+            }
+            commitOperate(menuOperate.Section.cancelSpeed, {sectionCode:sectionCode}).then(({valid, operate})=>{
+                if (valid) {
+                    this.$refs.speedLimitControl.doShow(operate, this.selected);
+                }
+            });
         }
     }
 };
diff --git a/src/jmapNew/theme/beijing_01/planConvert.js b/src/jmapNew/theme/beijing_01/planConvert.js
index 1d9e22507..08dadbb83 100644
--- a/src/jmapNew/theme/beijing_01/planConvert.js
+++ b/src/jmapNew/theme/beijing_01/planConvert.js
@@ -128,7 +128,8 @@ export default {
                             if (index == 0 && train.stationTimeList[index].stationCode != train.stationTimeList[index + 1].stationCode ||
 								index == train.stationTimeList.length - 2 && train.stationTimeList[index].secondTime != train.stationTimeList[index + 1].secondTime ||
 								index > 0 && index < train.stationTimeList.length - 1) {
-                                const aa = `${train.directionCode}${train.tripNumber}`;
+                                // ${train.directionCode}
+                                const aa = `${train.tripNumber}`;
                                 opt.data.push([elem.secondTime, this.getCoordYByElem(stations, kmRangeCoordMap, elem, elem.directionCode, false), elem.stationCode, aa]);
                             }
                         });
@@ -138,7 +139,8 @@ export default {
                             lastPoint = train.stationTimeList[idx - 1];
                             nextPoint = service.tripNumberDataList[j + 1].stationTimeList[1];
                             num = this.computedReentryNumber(train.tripNumber);
-                            const aa = `${train.directionCode}${train.tripNumber}`;
+                            // ${train.directionCode}
+                            const aa = `${train.tripNumber}`;
                             opt.data.push([lastPoint.secondTime, this.getCoordYByElem(stations, kmRangeCoordMap, lastPoint, train.directionCode, true, num), lastPoint.stationCode, aa]);
                             opt.data.push([nextPoint.secondTime, this.getCoordYByElem(stations, kmRangeCoordMap, nextPoint, train.directionCode, true, num), nextPoint.stationCode, aa]);
                         }
diff --git a/src/jmapNew/theme/chengdu_01/menus/menuSection.vue b/src/jmapNew/theme/chengdu_01/menus/menuSection.vue
index 0dfa44083..e870caf44 100644
--- a/src/jmapNew/theme/chengdu_01/menus/menuSection.vue
+++ b/src/jmapNew/theme/chengdu_01/menus/menuSection.vue
@@ -7,6 +7,7 @@
     <speed-limit-control ref="speedLimitControl" />
     <set-fault ref="setFault" pop-class="chengdou-01__system" />
     <train-add-plan ref="trainAddPlan" pop-class="chengdou-01__system" />
+    <load-spare-train ref="loadSpareTrain" pop-class="chengdou-01__system" />
   </div>
 </template>
 
@@ -24,6 +25,7 @@ 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';
 
 export default {
     name: 'SectionMenu',
@@ -34,7 +36,8 @@ export default {
         SectionControl,
         SectionCmdControl,
         SetFault,
-        TrainAddPlan
+        TrainAddPlan,
+        LoadSpareTrain
     },
     props: {
         selected: {
@@ -83,6 +86,11 @@ export default {
                     label: '触发故障管理',
                     handler: this.triggerFaultManagement,
                     cmdType: CMD.Fault.CMD_TRIGGER_FAULT
+                },
+                {
+                    label: '设置备用车',
+                    handler: this.loadSpare,
+                    cmdType: CMD.Section.CMD_TRAIN_LOAD_SPARE_TRAIN
                 }
             ]
         };
@@ -214,6 +222,13 @@ export default {
                 }
             });
         },
+        loadSpare() {
+            commitOperate(menuOperate.Section.loadSpareTrain, {sectionCode:this.selected.code}).then(({valid, operate})=>{
+                if (valid) {
+                    this.$refs.loadSpareTrain.doShow(operate, this.selected);
+                }
+            });
+        },
         lock() {
             const step = {
                 start: true,
diff --git a/src/jmapNew/theme/chengdu_01/operationConfig.js b/src/jmapNew/theme/chengdu_01/operationConfig.js
new file mode 100644
index 000000000..a9a9e5619
--- /dev/null
+++ b/src/jmapNew/theme/chengdu_01/operationConfig.js
@@ -0,0 +1,19 @@
+import CMD from '@/scripts/cmdPlugin/CommandEnum';
+export default {
+    list: [
+        {
+            maxDuration: 8,
+            minDuration: 5,
+            operateType:CMD.Stand.CMD_STAND_SET_HOLD_TRAIN.value,
+            skinCode: '03',
+            trainingName: '设置扣车({10}-{12} 站台)',
+            trainingRemark: '设置扣车功能',
+            trainingType:'Stand',
+            productTypes: ['02'], // 产品类型 01 现地 02 行调
+            stepVOList: [
+                { deviceType: '06', orderNum: 1, operateCode: '504', tip: '鼠标右键菜单选择【设置扣车】'},
+                { deviceType: '06', orderNum: 2, operateCode: '504', tip: '鼠标左键点击【确定】按钮' }
+            ]
+        }
+    ]
+};
diff --git a/src/jmapNew/theme/chengdu_01/planConvert.js b/src/jmapNew/theme/chengdu_01/planConvert.js
index d9d827c31..9f9441ee4 100644
--- a/src/jmapNew/theme/chengdu_01/planConvert.js
+++ b/src/jmapNew/theme/chengdu_01/planConvert.js
@@ -128,7 +128,8 @@ export default {
                             if (index == 0 && train.stationTimeList[index].stationCode != train.stationTimeList[index + 1].stationCode ||
                                    index == train.stationTimeList.length - 2 && train.stationTimeList[index].secondTime != train.stationTimeList[index + 1].secondTime ||
                                    index > 0 && index < train.stationTimeList.length - 1) {
-                                const aa = `${train.directionCode}${train.tripNumber}`;
+                                // ${train.directionCode}
+                                const aa = `${train.tripNumber}`;
                                 opt.data.push([elem.secondTime, this.getCoordYByElem(stations, kmRangeCoordMap, elem, elem.directionCode, false), elem.stationCode, aa]);
                             }
                         });
@@ -138,7 +139,8 @@ export default {
                             lastPoint = train.stationTimeList[idx - 1];
                             nextPoint = service.tripNumberDataList[j + 1].stationTimeList[1];
                             num = this.computedReentryNumber(train.tripNumber);
-                            const aa = `${train.directionCode}${train.tripNumber}`;
+                            // ${train.directionCode}
+                            const aa = `${train.tripNumber}`;
                             opt.data.push([lastPoint.secondTime, this.getCoordYByElem(stations, kmRangeCoordMap, lastPoint, train.directionCode, true, num), lastPoint.stationCode, aa]);
                             opt.data.push([nextPoint.secondTime, this.getCoordYByElem(stations, kmRangeCoordMap, nextPoint, train.directionCode, true, num), nextPoint.stationCode, aa]);
                         }
diff --git a/src/jmapNew/theme/chengdu_03/menus/menuBar.vue b/src/jmapNew/theme/chengdu_03/menus/menuBar.vue
index c9cf5c801..ccebb5430 100644
--- a/src/jmapNew/theme/chengdu_03/menus/menuBar.vue
+++ b/src/jmapNew/theme/chengdu_03/menus/menuBar.vue
@@ -126,7 +126,8 @@ export default {
                 Local: [
                     {
                         title: '系统',
-                        operate: OperationEvent.Command.mBar.system,
+                        // operate: OperationEvent.Command.mBar.system,
+                        operate: '',
                         children: [
                             {
                                 title: '登录',
@@ -174,7 +175,8 @@ export default {
                     },
                     {
                         title: '查看',
-                        operate: OperationEvent.Command.mBar.check,
+                        // operate: OperationEvent.Command.mBar.check,
+                        operate: '',
                         children: [
                             {
                                 title: '运行图',
@@ -287,7 +289,8 @@ export default {
                     },
                     {
                         title: '显示',
-                        operate: OperationEvent.Command.mBar.view,
+                        // operate: OperationEvent.Command.mBar.view,
+                        operate: '',
                         hide: true,
                         children: [
                             {
diff --git a/src/jmapNew/theme/chengdu_03/menus/menuSection.vue b/src/jmapNew/theme/chengdu_03/menus/menuSection.vue
index 793c7d90d..d4d2a75a7 100644
--- a/src/jmapNew/theme/chengdu_03/menus/menuSection.vue
+++ b/src/jmapNew/theme/chengdu_03/menus/menuSection.vue
@@ -6,6 +6,7 @@
     <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="chengdou-03__systerm" />
+    <load-spare-train ref="loadSpareTrain" pop-class="chengdou-03__systerm" />
   </div>
 </template>
 
@@ -22,6 +23,7 @@ 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';
 
 export default {
     name: 'SectionMenu',
@@ -31,7 +33,8 @@ export default {
         SectionDetail,
         NoticeInfo,
         TrainAddPlan,
-        SetFault
+        SetFault,
+        LoadSpareTrain
     },
     props: {
         selected: {
@@ -63,7 +66,6 @@ export default {
                         handler: this.detail,
                         cmdType: CMD.Section.CMD_SECTION_DETAILS
                     }
-
                 ]
             },
             menuForce: [
@@ -81,6 +83,11 @@ export default {
                     label: '触发故障管理',
                     handler: this.triggerFaultManagement,
                     cmdType: CMD.Fault.CMD_TRIGGER_FAULT
+                },
+                {
+                    label: '设置备用车',
+                    handler: this.loadSpare,
+                    cmdType: CMD.Section.CMD_TRAIN_LOAD_SPARE_TRAIN
                 }
             ]
         };
@@ -141,6 +148,13 @@ 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);
+                }
+            });
+        },
         // 设置计轴失效
         alxeFailure() {
             const step = {
diff --git a/src/jmapNew/theme/chengdu_03/planConvert.js b/src/jmapNew/theme/chengdu_03/planConvert.js
index c4029af74..921c6f4da 100644
--- a/src/jmapNew/theme/chengdu_03/planConvert.js
+++ b/src/jmapNew/theme/chengdu_03/planConvert.js
@@ -106,7 +106,8 @@ export default {
                             if (index == 0 && train.stationTimeList[index].stationCode != train.stationTimeList[index + 1].stationCode ||
                                 index == train.stationTimeList.length - 2 && train.stationTimeList[index].secondTime != train.stationTimeList[index + 1].secondTime ||
                                 index > 0 && index < train.stationTimeList.length - 1) {
-                                const aa = `${train.directionCode}${train.tripNumber}`;
+                                // ${train.directionCode}
+                                const aa = `${train.tripNumber}`;
                                 opt.data.push([elem.secondTime, this.getCoordYByElem(stations, kmRangeCoordMap, elem, elem.directionCode, false), elem.stationCode, aa]);
                             }
                         });
@@ -116,7 +117,8 @@ export default {
                             lastPoint = train.stationTimeList[idx - 1];
                             nextPoint = service.tripNumberDataList[j + 1].stationTimeList[1];
                             num = this.computedReentryNumber(train.tripNumber);
-                            const aa = `${train.directionCode}${train.tripNumber}`;
+                            // ${train.directionCode}
+                            const aa = `${train.tripNumber}`;
                             opt.data.push([lastPoint.secondTime, this.getCoordYByElem(stations, kmRangeCoordMap, lastPoint, train.directionCode, true, num), lastPoint.stationCode, aa]);
                             opt.data.push([nextPoint.secondTime, this.getCoordYByElem(stations, kmRangeCoordMap, nextPoint, train.directionCode, true, num), nextPoint.stationCode, aa]);
                         }
diff --git a/src/jmapNew/theme/components/menus/dialog/loadSpareTrain.vue b/src/jmapNew/theme/components/menus/dialog/loadSpareTrain.vue
new file mode 100644
index 000000000..9a6c8e71a
--- /dev/null
+++ b/src/jmapNew/theme/components/menus/dialog/loadSpareTrain.vue
@@ -0,0 +1,178 @@
+<template>
+  <el-dialog
+    v-dialogDrag
+    :class="popClass+' 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-col :span="11" :offset="1">上下行</el-col>
+    </el-row>
+    <el-row>
+      <el-col :span="11">
+        <el-select v-model="addModel.groupNumber" size="mini">
+          <el-option
+            v-for="item in trainList"
+            :key="item.code"
+            :label="item.code"
+            :value="item.code"
+          />
+        </el-select>
+      </el-col>
+      <el-col :span="11" :offset="1">
+        <el-select v-model="addModel.right" size="mini">
+          <el-option :value="true" :label="rightTrueLabel" />
+          <el-option :value="false" :label="rightFalseLabel" />
+        </el-select>
+      </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
+    },
+    props:{
+        popClass:{
+            type:String,
+            required:true
+        }
+    },
+    data() {
+        return {
+            trainNoList: [],
+            selected: null,
+            messageTip1:'',
+            addModel: {
+                groupNumber: '',
+                right: '',
+                sectionCode: ''
+            },
+            dialogShow: false,
+            loading: false
+        };
+    },
+    computed: {
+        ...mapGetters('map', [
+            'mapConfig',
+            'trainList'
+        ]),
+        show() {
+            return this.dialogShow && !this.$store.state.menuOperation.break;
+        },
+        domIdCancel() {
+            return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
+        },
+        domIdConfirm() {
+            return this.dialogShow ? OperationEvent.Train.editTrainId.menu.domId : '';
+        },
+        title() {
+            return '加载备用车';
+        },
+        rightTrueLabel() {
+            return this.mapConfig.upRight ? '上行' : '下行';
+        },
+        rightFalseLabel() {
+            return this.mapConfig.upRight ? '下行' : '上行';
+        }
+    },
+    watch:{},
+    mounted() {
+        this.$nextTick(() => {
+            this.$store.dispatch('training/tipReload');
+        });
+    },
+    methods: {
+        doShow(operate, selected) {
+            this.selected = selected;
+            // 如果不是断点激活，则需要对初始值进行初始化
+            // if (!this.dialogShow) {
+            // }
+            this.addModel.sectionCode = selected.code;
+            this.dialogShow = true;
+            this.$nextTick(function () {
+                this.$store.dispatch('training/emitTipFresh');
+            });
+        },
+        doClose() {
+            this.loading = false;
+            this.dialogShow = false;
+            this.$store.dispatch('training/emitTipFresh');
+            this.$store.dispatch('map/setTrainWindowShow', false);
+            mouseCancelState(this.selected);
+        },
+        commit() {
+            if (!this.addModel.groupNumber) {
+                this.messageTip1 = '请输入车组号';
+                return;
+            }
+            const params = {
+                groupNumber: this.addModel.groupNumber,
+                sectionCode: this.addModel.sectionCode,
+                right: this.addModel.right
+            };
+            this.messageTip1 = '';
+            this.loading = true;
+            commitOperate(menuOperate.Section.loadSpareTrain, 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/components/menus/dialog/setFault.vue b/src/jmapNew/theme/components/menus/dialog/setFault.vue
index 0bdb2fb57..9a80448ff 100644
--- a/src/jmapNew/theme/components/menus/dialog/setFault.vue
+++ b/src/jmapNew/theme/components/menus/dialog/setFault.vue
@@ -119,7 +119,11 @@ export default {
                 if (selected._type == 'Train') {
                     name = selected.serviceNumber;
                 }
-                this.deviceName = deviceType[selected._type] + '-' + name;
+                if (name) {
+                    this.deviceName = deviceType[selected._type] + '-' + name;
+                } else {
+                    this.deviceName = deviceType[selected._type];
+                }
                 this.faultList = deviceFaultType[selected._type];
                 if (this.faultList && this.faultList.length) {
                     this.form.faultType = this.faultList[0].value;
diff --git a/src/jmapNew/theme/components/menus/dialog/speedCmdControl.vue b/src/jmapNew/theme/components/menus/dialog/speedCmdControl.vue
index 5b0c0f51c..2332d8b53 100644
--- a/src/jmapNew/theme/components/menus/dialog/speedCmdControl.vue
+++ b/src/jmapNew/theme/components/menus/dialog/speedCmdControl.vue
@@ -455,7 +455,8 @@ export default {
                 cmdType: '',
                 param: {
                     speedLimitValue: this.speed
-                }
+                },
+                val: this.speed
             };
 
             if (this.operation == OperationEvent.Section.setSpeed.menu.operation) {
diff --git a/src/jmapNew/theme/components/menus/dialog/switchHookLock.vue b/src/jmapNew/theme/components/menus/dialog/switchHookLock.vue
index bb9a09244..d86171936 100644
--- a/src/jmapNew/theme/components/menus/dialog/switchHookLock.vue
+++ b/src/jmapNew/theme/components/menus/dialog/switchHookLock.vue
@@ -39,13 +39,14 @@
         <el-button @click="doClose">取 消</el-button>
       </el-col>
     </el-row>
-    <notice-info ref="noticeInfo" pop-class="xian-01__systerm" />
+    <notice-info ref="noticeInfo" :pop-class="popClass" />
   </el-dialog>
 </template>
 <script>
 import { mapGetters } from 'vuex';
 import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo';
 import { commitTrainSend } from '@/jmapNew/theme/components/utils/menuOperate';
+import {menuOperate, commitOperate} from '../../utils/menuOperate';
 export default {
     name: 'SwitchHookLock',
     components: {
@@ -92,7 +93,7 @@ export default {
         });
     },
     methods: {
-        doShow(selected) {
+        doShow(selected, operate = null) {
             this.selected = selected;
             if (!this.dialogShow) {
                 this.switchName = '';
@@ -110,6 +111,9 @@ export default {
                 } else {
                     this.normal = false;
                 }
+                if (operate) {
+                    this.operation = operate.operation;
+                }
                 this.dialogShow = true;
                 this.$nextTick(function () {
                     this.$store.dispatch('training/emitTipFresh');
@@ -123,21 +127,36 @@ export default {
         },
         commit() {
             this.loading = true;
-            const group = this.$route.query.group;
-            const param = {
-                commandType: 'Switch_Hook_Lock',
-                targetMemberId: this.targetMemberId,
-                params: {
-                    switchCode: this.selected.code,
-                    normal: this.normal
-                }
-            };
-            commitTrainSend(group, param).then(({valid, operate})=>{
-                this.doClose();
-            }).catch((error) => {
-                this.$refs.noticeInfo.doShow(error.message);
-                this.doClose();
-            });
+            if (this.operation) {
+                commitOperate(menuOperate.Switch.hookLock, {normal: this.normal}, 2).then(({valid})=>{
+                    this.loading = false;
+                    if (valid) {
+                        this.doClose();
+                    }
+                }).catch((error) => {
+                    this.loading = false;
+                    this.doClose();
+                    this.$refs.noticeInfo.doShow(error.message);
+                });
+            } else {
+                const group = this.$route.query.group;
+                const param = {
+                    commandType: 'Switch_Hook_Lock',
+                    // Switch_Hook_Lock
+                    targetMemberId: this.targetMemberId,
+                    params: {
+                        switchCode: this.selected.code,
+                        normal: this.normal
+                    }
+                };
+                commitTrainSend(group, param).then(({valid, operate})=>{
+                    this.doClose();
+                }).catch((error) => {
+                    this.$refs.noticeInfo.doShow(error.message);
+                    this.doClose();
+                });
+            }
+
         }
     }
 };
diff --git a/src/jmapNew/theme/components/menus/dialog/trainControl.vue b/src/jmapNew/theme/components/menus/dialog/trainControl.vue
index 149cd8be5..af860cd9b 100644
--- a/src/jmapNew/theme/components/menus/dialog/trainControl.vue
+++ b/src/jmapNew/theme/components/menus/dialog/trainControl.vue
@@ -392,15 +392,6 @@ export default {
             } catch (e) {
                 this.$message.error('获取列车信息失败！');
             }
-
-            // getTrainDetailBytripNumber(this.$route.query.group, {tripNumber:tripNumber}).then(resp => {
-            //     if (resp.data) {
-            //         this.formModel.serviceNumber = resp.data.serviceNumber;
-            //         this.formModel.destinationCode = resp.data.destinationCode;
-            //     }
-            // }).catch(() => {
-            //     this.$message.error('获取列车信息失败！');
-            // });
             this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
diff --git a/src/jmapNew/theme/components/utils/menuOperate.js b/src/jmapNew/theme/components/utils/menuOperate.js
index ba6352759..e8fba250f 100644
--- a/src/jmapNew/theme/components/utils/menuOperate.js
+++ b/src/jmapNew/theme/components/utils/menuOperate.js
@@ -64,6 +64,11 @@ export const menuOperate = {
             // 区段详情
             operation: OperationEvent.Section.detail.menu.operation,
             cmdType: CMD.Section.CMD_SECTION_DETAILS
+        },
+        loadSpareTrain: {
+        	// 添加备用车
+            operation: OperationEvent.Section.loadSpareTrain.menu.operation,
+            cmdType: CMD.Section.CMD_TRAIN_LOAD_SPARE_TRAIN
         }
     },
     Signal:{
@@ -297,6 +302,11 @@ export const menuOperate = {
             // 批量取消扣车
             operation: OperationEvent.StationStand.cancelBulkBuckleTrain.menu.operation,
             cmdType:CMD.Stand.CMD_STAND_CANCEL_HOLD_TRAIN_ALL
+        },
+        openPsdByHand:{
+            // 手动开启屏蔽门
+            operation: OperationEvent.StationStand.openPsdByHand.menu.operation,
+            cmdType:CMD.Stand.CMD_STAND_OPEN_PSD
         }
     },
     StationControl:{
diff --git a/src/jmapNew/theme/factory.js b/src/jmapNew/theme/factory.js
index 6075c2bd3..778910af7 100644
--- a/src/jmapNew/theme/factory.js
+++ b/src/jmapNew/theme/factory.js
@@ -2,7 +2,7 @@ class Theme {
     constructor(code) {
         this._code = '02';
         this._mapMenu = {
-			'00': 'aus_00',
+            '00': 'aus_00',
             '01': 'chengdu_01',
             '02': 'fuzhou_01',
             '03': 'beijing_01',
@@ -14,7 +14,8 @@ class Theme {
             '09': 'xian_02',
             '10': 'xian_01',
             '11': 'xian_01',
-            '12': 'ningbo_03'
+            '12': 'ningbo_03',
+            '13': 'race_01'
         };
         this._localShowMode = { // 现地显示模式
             '01': 'all', // 成都一 全显
@@ -28,7 +29,8 @@ class Theme {
             '09': 'all',
             '10': 'all',
             '11': 'all',
-            '12': 'all'
+            '12': 'all',
+            '13':'all'
         };
     }
 
diff --git a/src/jmapNew/theme/foshan_01/menus/menuSection.vue b/src/jmapNew/theme/foshan_01/menus/menuSection.vue
index ead4076d8..7fd36bc6e 100644
--- a/src/jmapNew/theme/foshan_01/menus/menuSection.vue
+++ b/src/jmapNew/theme/foshan_01/menus/menuSection.vue
@@ -8,6 +8,7 @@
     <train-add-plan ref="trainAddPlan" pop-class="foshan-01__systerm" />
     <set-fault ref="setFault" pop-class="foshan-01__systerm" />
     <all-line-cancel-limit ref="allLineCancelLimit" />
+    <load-spare-train ref="loadSpareTrain" pop-class="foshan-01__systerm" />
   </div>
 </template>
 
@@ -25,6 +26,7 @@ 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';
 
 export default {
     name: 'SectionMenu',
@@ -36,7 +38,8 @@ export default {
         NoticeInfo,
         TrainAddPlan,
         SetFault,
-        AllLineCancelLimit
+        AllLineCancelLimit,
+        LoadSpareTrain
     },
     props: {
         selected: {
@@ -115,6 +118,11 @@ export default {
                     label: '触发故障管理',
                     handler: this.triggerFaultManagement,
                     cmdType: CMD.Fault.CMD_TRIGGER_FAULT
+                },
+                {
+                    label: '设置备用车',
+                    handler: this.loadSpare,
+                    cmdType: CMD.Section.CMD_TRAIN_LOAD_SPARE_TRAIN
                 }
             ]
         };
@@ -174,6 +182,13 @@ 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);
+                }
+            });
+        },
         // 新建计划车(开发专用)
         addPlanTrain() {
             commitOperate(menuOperate.Train.createPlanTrain, {sectionCode:this.selected.code}, 0).then(({valid, operate})=>{
diff --git a/src/jmapNew/theme/foshan_01/menus/menuSwitch.vue b/src/jmapNew/theme/foshan_01/menus/menuSwitch.vue
index 7df37b64f..3592d34fe 100644
--- a/src/jmapNew/theme/foshan_01/menus/menuSwitch.vue
+++ b/src/jmapNew/theme/foshan_01/menus/menuSwitch.vue
@@ -170,15 +170,15 @@ export default {
             this.menu = MenuContextHandler.covert(this.menuNormal);
             // 故障模式菜单列表
             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;
-                }
+                // if (!this.$store.state.scriptRecord.bgSet) {
+                const menuHook = [{
+                    label: '道岔钩锁',
+                    handler: this.hookLock
+                }];
+                this.menu = [...this.menuForce, ...menuHook];
+                // } else {
+                //     this.menu = this.menuForce;
+                // }
             }
         },
         doShow(point) {
diff --git a/src/jmapNew/theme/foshan_01/planConvert.js b/src/jmapNew/theme/foshan_01/planConvert.js
index 2682efd6b..2d381de1f 100644
--- a/src/jmapNew/theme/foshan_01/planConvert.js
+++ b/src/jmapNew/theme/foshan_01/planConvert.js
@@ -125,7 +125,8 @@ export default {
                             if (index == 0 && train.stationTimeList[index].stationCode != train.stationTimeList[index + 1].stationCode ||
 								index == train.stationTimeList.length - 2 && train.stationTimeList[index].secondTime != train.stationTimeList[index + 1].secondTime ||
 								index > 0 && index < train.stationTimeList.length - 1) {
-                                const tripNumber = `${train.directionCode}${train.tripNumber}`;
+                                // ${train.directionCode}
+                                const tripNumber = `${train.tripNumber}`;
                                 opt.data.push([elem.secondTime, this.getCoordYByElem(stations, kmRangeCoordMap, elem, elem.directionCode, false), elem.stationCode, tripNumber]);
                             }
                         });
diff --git a/src/jmapNew/theme/fuzhou_01/menus/menuDialog/viewName.vue b/src/jmapNew/theme/fuzhou_01/menus/menuDialog/viewName.vue
index a2a4092fc..13f37704f 100644
--- a/src/jmapNew/theme/fuzhou_01/menus/menuDialog/viewName.vue
+++ b/src/jmapNew/theme/fuzhou_01/menus/menuDialog/viewName.vue
@@ -74,7 +74,7 @@
 
 <script>
 import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
-import deviceType from '@/jmap/constant/deviceType';
+import deviceType from '@/jmapNew/constant/deviceType';
 import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo';
 
 export default {
diff --git a/src/jmapNew/theme/fuzhou_01/menus/menuSection.vue b/src/jmapNew/theme/fuzhou_01/menus/menuSection.vue
index 669463855..ac1f0616a 100644
--- a/src/jmapNew/theme/fuzhou_01/menus/menuSection.vue
+++ b/src/jmapNew/theme/fuzhou_01/menus/menuSection.vue
@@ -7,6 +7,7 @@
     <notice-info ref="noticeInfo" pop-class="fuzhou-01__systerm" />
     <train-add-plan ref="trainAddPlan" pop-class="fuzhou-01__systerm" />
     <set-fault ref="setFault" pop-class="fuzhou-01__systerm" />
+    <load-spare-train ref="loadSpareTrain" pop-class="fuzhou-01__systerm" />
   </div>
 </template>
 
@@ -25,6 +26,7 @@ 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';
 
 export default {
     name: 'SectionMenu',
@@ -35,7 +37,8 @@ export default {
         SpeedCmdControl,
         NoticeInfo,
         TrainAddPlan,
-        SetFault
+        SetFault,
+        LoadSpareTrain
     },
     props: {
         selected: {
@@ -150,6 +153,11 @@ export default {
                     label: this.$t('menu.menuSection.triggerFaultManagement'),
                     handler: this.triggerFaultManagement,
                     cmdType: CMD.Fault.CMD_TRIGGER_FAULT
+                },
+                {
+                    label: '设置备用车',
+                    handler: this.loadSpare,
+                    cmdType: CMD.Section.CMD_TRAIN_LOAD_SPARE_TRAIN
                 }
             ]
         };
@@ -228,6 +236,13 @@ 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);
+                }
+            });
+        },
         // 设置故障
         setStoppage() {
             commitOperate(menuOperate.Common.setFault, { code: this.selected.code }, 0).then(({valid, operate})=>{
diff --git a/src/jmapNew/theme/fuzhou_01/menus/menuSwitch.vue b/src/jmapNew/theme/fuzhou_01/menus/menuSwitch.vue
index 451147651..4ab788f05 100644
--- a/src/jmapNew/theme/fuzhou_01/menus/menuSwitch.vue
+++ b/src/jmapNew/theme/fuzhou_01/menus/menuSwitch.vue
@@ -210,15 +210,15 @@ export default {
 
             // 故障模式菜单列表
             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;
-                }
+                // if (!this.$store.state.scriptRecord.bgSet) {
+                const menuHook = [{
+                    label: '道岔钩锁',
+                    handler: this.hookLock
+                }];
+                this.menu = [...this.menuForce, ...menuHook];
+                // } else {
+                //     this.menu = this.menuForce;
+                // }
             }
         },
         doShow(point) {
diff --git a/src/jmapNew/theme/fuzhou_01/operationConfig.js b/src/jmapNew/theme/fuzhou_01/operationConfig.js
index 07ec74985..2b8de9be5 100644
--- a/src/jmapNew/theme/fuzhou_01/operationConfig.js
+++ b/src/jmapNew/theme/fuzhou_01/operationConfig.js
@@ -364,23 +364,23 @@ export default {
                 { deviceType: '03', orderNum: 2, operateCode: '406', tip: '鼠标左键点击【确定】按钮' }
             ]
         },
-        { // 未生成实训
-            maxDuration: 15,
-            minDuration: 8,
-            operateType: 'Section_Axis_Pre_Reset',
-            skinCode: '02',
-            trainingName: '计轴预复位({8}{9})',
-            trainingRemark: '计轴预复位功能',
-            trainingType: 'Section',
-            productTypes: ['01'],
-            stepVOList: [
-                { deviceType: '03', orderNum: 1, operateCode: '409', tip: '鼠标右键菜单选择【区段计轴预复位】' },
-                { deviceType: '03', orderNum: 2, operateCode: '4091', tip: '鼠标左键点击【下达】按钮' },
-                { deviceType: '03', orderNum: 3, operateCode: '4093', tip: '鼠标左键点击【确认1】按钮' },
-                { deviceType: '03', orderNum: 4, operateCode: '4094', tip: '鼠标左键点击【确认2】按钮' },
-                { deviceType: '03', orderNum: 5, operateCode: '001', tip: '鼠标左键点击【关闭】按钮' }
-            ]
-        },
+        // { // 未生成实训
+        //     maxDuration: 15,
+        //     minDuration: 8,
+        //     operateType: 'Section_Axis_Pre_Reset',
+        //     skinCode: '02',
+        //     trainingName: '计轴预复位({8}{9})',
+        //     trainingRemark: '计轴预复位功能',
+        //     trainingType: 'Section',
+        //     productTypes: ['01'],
+        //     stepVOList: [
+        //         { deviceType: '03', orderNum: 1, operateCode: '409', tip: '鼠标右键菜单选择【区段计轴预复位】' },
+        //         { deviceType: '03', orderNum: 2, operateCode: '4091', tip: '鼠标左键点击【下达】按钮' },
+        //         { deviceType: '03', orderNum: 3, operateCode: '4093', tip: '鼠标左键点击【确认1】按钮' },
+        //         { deviceType: '03', orderNum: 4, operateCode: '4094', tip: '鼠标左键点击【确认2】按钮' },
+        //         { deviceType: '03', orderNum: 5, operateCode: '001', tip: '鼠标左键点击【关闭】按钮' }
+        //     ]
+        // },
         {
             maxDuration: 15,
             minDuration: 8,
@@ -486,12 +486,12 @@ export default {
             minDuration: 8,
             operateType: 'Switch_Block',
             skinCode: '02',
-            trainingName: '道岔封闭({7})',
-            trainingRemark: '道岔封闭功能',
+            trainingName: '道岔封锁({7})',
+            trainingRemark: '道岔封锁功能',
             trainingType: 'Switch',
             productTypes: ['01', '02'],
             stepVOList: [
-                { deviceType: '02', orderNum: 1, operateCode: '105', tip: '鼠标右键菜单选择【道岔封闭】' },
+                { deviceType: '02', orderNum: 1, operateCode: '105', tip: '鼠标右键菜单选择【道岔封锁】' },
                 { deviceType: '02', orderNum: 2, operateCode: '105', tip: '鼠标左键点击【确定】按钮' }
             ]
         },
@@ -536,30 +536,30 @@ export default {
             trainingType: 'Switch',
             productTypes: ['01', '02'],
             stepVOList: [
-                { deviceType: '02', orderNum: 1, operateCode: '109', tip: '鼠标右键菜单选择【故障解锁】' },
+                { deviceType: '02', orderNum: 1, operateCode: '109', tip: '鼠标右键菜单选择【道岔故障解锁】' },
                 { deviceType: '02', orderNum: 2, operateCode: '1091', tip: '鼠标左键点击【下达】按钮' },
                 { deviceType: '02', orderNum: 3, operateCode: '1093', tip: '鼠标左键点击【确认1】按钮' },
                 { deviceType: '02', orderNum: 4, operateCode: '1094', tip: '鼠标左键点击【确认2】按钮' },
                 { deviceType: '02', orderNum: 5, operateCode: '001', tip: '鼠标左键点击【关闭】按钮' }
             ]
         },
-        { // 未生成实训
-            maxDuration: 15,
-            minDuration: 8,
-            operateType: 'Switch_Axis_Pre_Reset',
-            skinCode: '02',
-            trainingName: '道岔计轴预复位({7})',
-            trainingRemark: '道岔计轴预复位功能',
-            trainingType: 'Switch',
-            productTypes: ['01'],
-            stepVOList: [
-                { deviceType: '02', orderNum: 1, operateCode: '110', tip: '鼠标右键菜单选择【道岔计轴预复位】' },
-                { deviceType: '02', orderNum: 2, operateCode: '1101', tip: '鼠标左键点击【下达】按钮' },
-                { deviceType: '02', orderNum: 3, operateCode: '1103', tip: '鼠标左键点击【确认1】按钮' },
-                { deviceType: '02', orderNum: 4, operateCode: '1104', tip: '鼠标左键点击【确认2】按钮' },
-                { deviceType: '02', orderNum: 5, operateCode: '001', tip: '鼠标左键点击【关闭】按钮' }
-            ]
-        },
+        // { // 未生成实训
+        //     maxDuration: 15,
+        //     minDuration: 8,
+        //     operateType: 'Switch_Axis_Pre_Reset',
+        //     skinCode: '02',
+        //     trainingName: '道岔计轴预复位({7})',
+        //     trainingRemark: '道岔计轴预复位功能',
+        //     trainingType: 'Switch',
+        //     productTypes: ['01'],
+        //     stepVOList: [
+        //         { deviceType: '02', orderNum: 1, operateCode: '110', tip: '鼠标右键菜单选择【道岔计轴预复位】' },
+        //         { deviceType: '02', orderNum: 2, operateCode: '1101', tip: '鼠标左键点击【下达】按钮' },
+        //         { deviceType: '02', orderNum: 3, operateCode: '1103', tip: '鼠标左键点击【确认1】按钮' },
+        //         { deviceType: '02', orderNum: 4, operateCode: '1104', tip: '鼠标左键点击【确认2】按钮' },
+        //         { deviceType: '02', orderNum: 5, operateCode: '001', tip: '鼠标左键点击【关闭】按钮' }
+        //     ]
+        // },
         {
             maxDuration: 15,
             minDuration: 8,
@@ -733,23 +733,23 @@ export default {
                 { deviceType: '04', orderNum: 3, operateCode: '3041', tip: '鼠标左键点击【确定】按钮' }
             ]
         },
-        { // 未生成实训
-            maxDuration: 15,
-            minDuration: 8,
-            operateType: 'Signal_Set_Guide',
-            skinCode: '02',
-            trainingName: '引导进路办理({3})',
-            trainingRemark: '进路办理信号引导',
-            trainingType: 'Signal',
-            productTypes: ['01'],
-            stepVOList: [
-                { deviceType: '04', orderNum: 1, operateCode: '308', tip: '鼠标右键菜单选择【引导进路办理】' },
-                { deviceType: '04', orderNum: 2, operateCode: '3081', tip: '鼠标左键点击【下达】按钮' },
-                { deviceType: '04', orderNum: 3, operateCode: '3083', tip: '鼠标左键点击【确认1】按钮' },
-                { deviceType: '04', orderNum: 4, operateCode: '3084', tip: '鼠标左键点击【确认2】按钮' },
-                { deviceType: '04', orderNum: 5, operateCode: '001', tip: '鼠标左键点击【关闭】按钮' }
-            ]
-        },
+        // { // 未生成实训
+        //     maxDuration: 15,
+        //     minDuration: 8,
+        //     operateType: 'Signal_Set_Guide',
+        //     skinCode: '02',
+        //     trainingName: '引导进路办理({3})',
+        //     trainingRemark: '进路办理信号引导',
+        //     trainingType: 'Signal',
+        //     productTypes: ['01'],
+        //     stepVOList: [
+        //         { deviceType: '04', orderNum: 1, operateCode: '308', tip: '鼠标右键菜单选择【进路引导】' },
+        //         { deviceType: '04', orderNum: 2, operateCode: '3081', tip: '鼠标左键点击【下达】按钮' },
+        //         { deviceType: '04', orderNum: 3, operateCode: '3083', tip: '鼠标左键点击【确认1】按钮' },
+        //         { deviceType: '04', orderNum: 4, operateCode: '3084', tip: '鼠标左键点击【确认2】按钮' },
+        //         { deviceType: '04', orderNum: 5, operateCode: '001', tip: '鼠标左键点击【关闭】按钮' }
+        //     ]
+        // },
         {
             maxDuration: 15,
             minDuration: 8,
diff --git a/src/jmapNew/theme/fuzhou_01/planConvert.js b/src/jmapNew/theme/fuzhou_01/planConvert.js
index 5d5449bde..0163d7a31 100644
--- a/src/jmapNew/theme/fuzhou_01/planConvert.js
+++ b/src/jmapNew/theme/fuzhou_01/planConvert.js
@@ -15,120 +15,232 @@ export default {
         beginRow: 1,
         beginCol: 0,
         // fieldNum: 10,
-        columns: {
-            '默认上行折返轨': { key: 'upTrack', formatter: (val) => { return val; } },
-            '默认下行折返轨': { key: 'downTrack', formatter: (val) => { return val; } }
-        }
+        trainId: '车次号',
+        columns: ['备注', '车次号']
+        // beginRow: 1,
+        // beginCol: 0,
+        // // fieldNum: 10,
+        // columns: {
+        //     '默认上行折返轨': { key: 'upTrack', formatter: (val) => { return val; } },
+        //     '默认下行折返轨': { key: 'downTrack', formatter: (val) => { return val; } }
+        // }
     },
 
+    // /** 解析exal数据转换为Json后台数据*/
+    // importData(Sheet, JsonData) {
+    //     const dataList = convertSheetToList(Sheet, true);
+    //     const needList = Object.keys(this.ExcelConfig.columns);
+    //     const tripObj = { upTrack: '', downTrack: '' };
+    //     if (dataList && dataList.length && dataList[1] && dataList[0]) {
+    //         const tIndex = dataList.findIndex(it => { return it[0]; });
+    //         if (dataList[0][0] == needList[0] && dataList[1][0] == needList[1]) {
+    //             for (var colIndex = this.ExcelConfig.beginCol; colIndex < dataList.length; colIndex += 1) {
+    //                 var isContinue = true;
+
+    //                 for (var rowIndex = this.ExcelConfig.beginRow; isContinue; rowIndex += 1) {
+    //                     isContinue = false;
+
+    //                     var title = dataList[colIndex][0];
+    //                     var value = dataList[colIndex][rowIndex];
+
+    //                     if (title && value) {
+    //                         // 数据列解析
+    //                         isContinue = true;
+    //                         var titleStr = `${title}`.replace(/\s*/g, '');
+    //                         var valueStr = `${value}`.replace(/\s*/g, '');
+
+    //                         // 取需要的字段
+    //                         if (needList.findIndex(elem => { return elem == titleStr; }) >= 0) {
+    //                             tripObj[this.ExcelConfig.columns[titleStr].key] = this.ExcelConfig.columns[titleStr].formatter(valueStr);
+    //                         }
+    //                     }
+
+    //                 }
+    //             }
+    //         } else {
+    //             /** 解析二维数组为json对象*/
+    //             const reg0 = /^[↑|↓|¡|ü|ý|]+(.*)/; // ↑|↓
+    //             const reg1 = /^([▼|▲|¡ø|¨‹]+)\s*(\d+:\d+:\d+)/; // ▲ 06:10:00
+    //             const reg2 = /^(\d+:\d+:\d+)\s*([▼|▲|¡ø|¨‹]+)/; // 06:10:00 ▲
+    //             const reg3 = /^(\d+:\d+:\d+)\s*(\d+:\d+:\d+|)/; // 06:10:00 06:12:00
+    //             const reg4 = /[▼|▲|¡|ø|¨|‹]+/; // ▲
+
+    //             dataList.forEach((elem, i) => {
+    //                 var begin = -1;
+    //                 /** 跳过名称所在的行*/
+    //                 if (i != tIndex && elem && elem.length > 0) {
+    //                     elem.forEach((item, j) => {
+    //                         /** 过滤空值*/
+    //                         if (item) {
+    //                             var value = `${item}`.trim();
+    //                             var title = `${dataList[tIndex][j]}`.replace(/\s*/g, '');
+    //                             /** 匹配到开始位置或者结束位置*/
+    //                             if (reg0.test(value)) {
+    //                                 if (begin == -1) {
+    //                                     begin = value; 	// 设置初始索引
+    //                                     JsonData.push({
+    //                                         code: reg0.exec(value)[1],
+    //                                         arrivalList: []
+    //                                     });
+    //                                 } else if (begin === value) {
+    //                                     begin = -1; 	// 清空初始索引
+    //                                 }
+    //                             } else if (begin !== -1) {
+    //                                 /** 匹配到中间位置*/
+    //                                 var begTime, endTime;
+    //                                 var runFlag = JsonData[JsonData.length - 1].code[2];
+    //                                 var stationName = title.replace(/\s/, '');
+    //                                 var need = false;
+    //                                 var flag = false;
+    //                                 if (reg1.test(value)) {
+    //                                     /** 含有特殊字符的时间格式*/
+    //                                     [, begTime, endTime] = reg1.exec(value);
+
+    //                                     begTime = reg4.test(begTime) ? '' : begTime;
+    //                                     endTime = reg4.test(endTime) ? '' : endTime;
+
+    //                                     /** 下行方向时间互换*/
+    //                                     if (runFlag === '2') {
+    //                                         [begTime, endTime] = [endTime, begTime];
+    //                                     }
+
+    //                                     /** 设置标志*/
+    //                                     [need, flag] = [true, true];
+    //                                 } else if (reg2.test(value)) {
+    //                                     /** 含有特殊字符的时间格式*/
+    //                                     [, begTime, endTime] = reg2.exec(value);
+
+    //                                     begTime = reg4.test(begTime) ? '' : begTime;
+    //                                     endTime = reg4.test(endTime) ? '' : endTime;
+
+    //                                     /** 下行方向时间互换*/
+    //                                     if (runFlag === '2') {
+    //                                         [begTime, endTime] = [endTime, begTime];
+    //                                     }
+
+    //                                     /** 设置标志*/
+    //                                     [need, flag] = [true, true];
+    //                                 } else if (reg3.test(value)) {
+    //                                     /** 正常时间格式*/
+    //                                     [, begTime, endTime] = reg3.exec(value);
+
+    //                                     /** 如果只存在一个数据时，则开始和结束设置一样*/
+    //                                     endTime = endTime || begTime;
+
+    //                                     /** 下行方向时间互换*/
+    //                                     if (runFlag === '2') {
+    //                                         [begTime, endTime] = [endTime, begTime];
+    //                                     }
+
+    //                                     /** 设置标志*/
+    //                                     [need, flag] = [true, false];
+    //                                 }
+
+    //                                 /** 添加json数据*/
+    //                                 if (need) { // 储存非空 数据
+    //                                     var stationObj = {
+    //                                         stationName: stationName
+    //                                     };
+
+    //                                     if (begTime) { stationObj['arriveTime'] = prefixTime(begTime); }
+    //                                     if (endTime) { stationObj['departureTime'] = prefixTime(endTime); }
+    //                                     if (flag) { stationObj['flag'] = flag; } // 是否转换轨
+    //                                     JsonData[JsonData.length - 1].arrivalList.push(stationObj);
+    //                                 }
+    //                             }
+    //                         }
+    //                     });
+    //                 }
+    //             });
+    //         }
+    //     }
+    //     JsonData.forEach(item => {
+    //         item['upTrack'] = tripObj.upTrack;
+    //         item['downTrack'] = tripObj.downTrack;
+    //     });
+
+    //     return JsonData;
+    // },
     /** 解析exal数据转换为Json后台数据*/
     importData(Sheet, JsonData) {
         const dataList = convertSheetToList(Sheet, true);
-        const needList = Object.keys(this.ExcelConfig.columns);
-        const tripObj = { upTrack: '', downTrack: '' };
         if (dataList && dataList.length && dataList[1] && dataList[0]) {
-            const tIndex = dataList.findIndex(it => { return it[0]; });
-            if (dataList[0][0] == needList[0] && dataList[1][0] == needList[1]) {
-                for (var colIndex = this.ExcelConfig.beginCol; colIndex < dataList.length; colIndex += 1) {
-                    var isContinue = true;
-
-                    for (var rowIndex = this.ExcelConfig.beginRow; isContinue; rowIndex += 1) {
-                        isContinue = false;
-
-                        var title = dataList[colIndex][0];
-                        var value = dataList[colIndex][rowIndex];
-
-                        if (title && value) {
-                            // 数据列解析
-                            isContinue = true;
-                            var titleStr = `${title}`.replace(/\s*/g, '');
-                            var valueStr = `${value}`.replace(/\s*/g, '');
-
-                            // 取需要的字段
-                            if (needList.findIndex(elem => { return elem == titleStr; }) >= 0) {
-                                tripObj[this.ExcelConfig.columns[titleStr].key] = this.ExcelConfig.columns[titleStr].formatter(valueStr);
+            const tIndex = 8; // 设置不用过滤行数
+            /** 解析二维数组为json对象*/
+            const reg3 = /^(\d+:\d+:\d+|)/; // 06:12:00
+            const reg4 = /[▼|▲|¡|ø|¨|‹]+/; // ▲
+            dataList.forEach((elem, i) => {
+                var begin = -1;
+                /** 跳过名称所在的行*/
+                if (i != tIndex && elem && elem.length > 0) {
+                    let flag = false;
+                    let param = { begTime: '', endTime: '' };
+                    if (i > tIndex) { elem.reverse(); }
+                    let interval = 1;
+                    for (let j = 0; j < elem.length;) {
+                        const item = elem[j];
+                        let title = '';
+                        var value = `${item}`.trim();
+                        if (i > tIndex) { // 上行线
+                            title = `${dataList[tIndex][dataList[tIndex].length - j - 1]}`.replace(/\s*/g, '');
+                            if (title == 'undefined') {
+                                title = `${dataList[tIndex][dataList[tIndex].length - j - 2]}`.replace(/\s*/g, '');
+                            }
+                        } else { // 下行线
+                            title = `${dataList[tIndex][j]}`.replace(/\s*/g, '');
+                            if (title == 'undefined') {
+                                title = `${dataList[tIndex][j - 1]}`.replace(/\s*/g, '');
                             }
                         }
 
-                    }
-                }
-            } else {
-                /** 解析二维数组为json对象*/
-                const reg0 = /^[↑|↓|¡|ü|ý|]+(.*)/; // ↑|↓
-                const reg1 = /^([▼|▲|¡ø|¨‹]+)\s*(\d+:\d+:\d+)/; // ▲ 06:10:00
-                const reg2 = /^(\d+:\d+:\d+)\s*([▼|▲|¡ø|¨‹]+)/; // 06:10:00 ▲
-                const reg3 = /^(\d+:\d+:\d+)\s*(\d+:\d+:\d+|)/; // 06:10:00 06:12:00
-                const reg4 = /[▼|▲|¡|ø|¨|‹]+/; // ▲
-
-                dataList.forEach((elem, i) => {
-                    var begin = -1;
-                    /** 跳过名称所在的行*/
-                    if (i != tIndex && elem && elem.length > 0) {
-                        elem.forEach((item, j) => {
-                            /** 过滤空值*/
-                            if (item) {
-                                var value = `${item}`.trim();
-                                var title = `${dataList[tIndex][j]}`.replace(/\s*/g, '');
-                                /** 匹配到开始位置或者结束位置*/
-                                if (reg0.test(value)) {
-                                    if (begin == -1) {
-                                        begin = value; 	// 设置初始索引
-                                        JsonData.push({
-                                            code: reg0.exec(value)[1],
-                                            arrivalList: []
-                                        });
-                                    } else if (begin === value) {
-                                        begin = -1; 	// 清空初始索引
+                        /** 匹配到开始位置或者结束位置*/
+                        if (title == this.ExcelConfig.trainId && value != 'undefined') {
+                            if (begin == -1) {
+                                interval = 2;
+                                flag = true;
+                                begin = value; 	// 设置初始索引
+                                JsonData.push({
+                                    code: value,
+                                    destinationCode: '',
+                                    arrivalList: []
+                                });
+                            } else if (flag) {
+                                interval = 1;
+                                begin = -1; 	// 清空初始索引
+                                JsonData[JsonData.length - 1].destinationCode = value;
+                                flag = false;
+                            }
+                        } else if (title == this.ExcelConfig.columns[0]) {
+                            interval = 1;
+                        } else if (begin !== -1) {
+                            const item1 = `${elem[j]}`.trim();
+                            const item2 = `${elem[j + 1]}`.trim();
+                            if (item1 != 'undefined' || item2 != 'undefined') {
+                                /** 匹配到中间位置*/
+                                var stationName = title.replace(/\s/, '');
+                                const flag = reg3.test(item1) || reg3.test(item2);
+                                if (this.ExcelConfig.columns.indexOf(stationName) == -1 && flag) {
+                                    let need = false;
+                                    if (value.split(':')[0] == '24') { // 24:XX:XX  类似这种数据 变24为00
+                                        const arr = value.split(':');
+                                        arr[0] = '00';
+                                        value = arr.join(':');
+                                    }
+                                    const item1 = elem[j] ? `${elem[j]}`.trim() : '';
+                                    const item2 = elem[j + 1] ? `${elem[j + 1]}`.trim() : '';
+                                    if (item1 && item2) {
+                                        param.begTime = item1;
+                                        param.endTime = item2;
+                                    } else if (item1 && !item2) {
+                                        param.begTime = item1;
+                                        param.endTime = item1;
+                                    } else if (!item1 && item2) {
+                                        param.begTime = item2;
+                                        param.endTime = item2;
                                     }
-                                } else if (begin !== -1) {
-                                    /** 匹配到中间位置*/
-                                    var begTime, endTime;
-                                    var runFlag = JsonData[JsonData.length - 1].code[2];
-                                    var stationName = title.replace(/\s/, '');
-                                    var need = false;
-                                    var flag = false;
-                                    if (reg1.test(value)) {
-                                        /** 含有特殊字符的时间格式*/
-                                        [, begTime, endTime] = reg1.exec(value);
 
-                                        begTime = reg4.test(begTime) ? '' : begTime;
-                                        endTime = reg4.test(endTime) ? '' : endTime;
-
-                                        /** 下行方向时间互换*/
-                                        if (runFlag === '2') {
-                                            [begTime, endTime] = [endTime, begTime];
-                                        }
-
-                                        /** 设置标志*/
-                                        [need, flag] = [true, true];
-                                    } else if (reg2.test(value)) {
-                                        /** 含有特殊字符的时间格式*/
-                                        [, begTime, endTime] = reg2.exec(value);
-
-                                        begTime = reg4.test(begTime) ? '' : begTime;
-                                        endTime = reg4.test(endTime) ? '' : endTime;
-
-                                        /** 下行方向时间互换*/
-                                        if (runFlag === '2') {
-                                            [begTime, endTime] = [endTime, begTime];
-                                        }
-
-                                        /** 设置标志*/
-                                        [need, flag] = [true, true];
-                                    } else if (reg3.test(value)) {
-                                        /** 正常时间格式*/
-                                        [, begTime, endTime] = reg3.exec(value);
-
-                                        /** 如果只存在一个数据时，则开始和结束设置一样*/
-                                        endTime = endTime || begTime;
-
-                                        /** 下行方向时间互换*/
-                                        if (runFlag === '2') {
-                                            [begTime, endTime] = [endTime, begTime];
-                                        }
-
-                                        /** 设置标志*/
-                                        [need, flag] = [true, false];
+                                    if (param.begTime && param.endTime) {
+                                        need = true;
                                     }
 
                                     /** 添加json数据*/
@@ -136,25 +248,32 @@ export default {
                                         var stationObj = {
                                             stationName: stationName
                                         };
-
-                                        if (begTime) { stationObj['arriveTime'] = prefixTime(begTime); }
-                                        if (endTime) { stationObj['departureTime'] = prefixTime(endTime); }
-                                        if (flag) { stationObj['flag'] = flag; } // 是否转换轨
+                                        if (reg4.test(param.begTime)) {
+                                            param.begTime = '';
+                                        }
+                                        if (reg4.test(param.endTime)) {
+                                            param.endTime = '';
+                                        }
+                                        stationObj['arriveTime'] = prefixTime(param.begTime);
+                                        stationObj['departureTime'] = prefixTime(param.endTime);
                                         JsonData[JsonData.length - 1].arrivalList.push(stationObj);
+                                        param = { begTime: '', endTime: '' };
                                     }
                                 }
                             }
-                        });
+                        }
+                        j = j + interval;
                     }
-                });
-            }
+                }
+            });
         }
-        JsonData.forEach(item => {
-            item['upTrack'] = tripObj.upTrack;
-            item['downTrack'] = tripObj.downTrack;
+        const arr = [];
+        JsonData.forEach((item, i) => {
+            if (item.code) {
+                arr.push(item);
+            }
         });
-
-        return JsonData;
+        return arr;
     },
 
     /** 将后台数据解析成图表*/
@@ -188,7 +307,8 @@ export default {
                         /** 计算非折返点车次点坐标集合*/
                         train.stationTimeList.forEach((elem, index) => {
                             idx = index;
-                            const aa = `${train.directionCode}${train.tripNumber}`;
+                            // ${train.directionCode}
+                            const aa = `${train.tripNumber}`;
                             opt.data.push([elem.secondTime, this.getCoordYByElem(stations, kmRangeCoordMap, elem, elem.directionCode, false), elem.stationCode, aa]);
                         });
 
@@ -196,7 +316,8 @@ export default {
                         if (!train.backup && train.reentry && service.tripNumberDataList[j + 1] && service.tripNumberDataList[j + 1].stationTimeList) {
                             lastPoint = train.stationTimeList[idx];
                             nextPoint = service.tripNumberDataList[j + 1].stationTimeList[0];
-                            const aa = `${train.directionCode}${train.tripNumber}`;
+                            // ${train.directionCode}
+                            const aa = `${train.tripNumber}`;
                             opt.data.push([lastPoint.secondTime, this.getCoordYByElem(stations, kmRangeCoordMap, lastPoint, train.directionCode, true), lastPoint.stationCode, aa, '折返轨']);
                             opt.data.push([nextPoint.secondTime, this.getCoordYByElem(stations, kmRangeCoordMap, lastPoint, train.directionCode, true), lastPoint.stationCode, aa, '折返轨']);
                         }
diff --git a/src/jmapNew/theme/haerbin_01/menus/dialog/trainControl.vue b/src/jmapNew/theme/haerbin_01/menus/dialog/trainControl.vue
index 9fed94ae9..c589f8f15 100644
--- a/src/jmapNew/theme/haerbin_01/menus/dialog/trainControl.vue
+++ b/src/jmapNew/theme/haerbin_01/menus/dialog/trainControl.vue
@@ -282,7 +282,8 @@ export default {
             const model = this.$store.getters['map/getDeviceByCode'](selected.code);
             this.formModel = {
                 groupNumber: model.groupNumber,
-                tripNumber: `${model.directionCode}${model.tripNumber}`,
+                // ${model.directionCode}
+                tripNumber: `${model.tripNumber}`,
                 trainType: model.type,
                 serviceNumber: model.serviceNumber,
                 targetCode: model.targetCode,
diff --git a/src/jmapNew/theme/haerbin_01/menus/index.vue b/src/jmapNew/theme/haerbin_01/menus/index.vue
index 6572f98d4..e89c40d72 100644
--- a/src/jmapNew/theme/haerbin_01/menus/index.vue
+++ b/src/jmapNew/theme/haerbin_01/menus/index.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="menus" :style="{width: width + 'px'}">
     <menu-cancel ref="menuCancel" />
-    <menu-bar v-if="$store.state.training.prdType === '01'" ref="menuBar" :selected="selected" />
+    <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" />
diff --git a/src/jmapNew/theme/haerbin_01/menus/menuBar.vue b/src/jmapNew/theme/haerbin_01/menus/menuBar.vue
index 21d4f8b86..487e1d15a 100644
--- a/src/jmapNew/theme/haerbin_01/menus/menuBar.vue
+++ b/src/jmapNew/theme/haerbin_01/menus/menuBar.vue
@@ -1,7 +1,7 @@
 <template>
-  <div id="menuBar">
+  <div id="menuBar" :style="{height: $store.state.training.prdType === '01'? '90px': '130px'}">
     <div class="haerbin-01__systerm nav">
-      <el-row>
+      <el-row v-if="$store.state.training.prdType === '01'">
         <el-col :span="2">
           <div class="nav-border">
             <el-row>
@@ -36,13 +36,13 @@
         <el-col :span="10">
           <div class="nav-border">
             <el-row>
-              <el-col :span="6"><el-button style="width: 80px;" plain @click="undeveloped">A级警报</el-button></el-col>
-              <el-col :span="6"><el-button style="width: 80px;" plain @click="undeveloped">B级警报</el-button></el-col>
-              <el-col :span="6"><el-button style="width: 80px;" plain @click="undeveloped">C级警报</el-button></el-col>
+              <el-col :span="6"><el-button style="width: 80px;" :style="{background:isNoRecoverLevelA || isNoConfirmLevelA?'#F00':'#FFF' }" plain :class="{'headerBox' :isNoConfirmLevelA}" @click="showLowAlarm('A')">A级警报</el-button></el-col>
+              <el-col :span="6"><el-button style="width: 80px;" :style="{background:isNoRecoverLevelB || isNoConfirmLevelB?'#F00':'#FFF' }" plain :class="{'headerBox' :isNoConfirmLevelB}" @click="showLowAlarm('B')">B级警报</el-button></el-col>
+              <el-col :span="6"><el-button style="width: 80px;" :style="{background:isNoRecoverLevelC?'#F00':'#FFF' }" plain>C级警报</el-button></el-col>
               <el-col :span="6"><el-button style="width: 80px;" plain @click="undeveloped">记录</el-button></el-col>
             </el-row>
             <el-row>
-              <el-col :span="6"><el-button style="width: 80px;" plain @click="undeveloped">声音</el-button></el-col>
+              <el-col :span="6"><el-button style="width: 80px;" plain @click="controlAudio(false)">声音</el-button></el-col>
               <el-col :span="6"><el-button style="width: 80px;" plain @click="undeveloped">双屏</el-button></el-col>
               <el-col :span="6"><el-button style="width: 80px;" plain @click="undeveloped">TGI</el-button></el-col>
               <el-col :span="6"><el-button style="width: 80px;" plain @click="undeveloped">管理</el-button></el-col>
@@ -64,19 +64,101 @@
           </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="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>
+            </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="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>
+        </el-col>
+      </el-row>
     </div>
     <notice-info ref="noticeInfo" pop-class="haerbin-01__systerm" />
+    <alarm-table-low ref="alarmTableLow" />
+    <alarm-table-hmi ref="alarmTableHmi" />
+    <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';
 
 export default {
     name: 'MenuBar',
     components: {
-        NoticeInfo
+        NoticeInfo,
+        AlarmTableLow,
+        AlarmTableHmi
     },
     props: {
         selected: {
@@ -103,7 +185,20 @@ export default {
             centralizedStationList2: [],
             colsNum: 0,
             version: '',
-            centralizedMap: {}
+            centralizedMap: {},
+            tipContent: [],
+            sound: false,
+            buzzerAudio: BuzzerAudio,
+            noConfirmMapA: {},
+            noConfirmMapB: {},
+            confirmNoRecoverMapA: {},
+            confirmNoRecoverMapB: {},
+            confirmNoRecoverMapC: {},
+            noConfirmMapAString: '{}',
+            noConfirmMapBString: '{}',
+            confirmNoRecoverMapAString: '{}',
+            confirmNoRecoverMapBString: '{}',
+            confirmNoRecoverMapCString: '{}'
         };
     },
     computed: {
@@ -119,6 +214,24 @@ export default {
         ]),
         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: {
@@ -152,6 +265,54 @@ export default {
             if (list && list.length) {
                 this.checkRoleChange(list);
             }
+        },
+        '$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() {
@@ -163,6 +324,11 @@ export default {
         }
     },
     methods: {
+        handleAlarm(val) {
+            if (val.level === 'A' || val.level === 'B') {
+                this.controlAudio(true);
+            }
+        },
         initMenu() {
             // 设置中心点 设置对应的集中站显示
             const centralizedStationList = [];
@@ -245,6 +411,23 @@ export default {
                     this.switchShowStation(this.centralizedMap[item.deviceCode]);
                 }
             });
+        },
+        showHimAlarm(level) {
+            this.$refs.alarmTableHmi.doShow(level);
+        },
+        showLowAlarm(level) {
+            this.$refs.alarmTableLow.doShow(level);
+        },
+        controlAudio(val) {
+            const audio = document.getElementById('buzzer');
+            this.sound = val;
+            if (audio !== null) {
+                if (val) {
+                    audio.play();
+                } else if (val === false) {
+                    audio.pause();
+                }
+            }
         }
     }
 };
@@ -423,4 +606,60 @@ export default {
         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;
+	}
+	.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/menuDialog/alarmTableHmi.vue b/src/jmapNew/theme/haerbin_01/menus/menuDialog/alarmTableHmi.vue
new file mode 100644
index 000000000..435816907
--- /dev/null
+++ b/src/jmapNew/theme/haerbin_01/menus/menuDialog/alarmTableHmi.vue
@@ -0,0 +1,155 @@
+<template>
+  <el-dialog v-dialogDrag class="haerbin-01__systerm manage-user" title="报警列表" :before-close="handleClose" :visible.sync="show" width="70%" :z-index="2000" :modal="false" :close-on-click-modal="false">
+    <div style="text-align: center;">
+      <div style="text-align: left;width: 90%;margin-left: 5%;border: 1px solid #808080;border-radius: 5px;padding: 10px;">
+        <el-row>
+          <el-col :span="10" style="text-align: center;">
+            <div style="display: inline-block;margin-right: 5px;">开始时间:</div>
+            <el-date-picker
+              v-model="startTime"
+              size="small"
+              type="datetime"
+              value-format="yyyy-MM-dd HH:mm:ss"
+              placeholder="选择日期时间"
+            />
+          </el-col>
+          <el-col :span="10" style="text-align: center;">
+            <div style="display: inline-block;margin-right: 5px;margin-left: 10px;">结束时间:</div>
+            <el-date-picker
+              v-model="endTime"
+              size="small"
+              type="datetime"
+              value-format="yyyy-MM-dd HH:mm:ss"
+              placeholder="选择日期时间"
+            />
+          </el-col>
+          <el-col :span="4" style="text-align: center;">
+            <el-button style="margin-left: 10px;" @click="queryData(true)">查询</el-button>
+            <el-button style="margin-left: 10px;" @click="queryData(false)">撤销查询</el-button>
+
+          </el-col>
+        </el-row>
+      </div>
+      <div style="position: relative;height: 20px;line-height: 20px;top: -120px;text-align: left;right: -80px;background: #F0F0F0;width: 88px;">筛选条件查询</div>
+      <el-row>
+        <el-col :span="8">
+          <el-button @click="infoConfirm">消息确认</el-button>
+        </el-col>
+        <el-col :span="8">
+          <el-button :disabled="true">消息打印</el-button>
+        </el-col>
+        <el-col :span="8">
+          <el-button :disabled="true">删除备注</el-button>
+        </el-col>
+      </el-row>
+      <el-table
+        :data="totalData"
+        style="width: 100%"
+        height="450"
+      >
+        <el-table-column prop="operate" label="操作">
+          <template slot-scope="scope">
+            <el-checkbox v-model="checkList[scope.$index]" @change="operateChange(scope)" />
+          </template>
+        </el-table-column>
+        <el-table-column prop="level" label="报警级别" />
+        <el-table-column prop="time" label="日期/时间" width="150px" />
+        <el-table-column prop="code" label="报警序号" />
+        <el-table-column prop="deviceCode" label="设备编号">
+          <template slot-scope="scope">
+            <span>{{ handleDeviceName(scope.row.deviceCode) }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column prop="address" label="信号编号" />
+        <el-table-column prop="address" label="元素编号" />
+        <el-table-column prop="confirmed" label="确认">
+          <template slot-scope="scope">
+            <span>{{ scope.row.confirmed? 'Y':'N' }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column prop="confirmedUserName" label="确认人编号" width="120px" />
+        <el-table-column prop="confirmTime" label="确认时间" width="150px" />
+        <el-table-column prop="recoverTime" label="恢复">
+          <template slot-scope="scope">
+            <span>{{ scope.row.recovered? 'Y':'N' }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column prop="address" label="恢复时间" />
+        <el-table-column prop="address" label="备注信息" width="200px" />
+      </el-table>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import {getAlarmList, confirmAlarm} from '@/api/simulation';
+export default {
+    name: 'AlarmHmi',
+    data() {
+        return {
+            currentPage: 1,
+            show: false,
+            level: '',
+            startTime: '',
+            endTime: '',
+            deviceCode: '',
+            elementCode: '',
+            totalData: [],
+            checkList: []
+        };
+    },
+    computed:{
+    },
+    methods:{
+        doShow(level) {
+            this.show = true;
+            this.level = level;
+            this.queryData(false);
+        },
+        handleClose() {
+            this.level = '';
+            this.startTime = '';
+            this.endTime = '';
+            this.show = false;
+        },
+        operateChange(row) {
+        },
+        queryData(flag) {
+            if (!flag) {
+                this.endTime = '';
+                this.startTime = '';
+                this.deviceCode = '';
+                this.elementCode = '';
+            }
+            const params = { level: this.level, startTime: this.startTime, endTime:this.endTime };
+            getAlarmList(this.$route.query.group, params).then(resp => {
+                this.totalData = resp.data;
+            });
+        },
+        infoConfirm() {
+            const codes = [];
+            this.checkList.forEach((check, index) => {
+                if (check) {
+                    codes.push(this.totalData[index].code);
+                }
+            });
+            confirmAlarm(this.$route.query.group, codes).then(resp => {
+                this.queryData(true);
+            }).catch(() => {
+                this.$message.error('确认消息失败！');
+            });
+        },
+        handleDeviceName(code) {
+            const device = this.$store.getters['map/getDeviceByCode'](code);
+            return device.name;
+        }
+    }
+};
+</script>
+
+<style scoped>
+	/deep/ .el-dialog .el-input {
+		border: 0 !important;
+	}
+
+</style>
diff --git a/src/jmapNew/theme/haerbin_01/menus/menuDialog/alarmTableLow.vue b/src/jmapNew/theme/haerbin_01/menus/menuDialog/alarmTableLow.vue
new file mode 100644
index 000000000..a716ade30
--- /dev/null
+++ b/src/jmapNew/theme/haerbin_01/menus/menuDialog/alarmTableLow.vue
@@ -0,0 +1,114 @@
+<template>
+  <el-dialog v-dialogDrag class="haerbin-01__systerm manage-user" title="报警列表" :before-close="handleClose" :visible.sync="show" width="70%" :z-index="2000" :modal="false" :close-on-click-modal="false">
+    <div style="text-align: center;">
+      <div style="text-align: left;">
+        <div style="display: inline-block;margin-right: 5px;">开始时间:</div>
+        <el-date-picker
+          v-model="startTime"
+          size="small"
+          type="datetime"
+          value-format="yyyy-MM-dd HH:mm:ss"
+          placeholder="选择日期时间"
+        />
+        <div style="display: inline-block;margin-right: 5px;margin-left: 10px;">结束时间:</div>
+        <el-date-picker
+          v-model="endTime"
+          size="small"
+          type="datetime"
+          value-format="yyyy-MM-dd HH:mm:ss"
+          placeholder="选择日期时间"
+        />
+        <el-button style="margin-left: 10px;" @click="queryData">查询</el-button>
+      </div>
+      <el-table
+        :data="totalData"
+        style="width: 100%"
+        height="600"
+      >
+        <el-table-column prop="time" label="日期/时间" width="150px" />
+        <el-table-column prop="level" label="等级" />
+        <el-table-column prop="deviceCode" label="设备类型">
+          <template slot-scope="scope">
+            <span>{{ handleDeviceType(scope.row.deviceCode) }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column prop="deviceCode" label="设备编号">
+          <template slot-scope="scope">
+            <span>{{ handleDeviceName(scope.row.deviceCode) }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column prop="code" label="故障号" />
+        <el-table-column prop="description" label="故障描述" />
+        <el-table-column prop="recover" label="已恢复">
+          <template slot-scope="scope">
+            <el-checkbox v-model="scope.row.recovered" />
+          </template>
+        </el-table-column>
+        <el-table-column prop="address" label="恢复时间" />
+        <el-table-column prop="confirm" label="已确认">
+          <template slot-scope="scope">
+            <el-checkbox v-model="scope.row.confirmed" />
+          </template>
+        </el-table-column>
+        <el-table-column prop="confirmedUserName" label="确认人" />
+        <el-table-column prop="confirmTime" label="确认时间" width="150px" />
+        <el-table-column prop="address" label="备注信息" width="200px" />
+      </el-table>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import {getAlarmList} from '@/api/simulation';
+import {deviceType} from '@/scripts/cmdPlugin/Config';
+export default {
+    name: 'AlarmLow',
+    data() {
+        return {
+            currentPage: 1,
+            show: false,
+            level: '',
+            startTime: '',
+            endTime: '',
+            totalData: [],
+            tableData: []
+        };
+    },
+    computed:{
+    },
+    methods:{
+        doShow(level) {
+            this.show = true;
+            this.level = level;
+            this.queryData();
+        },
+        handleClose() {
+            this.level = '';
+            this.startTime = '';
+            this.endTime = '';
+            this.show = false;
+        },
+        queryData() {
+            const params = { level: this.level, startTime: this.startTime, endTime:this.endTime };
+            getAlarmList(this.$route.query.group, params).then(resp => {
+                this.totalData = resp.data;
+            });
+        },
+        handleDeviceType(code) {
+            const device = this.$store.getters['map/getDeviceByCode'](code);
+            return deviceType[device.type];
+        },
+        handleDeviceName(code) {
+            const device = this.$store.getters['map/getDeviceByCode'](code);
+            return device.name;
+        }
+    }
+};
+</script>
+
+<style scoped>
+	/deep/ .el-dialog .el-input {
+		border: 0 !important;
+	}
+
+</style>
diff --git a/src/jmapNew/theme/haerbin_01/menus/menuSection.vue b/src/jmapNew/theme/haerbin_01/menus/menuSection.vue
index f67947d95..74e129a5d 100644
--- a/src/jmapNew/theme/haerbin_01/menus/menuSection.vue
+++ b/src/jmapNew/theme/haerbin_01/menus/menuSection.vue
@@ -4,6 +4,7 @@
     <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>
 </template>
 
@@ -17,6 +18,7 @@ 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';
 
 export default {
     name: 'SectionMenu',
@@ -24,7 +26,8 @@ export default {
         PopMenu,
         NoticeInfo,
         TrainAddPlan,
-        SetFault
+        SetFault,
+        LoadSpareTrain
     },
     props: {
         selected: {
@@ -58,6 +61,11 @@ export default {
                     label: '触发故障管理',
                     handler: this.triggerFaultManagement,
                     cmdType: CMD.Fault.CMD_TRIGGER_FAULT
+                },
+                {
+                    label: '设置备用车',
+                    handler: this.loadSpare,
+                    cmdType: CMD.Section.CMD_TRAIN_LOAD_SPARE_TRAIN
                 }
             ]
         };
@@ -106,6 +114,13 @@ export default {
                 this.menu = this.menuForce;
             }
         },
+        loadSpare() {
+            commitOperate(menuOperate.Section.loadSpareTrain, {sectionCode:this.selected.code}).then(({valid, operate})=>{
+                if (valid) {
+                    this.$refs.loadSpareTrain.doShow(operate, this.selected);
+                }
+            });
+        },
         doShow(point) {
             this.clickEvent();
             this.initMenu();
diff --git a/src/jmapNew/theme/haerbin_01/planConvert.js b/src/jmapNew/theme/haerbin_01/planConvert.js
index 8e99a545d..be09d33f1 100644
--- a/src/jmapNew/theme/haerbin_01/planConvert.js
+++ b/src/jmapNew/theme/haerbin_01/planConvert.js
@@ -188,7 +188,8 @@ export default {
                         /** 计算非折返点车次点坐标集合*/
                         train.stationTimeList.forEach((elem, index) => {
                             idx = index;
-                            const aa = `${train.directionCode}${train.tripNumber}`;
+                            // ${train.directionCode}
+                            const aa = `${train.tripNumber}`;
                             opt.data.push([elem.secondTime, this.getCoordYByElem(stations, kmRangeCoordMap, elem, elem.directionCode, false), elem.stationCode, aa]);
                         });
 
@@ -196,7 +197,8 @@ export default {
                         if (!train.backup && train.reentry && service.tripNumberDataList[j + 1] && service.tripNumberDataList[j + 1].stationTimeList) {
                             lastPoint = train.stationTimeList[idx];
                             nextPoint = service.tripNumberDataList[j + 1].stationTimeList[0];
-                            const aa = `${train.directionCode}${train.tripNumber}`;
+                            // ${train.directionCode}
+                            const aa = `${train.tripNumber}`;
                             opt.data.push([lastPoint.secondTime, this.getCoordYByElem(stations, kmRangeCoordMap, lastPoint, train.directionCode, true), lastPoint.stationCode, aa, '折返轨']);
                             opt.data.push([nextPoint.secondTime, this.getCoordYByElem(stations, kmRangeCoordMap, lastPoint, train.directionCode, true), lastPoint.stationCode, aa, '折返轨']);
                         }
diff --git a/src/jmapNew/theme/ningbo_01/menus/menuSection.vue b/src/jmapNew/theme/ningbo_01/menus/menuSection.vue
index 3a924be67..a5f7a871b 100644
--- a/src/jmapNew/theme/ningbo_01/menus/menuSection.vue
+++ b/src/jmapNew/theme/ningbo_01/menus/menuSection.vue
@@ -8,6 +8,7 @@
     <notice-info ref="noticeInfo" pop-class="ningbo-01__systerm" />
     <set-fault ref="setFault" pop-class="ningbo-01__systerm" />
     <train-add-plan ref="trainAddPlan" pop-class="ningbo-01__systerm" />
+    <load-spare-train ref="loadSpareTrain" pop-class="ningbo-01__systerm" />
   </div>
 </template>
 
@@ -15,6 +16,7 @@
 import PopMenu from '@/components/PopMenu';
 import SectionControl from '@/jmapNew/theme/components/menus/dialog/sectionControl';
 import TrainAddPlan from '@/jmapNew/theme/components/menus/dialog/trainAddPlan';
+import LoadSpareTrain from '@/jmapNew/theme/components/menus/dialog/loadSpareTrain';
 import SetFault from '@/jmapNew/theme/components/menus/dialog/setFault';
 import SectionUnLock from '@/jmapNew/theme/components/menus/dialog/sectionUnLock';
 import SpeedLimitControl from '@/jmapNew/theme/components/menus/dialog/speedCmdControl';
@@ -36,7 +38,8 @@ export default {
         AlxeEffective,
         NoticeInfo,
         TrainAddPlan,
-        SetFault
+        SetFault,
+        LoadSpareTrain
     },
     props: {
         selected: {
@@ -120,6 +123,11 @@ export default {
                     label: '触发故障管理',
                     handler: this.triggerFaultManagement,
                     cmdType: CMD.Fault.CMD_TRIGGER_FAULT
+                },
+                {
+                    label: '设置备用车',
+                    handler: this.loadSpare,
+                    cmdType: CMD.Section.CMD_TRAIN_LOAD_SPARE_TRAIN
                 }
             ]
         };
@@ -270,6 +278,13 @@ export default {
                 }
             });
         },
+        loadSpare() {
+            commitOperate(menuOperate.Section.loadSpareTrain, {sectionCode:this.selected.code}).then(({valid, operate})=>{
+                if (valid) {
+                    this.$refs.loadSpareTrain.doShow(operate, this.selected);
+                }
+            });
+        },
         // 设置故障
         setStoppage() {
             commitOperate(menuOperate.Common.setFault, { code: this.selected.code }, 0).then(({valid, operate})=>{
diff --git a/src/jmapNew/theme/ningbo_01/menus/menuSwitch.vue b/src/jmapNew/theme/ningbo_01/menus/menuSwitch.vue
index 2ff620c8f..18d8095d1 100644
--- a/src/jmapNew/theme/ningbo_01/menus/menuSwitch.vue
+++ b/src/jmapNew/theme/ningbo_01/menus/menuSwitch.vue
@@ -184,15 +184,15 @@ export default {
             this.menu = MenuContextHandler.covert(this.menuNormal);
             // 故障模式菜单列表
             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;
-                }
+                // if (!this.$store.state.scriptRecord.bgSet) {
+                const menuHook = [{
+                    label: '道岔钩锁',
+                    handler: this.hookLock
+                }];
+                this.menu = [...this.menuForce, ...menuHook];
+                // } else {
+                //     this.menu = this.menuForce;
+                // }
             }
         },
         doShow(point) {
diff --git a/src/jmapNew/theme/ningbo_01/planConvert.js b/src/jmapNew/theme/ningbo_01/planConvert.js
index 69faa50a4..5e73b8dc2 100644
--- a/src/jmapNew/theme/ningbo_01/planConvert.js
+++ b/src/jmapNew/theme/ningbo_01/planConvert.js
@@ -152,7 +152,8 @@ export default {
                             if (index == 0 && train.stationTimeList[index].stationCode != train.stationTimeList[index + 1].stationCode ||
 								index == train.stationTimeList.length - 2 && train.stationTimeList[index].secondTime != train.stationTimeList[index + 1].secondTime ||
 								index > 0 && index < train.stationTimeList.length - 1) {
-                                const aa = `${train.directionCode}${train.tripNumber}`;
+                                // ${train.directionCode}
+                                const aa = `${train.tripNumber}`;
                                 opt.data.push([elem.secondTime, this.getCoordYByElem(stations, kmRangeCoordMap, elem, elem.directionCode, false), elem.stationCode, aa, `${service.serviceNumber}${train.tripNumber}${train.destinationCode || ''}`]);
                             }
                         });
diff --git a/src/jmapNew/theme/ningbo_03/menus/menuSwitch.vue b/src/jmapNew/theme/ningbo_03/menus/menuSwitch.vue
index 7f153a998..a666f4f4f 100644
--- a/src/jmapNew/theme/ningbo_03/menus/menuSwitch.vue
+++ b/src/jmapNew/theme/ningbo_03/menus/menuSwitch.vue
@@ -179,15 +179,15 @@ export default {
             this.menu = MenuContextHandler.covert(this.menuNormal);
             // 故障模式菜单列表
             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;
-                }
+                // if (!this.$store.state.scriptRecord.bgSet) {
+                const menuHook = [{
+                    label: '道岔钩锁',
+                    handler: this.hookLock
+                }];
+                this.menu = [...this.menuForce, ...menuHook];
+                // } else {
+                //     this.menu = this.menuForce;
+                // }
             }
         },
         doShow(point) {
diff --git a/src/jmapNew/theme/ningbo_03/planConvert.js b/src/jmapNew/theme/ningbo_03/planConvert.js
index 32d2fd84b..1cf586631 100644
--- a/src/jmapNew/theme/ningbo_03/planConvert.js
+++ b/src/jmapNew/theme/ningbo_03/planConvert.js
@@ -138,7 +138,8 @@ export default {
                             if (index == 0 && train.stationTimeList[index].stationCode != train.stationTimeList[index + 1].stationCode ||
 								index == train.stationTimeList.length - 2 && train.stationTimeList[index].secondTime != train.stationTimeList[index + 1].secondTime ||
 								index > 0 && index < train.stationTimeList.length - 1) {
-                                const aa = `${train.directionCode}${train.tripNumber}`;
+                                // ${train.directionCode}
+                                const aa = `${train.tripNumber}`;
                                 opt.data.push([elem.secondTime, this.getCoordYByElem(stations, kmRangeCoordMap, elem, elem.directionCode, false), elem.stationCode, aa]);
                             }
                         });
@@ -148,7 +149,8 @@ export default {
                             lastPoint = train.stationTimeList[idx - 1];
                             nextPoint = service.tripNumberDataList[j + 1].stationTimeList[1];
                             num = this.computedReentryNumber(train.tripNumber);
-                            const aa = `${train.directionCode}${train.tripNumber}`;
+                            // ${train.directionCode}
+                            const aa = `${train.tripNumber}`;
                             opt.data.push([lastPoint.secondTime, this.getCoordYByElem(stations, kmRangeCoordMap, lastPoint, train.directionCode, true, num), lastPoint.stationCode, aa]);
                             opt.data.push([nextPoint.secondTime, this.getCoordYByElem(stations, kmRangeCoordMap, nextPoint, train.directionCode, true, num), nextPoint.stationCode, aa]);
                         }
diff --git a/src/jmapNew/theme/race_01/menus/dialog/alxeEffective.vue b/src/jmapNew/theme/race_01/menus/dialog/alxeEffective.vue
new file mode 100644
index 000000000..3335a31b9
--- /dev/null
+++ b/src/jmapNew/theme/race_01/menus/dialog/alxeEffective.vue
@@ -0,0 +1,407 @@
+<template>
+  <el-dialog v-dialogDrag :z-index="2000" class="ningbo-01__systerm alxe-effective" :title="title" :visible.sync="show" width="420px" :before-close="doClose" :modal="false" :close-on-click-modal="false">
+    <div style="padding: 10px 20px;border: 1px solid lightgray;">
+      <span class="base-label">准备</span>
+      <div style="margin-top: -10px">
+        <el-row type="flex" justify="left">
+          <el-col :span="9">车站</el-col>
+          <el-col :span="9">轨道/计轴</el-col>
+        </el-row>
+        <el-row type="flex" justify="left">
+          <el-col :span="9">
+            <el-input v-model="model.stationName" :type="type" size="mini" :disabled="true" />
+          </el-col>
+          <el-col :span="9">
+            <el-input v-model="model.sectionName" :type="type" size="mini" :disabled="true" />
+          </el-col>
+          <el-col :span="4" :offset="1">
+            <el-button :id="domIdConfirm1" size="mini" :disabled="type==='password'" @click="commitOnce">确认</el-button>
+          </el-col>
+        </el-row>
+      </div>
+    </div>
+    <div style="padding: 10px 20px;border: 1px solid lightgray;margin-top: 10px">
+      <span class="base-label">确认</span>
+      <div style="margin-top: -10px">
+        <el-row type="flex" justify="left">
+          <el-col :span="9">车站</el-col>
+          <el-col :span="9">轨道/计轴</el-col>
+        </el-row>
+        <el-row type="flex" justify="left">
+          <el-col :span="9">
+            <el-select
+              :id="domIdChoose1"
+              ref="chooseStation"
+              v-model="model.confirmStationCode"
+              filterable
+              size="mini"
+              :disabled="type==='text'"
+              @change="stationSelectChange"
+            >
+              <el-option v-for="(option,index) in filterStationList" :key="index" :label="option.name" :value="option.code" />
+            </el-select>
+          </el-col>
+          <el-col :span="9">
+            <el-select
+              :id="domIdChoose2"
+              ref="chooseSection"
+              v-model="model.confirmSectionCode"
+              filterable
+              size="mini"
+              :disabled="type==='text'"
+              @change="sectionSelectChange"
+            >
+              <el-option v-for="(option,index) in randomSectionList" :key="index" :label="option.name" :value="option.code" />
+            </el-select>
+          </el-col>
+          <el-col :span="4" :offset="1">
+            <el-button
+              :id="domIdConfirm2"
+              size="mini"
+              :loading="loading"
+              :disabled="type==='text'"
+              @click="commit"
+            >确认</el-button>
+          </el-col>
+        </el-row>
+      </div>
+    </div>
+    <el-row type="flex" justify="left" style="margin-top:20px;margin-bottom: 10px;">
+      <el-col :span="6" :offset="1">操作倒计时</el-col>
+      <el-col :span="16">
+        <el-input v-model="model.time" size="mini" :readonly="true" />
+      </el-col>
+    </el-row>
+    <el-row>
+      <el-col :offset="1">状态</el-col>
+    </el-row>
+    <el-row>
+      <el-col :offset="1" :span="23">
+        <el-input v-model="model.status" type="textarea" :rows="2" placeholder />
+      </el-col>
+    </el-row>
+    <el-row class="botton-group" style="margin-top:20px">
+      <el-col :span="4" :offset="10">
+        <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 NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
+import CMD from '@/scripts/cmdPlugin/CommandEnum';
+import {mouseCancelState} from '@/jmapNew/theme/components/utils/menuItemStatus';
+
+export default {
+    name: 'AlxeEffective',
+    components: {
+        NoticeInfo
+    },
+    data() {
+        return {
+            dialogShow: false,
+            loading: false,
+            type: 'text',
+            timeout: 1000,
+            stepNum: 0,
+            task: null,
+            model: {
+                stationName: '',
+                sectionName: '',
+                stationCode: '',
+                sectionCode: '',
+                confirmStationCode: '',
+                confirmSectionCode: '',
+                status: '',
+                time: 0
+            },
+            selected: null,
+            operate: null,
+            operation: '',
+            randomSectionList: []
+        };
+    },
+    computed: {
+        ...mapGetters('map', ['stationList', 'sectionList']),
+        filterStationList() {
+            const list = [];
+            if (this.stationList) {
+                this.stationList.forEach(elem => {
+                    if (
+                        list.findIndex(it => {
+                            return it.name == elem.name;
+                        }) < 0
+                    ) {
+                        list.push({ name: elem.name, code: elem.code });
+                    }
+                });
+            }
+            return list;
+        },
+        show() {
+            return this.dialogShow && !this.$store.state.menuOperation.break;
+        },
+        domIdConfirm1() {
+            if (this.operation == OperationEvent.Section.alxeEffective.menu.operation) {
+                return OperationEvent.Section.alxeEffective.confirm1.domId;
+            } else if (this.operation == OperationEvent.Switch.alxeEffective.menu.operation) {
+                return OperationEvent.Switch.alxeEffective.confirm1.domId;
+            }
+            return '';
+        },
+        domIdConfirm2() {
+            if (this.operation == OperationEvent.Section.alxeEffective.menu.operation) {
+                return OperationEvent.Section.alxeEffective.confirm2.domId;
+            } else if (this.operation == OperationEvent.Switch.alxeEffective.menu.operation) {
+                return OperationEvent.Switch.alxeEffective.confirm2.domId;
+            }
+            return '';
+        },
+        domIdChoose1() {
+            if (this.operation == OperationEvent.Section.alxeEffective.menu.operation) {
+                return OperationEvent.Section.alxeEffective.choose1.domId;
+            } else if (this.operation == OperationEvent.Switch.alxeEffective.menu.operation) {
+                return OperationEvent.Switch.alxeEffective.choose1.domId;
+            }
+            return '';
+        },
+        domIdChoose2() {
+            if (this.operation == OperationEvent.Section.alxeEffective.menu.operation) {
+                return OperationEvent.Section.alxeEffective.choose2.domId;
+            } else if (this.operation == OperationEvent.Switch.alxeEffective.menu.operation) {
+                return OperationEvent.Switch.alxeEffective.choose2.domId;
+            }
+            return '';
+        },
+        domIdCancel() {
+            return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
+        },
+        title() {
+            return '确认计轴恢复工作';
+        }
+    },
+    watch: {
+        '$store.state.map.keyboardEnterCount': function (val) {
+            if (this.show) {
+                if (this.type !== 'password') {
+                    this.commitOnce();
+                } else if (this.type !== 'text') {
+                    this.commit();
+                }
+            }
+        }
+    },
+    mounted() {
+        this.$nextTick(() => {
+            this.$store.dispatch('training/tipReload');
+        });
+    },
+    methods: {
+        stopTask() {
+            if (this.task) {
+                clearInterval(this.task);
+                this.task = null;
+            }
+
+            if (this.stepNum < 3) {
+                this.$store.dispatch('training/backSteps', this.stepNum);
+                this.$store.dispatch('training/emitTipFresh');
+                this.model.name = '';
+                this.model.time = '';
+                this.type = 'text';
+            }
+        },
+        doShow(operate, selected) {
+            this.selected = selected;
+            this.operate = operate || {};
+            this.operation = operate.operation;
+            this.status = '';
+            this.model.stationName = '';
+            this.model.sectionName = '';
+            this.model.confirmStationCode = '';
+            this.model.confirmSectionCode = '';
+            this.model.sectionCode = '';
+            this.model.stationCode = '';
+            if (selected) {
+                this.model.sectionCode = selected.code;
+                if (selected && selected._type.toUpperCase() === 'Section'.toUpperCase()) {
+                    const section = this.$store.getters['map/getDeviceByCode'](selected.parentCode);
+                    const hasParentCode = (this.selected.type == '02');
+                    if (section && hasParentCode) {
+                        this.model.sectionName = `${section.name}-${selected.name}(${selected.code})`;
+                    } else {
+                        this.model.sectionName = `${selected.name}(${selected.code})`;
+                    }
+                } else if (selected._type.toUpperCase() === 'Switch'.toUpperCase()) {
+                    const section = this.$store.getters['map/getDeviceByCode'](selected.sectionParentCode);
+                    if (section) {
+                        this.model.sectionName = `${section.name}(${section.code})`;
+                        this.model.sectionCode = section.code;
+                    }
+                }
+                const station = this.$store.getters['map/getDeviceByCode'](selected.stationCode);
+                if (station) {
+                    this.model.stationName = station.name;
+                    this.model.stationCode = station.code;
+                }
+            }
+
+            this.stepNum = 0;
+            this.loading = false;
+            this.dialogShow = true;
+            this.stopTask();
+            this.$nextTick(function() {
+                this.$store.dispatch('training/emitTipFresh');
+            });
+        },
+        doClose() {
+            this.dialogShow = false;
+            this.$store.dispatch('training/emitTipFresh');
+            mouseCancelState(this.selected);
+        },
+        getSectionList(code) {
+            this.randomSectionList = [];
+            this.sectionList.forEach(section => {
+                if (section.stationCode == code) {
+                    let name = `${section.name}(${section.code})`;
+                    if (section.type == '02') {
+                        const sectionParent = this.$store.getters['map/getDeviceByCode'](section.parentCode);
+                        name = `${sectionParent.name}-${section.name}(${section.code})`;
+                    }
+                    this.randomSectionList.push({ name: `${name}`, code: section.code });
+                }
+            });
+        },
+        waitSelectEvent() {
+            if (!this.$store.state.menuOperation.break) {
+                this.model.time -= 1;
+                if (this.model.time <= 0) {
+                    this.stopTask();
+                }
+            }
+        },
+        commitOnce() {
+            this.stepNum = 1;
+            const operate = {
+                operation: ''
+            };
+
+            if (this.operation == OperationEvent.Section.alxeEffective.menu.operation) {
+                operate.operation = OperationEvent.Section.alxeEffective.confirm1.operation;
+            } else if (this.operation == OperationEvent.Switch.alxeEffective.menu.operation) {
+                operate.operation = OperationEvent.Switch.alxeEffective.confirm1.operation;
+            }
+
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    this.type = 'password';
+                    this.model.time = 60;
+                    this.task = setInterval(this.waitSelectEvent, this.timeout);
+                }
+            });
+        },
+        stationSelectChange(code) {
+            const operate = {
+                operation: '',
+                val: code
+            };
+            this.getSectionList(code);
+
+            if (this.operation == OperationEvent.Section.alxeEffective.menu.operation) {
+                operate.operation = OperationEvent.Section.alxeEffective.choose1.operation;
+            } else if (this.operation == OperationEvent.Switch.alxeEffective.menu.operation) {
+                operate.operation = OperationEvent.Switch.alxeEffective.choose1.operation;
+            }
+
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                this.$refs.chooseStation.blur();
+            });
+        },
+        sectionSelectChange(code) {
+            const operate = {
+                operation: '',
+                val: code
+            };
+
+            if (this.operation == OperationEvent.Section.alxeEffective.menu.operation) {
+                operate.operation = OperationEvent.Section.alxeEffective.choose2.operation;
+            } else if (this.operation == OperationEvent.Switch.alxeEffective.menu.operation) {
+                operate.operation = OperationEvent.Switch.alxeEffective.choose2.operation;
+            }
+
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                this.$refs.chooseSection.blur();
+            });
+        },
+        /** 确认计轴恢复工作*/
+        commit() {
+            const operate = {
+                over: true,
+                operation: '',
+                cmdType: ''
+            };
+
+            if (this.operation == OperationEvent.Section.alxeEffective.menu.operation) {
+                operate.operation = OperationEvent.Section.alxeEffective.confirm2.operation;
+                operate.cmdType = CMD.Section.CMD_SECTION_COMFIRMATION_AXLE;
+            } else if (this.operation == OperationEvent.Switch.alxeEffective.menu.operation) {
+                operate.operation = OperationEvent.Switch.alxeEffective.confirm2.operation;
+                operate.cmdType = CMD.Switch.CMD_SWITCH_COMFIRMATION_AXLE;
+            }
+
+            this.model.status = '';
+            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.loading = false;
+                    if (valid) {
+                        this.type = 'text';
+                        this.stopTask();
+                    }
+                }).catch(() => {
+                    this.loading = false;
+                    this.doClose();
+                    this.$refs.noticeInfo.doShow();
+                });
+            } else {
+                if (this.model.stationCode != this.model.confirmStationCode) {
+                    this.model.status = '车站选择错误';
+                } else if (
+                    this.model.sectionCode != this.model.confirmSectionCode
+                ) {
+                    this.model.status = '区段选择错误';
+                }
+            }
+        },
+        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>
+    .alxe-effective .context {
+        height: 80px !important;
+    }
+</style>
diff --git a/src/jmapNew/theme/race_01/menus/dialog/childDialog/confirmControl.vue b/src/jmapNew/theme/race_01/menus/dialog/childDialog/confirmControl.vue
new file mode 100644
index 000000000..6666d8f79
--- /dev/null
+++ b/src/jmapNew/theme/race_01/menus/dialog/childDialog/confirmControl.vue
@@ -0,0 +1,152 @@
+<template>
+  <el-dialog
+    v-dialogDrag
+    class="ningbo-01__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="ningbo-01__systerm" />
+  </el-dialog>
+</template>
+
+<script>
+import { OperationEvent } from '@/scripts/ConstDic';
+import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo';
+import {menuOperate, commitOperate} from '@/jmapNew/theme/components/utils/menuOperate';
+
+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 '信号关灯';
+            } else if (this.operation === OperationEvent.StationStand.setBackStrategy.menu.operation) {
+                return '设置折返策略';
+            }
+            return '';
+        },
+        domIdCancel() {
+            return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
+        },
+        domIdConfirm() {
+            if (this.operation === OperationEvent.Signal.signalClose.menu.operation) {
+                /** 信号关灯*/
+                return OperationEvent.Signal.signalClose.confirm.domId;
+            } else if (this.operation === OperationEvent.StationStand.setBackStrategy.menu.operation) {
+                /** 设置折返策略*/
+                return OperationEvent.StationStand.setBackStrategy.confirm.domId;
+            }
+            return '';
+        }
+    },
+    mounted() {
+        this.$nextTick(() => {
+            this.$store.dispatch('training/tipReload');
+        });
+    },
+    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();
+            } else if (this.operation === OperationEvent.StationStand.setBackStrategy.menu.operation) {
+                /** 设置折返策略*/
+                this.setBackStrategy();
+            }
+        },
+        // 信号关灯
+        signalClose() {
+            this.sendCommand(menuOperate.Signal.signalClose);
+        },
+        // 设置折返策略
+        setBackStrategy() {
+            this.sendCommand(menuOperate.StationStand.setBackStrategy);
+        },
+        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();
+            });
+        },
+        sendCommand(operate) {
+            this.loading = true;
+            commitOperate(operate, {}, 2).then(({valid})=>{
+                this.loading = false;
+                if (valid) {
+                    this.doClose();
+                }
+            }).catch(() => {
+                this.loading = false;
+                this.doClose();
+                this.$refs.noticeInfo.doShow();
+            });
+        }
+    }
+};
+</script>
+<style>
+.confirm-control .context {
+    padding-bottom: 40px !important;
+    border: 1px solid lightgray;
+}
+</style>
diff --git a/src/jmap/theme/fuzhou_01/menus/dialog/childDialog/confirmSignalUnlock.vue b/src/jmapNew/theme/race_01/menus/dialog/childDialog/confirmSignalUnlock.vue
similarity index 90%
rename from src/jmap/theme/fuzhou_01/menus/dialog/childDialog/confirmSignalUnlock.vue
rename to src/jmapNew/theme/race_01/menus/dialog/childDialog/confirmSignalUnlock.vue
index 7ee9783b4..378e19ce1 100644
--- a/src/jmap/theme/fuzhou_01/menus/dialog/childDialog/confirmSignalUnlock.vue
+++ b/src/jmapNew/theme/race_01/menus/dialog/childDialog/confirmSignalUnlock.vue
@@ -1,7 +1,7 @@
 <template>
   <el-dialog
     v-dialogDrag
-    class="fuzhou-01__systerm route-unlock-confirm"
+    class="ningbo-01__systerm route-unlock-confirm"
     :title="title"
     :visible.sync="show"
     width="500px"
@@ -12,14 +12,14 @@
     append-to-body
   >
     <div style="height: 60px; padding-left: 20px">
-      <span>{{ $t('menu.in') }}{{ stationName }}【{{ signalName }}】{{ $t('menu.signalConfirmed') }}</span>
+      <span>在{{ stationName }}【{{ signalName }}】信号机，信号解锁，确认下达吗？</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">{{ $t('global.confirm') }}</el-button>
+        <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">{{ $t('global.cancel') }}</el-button>
+        <el-button :id="domIdCancel" @click="cancel">取 消</el-button>
       </el-col>
     </el-row>
   </el-dialog>
@@ -43,7 +43,7 @@ export default {
             return this.dialogShow && !this.$store.state.menuOperation.break;
         },
         title() {
-            return this.$t('menu.signalDeblocking');
+            return '信号解封';
         },
         domIdCancel() {
             return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
diff --git a/src/jmapNew/theme/race_01/menus/dialog/childDialog/confirmTip.vue b/src/jmapNew/theme/race_01/menus/dialog/childDialog/confirmTip.vue
new file mode 100644
index 000000000..5e3ed5a50
--- /dev/null
+++ b/src/jmapNew/theme/race_01/menus/dialog/childDialog/confirmTip.vue
@@ -0,0 +1,76 @@
+<template>
+  <el-dialog
+    v-dialogDrag
+    class="ningbo-01__systerm confirm-control-speed"
+    :title="title"
+    :visible.sync="show"
+    width="340px"
+    :before-close="doClose"
+    :z-index="2000"
+    :modal="false"
+    :close-on-click-modal="false"
+    append-to-body
+  >
+    <div style="height: 60px; padding-left: 20px">
+      <span style="font-size: 18px">{{ message }}</span>
+    </div>
+    <el-row justify="center" class="button-group">
+      <el-col :span="11">
+        <el-button :id="confirmId" type="primary" @click="confirm">确定</el-button>
+      </el-col>
+      <el-col :span="11" :offset="2">
+        <el-button @click="doClose">取 消</el-button>
+      </el-col>
+    </el-row>
+  </el-dialog>
+</template>
+
+<script>
+// import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
+
+export default {
+    name: 'ConfirmTip',
+    data() {
+        return {
+            dialogShow: false,
+            message: '',
+            confirmId: ''
+        };
+    },
+    computed: {
+        show() {
+            return this.dialogShow && !this.$store.state.menuOperation.break;
+        },
+        title() {
+            return '提示';
+        }
+    },
+    mounted() {
+
+    },
+    methods: {
+        doShow(operate) {
+            this.message = operate.message;
+            this.dialogShow = true;
+            this.confirmId = operate.confirmId;
+        },
+        confirm() {
+            this.$emit('close');
+        },
+        doClose() {
+            this.dialogShow = false;
+        }
+    }
+};
+
+</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/jmapNew/theme/race_01/menus/dialog/routeSelection.vue b/src/jmapNew/theme/race_01/menus/dialog/routeSelection.vue
new file mode 100644
index 000000000..d27e84ecc
--- /dev/null
+++ b/src/jmapNew/theme/race_01/menus/dialog/routeSelection.vue
@@ -0,0 +1,249 @@
+<template>
+  <el-dialog v-dialogDrag class="ningbo-01__systerm route-setting" :title="title" :visible.sync="show" width="350px" :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>
+    <el-row style="margin-top: 10px; line-height: 30px;">
+      <el-col :span="11"><span>进路列表</span></el-col>
+      <el-col :span="11" :offset="2">
+        <!-- <el-button class="expand" @click="expandPath">展开进路预览</el-button> -->
+      </el-col>
+    </el-row>
+    <el-table ref="table" :data="tempData" border :cell-style="tableStyle" style="width: 100%; height: 120px; margin-top:10px" size="mini" highlight-current-row :show-header="false" @row-click="clickEvent">
+      <el-table-column :id="domIdChoose" prop="name" style="margin-left:30px" />
+    </el-table>
+    <el-row justify="center" class="button-group">
+      <el-col :span="8" :offset="4">
+        <el-button :id="domIdConfirm" type="primary" :loading="loading" :disabled="commitDisabled" @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="ningbo-01__systerm" />
+  </el-dialog>
+</template>
+
+<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 { deepAssign } from '@/utils/index';
+import {mouseCancelState} from '@/jmapNew/theme/components/utils/menuItemStatus';
+import { mapGetters } from 'vuex';
+
+export default {
+    name: 'RouteSelection',
+    components: {
+        NoticeInfo
+    },
+    data() {
+        return {
+            tempData: [],
+            beforeSectionList: [],
+            dialogShow: false,
+            loading: false,
+            selected: null,
+            row: null,
+            operation: '',
+            display: true,
+            stationName: '',
+            signalName: '',
+            tableStyle: {
+                'border-bottom': 'none'
+            }
+        };
+    },
+    computed: {
+        ...mapGetters('map', [
+            'overlapData'
+        ]),
+        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.menu.domId : '';
+        },
+        title() {
+            return '进路设置';
+        },
+        commitDisabled() {
+            let disabled = true;
+            if (this.row) {
+                disabled = !this.row.canSetting;
+            }
+            return disabled;
+        }
+    },
+    watch: {
+        '$store.state.map.keyboardEnterCount': function (val) {
+            if (this.show && !this.commitDisabled) {
+                this.commit();
+            }
+        }
+    },
+    mounted() {
+        this.$nextTick(() => {
+            this.$store.dispatch('training/tipReload');
+        });
+    },
+    methods: {
+        expandPath() {
+            console.log('展开进路预览');
+        },
+        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;
+                    }
+                }
+                const routeList = JSON.parse(JSON.stringify(tempData || []));
+
+                this.tempData = routeList;
+                this.tempData.forEach(route => {
+                    if (route.turnBack) {
+                        route.name = `${route.name}(Z)`;
+                    }
+                });
+                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');
+            mouseCancelState(this.selected);
+        },
+        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.row.canSetting = true;
+                this.restoreBeforeDevices();
+                const containSectionList = [];
+                if (!row.setting) {
+                    // 设置选中区段为切除状态
+                    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);
+                            }
+                        });
+                    }
+                    if (this.overlapData[row.overlapCode] && this.overlapData[row.overlapCode].pathList && this.overlapData[row.overlapCode].pathList.length) {
+                        this.overlapData[row.overlapCode].pathList.forEach(item => {
+                            if (item.sectionList && item.sectionList.length) {
+                                item.sectionList.forEach(elem => {
+                                    const section = deepAssign({}, this.$store.getters['map/getDeviceByCode'](elem));
+                                    if (section.logicSectionCodeList && section.logicSectionCodeList.length) {
+                                        section.logicSectionCodeList.forEach(logicSectionCode => {
+                                            const sec = deepAssign({}, this.$store.getters['map/getDeviceByCode'](logicSectionCode));
+                                            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 });
+                        }
+                    });
+                } else {
+                    this.$refs.noticeInfo.doShow('当前进路不允许排列, 与其他进路可能发生冲突');
+                }
+            }
+        },
+        commit() {
+            if (this.row && this.row.canSetting) {
+                this.loading = true;
+                commitOperate(menuOperate.Signal.arrangementRoute, {routeCode:this.row.code}, 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>
diff --git a/src/jmapNew/theme/race_01/menus/dialog/routerCommand.vue b/src/jmapNew/theme/race_01/menus/dialog/routerCommand.vue
new file mode 100644
index 000000000..476a1f37e
--- /dev/null
+++ b/src/jmapNew/theme/race_01/menus/dialog/routerCommand.vue
@@ -0,0 +1,144 @@
+<template>
+  <div>
+    <el-dialog
+      v-dialogDrag
+      class="ningbo-01__systerm route-lock"
+      :title="title"
+      :visible.sync="show"
+      width="340px"
+      :before-close="doClose"
+      :z-index="2000"
+      :modal="false"
+      :close-on-click-modal="false"
+    >
+      <el-row class="header" style="line-height: 44px;">
+        {{ message }}
+      </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>
+      <notice-info ref="noticeInfo" pop-class="ningbo-01__systerm" />
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { mapGetters } from 'vuex';
+import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
+import {menuOperate, commitOperate} from '@/jmapNew/theme/components/utils/menuOperate';
+import {mouseCancelState} from '@/jmapNew/theme/components/utils/menuItemStatus';
+
+export default {
+    name: 'RouteLock',
+    components: {
+        NoticeInfo
+    },
+    data() {
+        return {
+            dialogShow: false,
+            loading: false,
+            message: '',
+            selected: null,
+            operate: null
+        };
+    },
+    computed: {
+        ...mapGetters('map', [
+            'signalList'
+        ]),
+        show() {
+            return this.dialogShow && !this.$store.state.menuOperation.break;
+        },
+        domIdCancel() {
+            return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
+        },
+        domIdConfirm() {
+            return this.dialogShow ? OperationEvent.Signal.cancelGuide.menu.domId : '';
+        },
+        title() {
+            if (this.operate == OperationEvent.Signal.cancelGuide.menu.operation) {
+                return '人解进路';
+            } else if (this.operate == OperationEvent.Signal.guide.menu.operation) {
+                return '办理引导进路';
+            }
+            return '';
+        }
+    },
+    watch: {
+        '$store.state.map.keyboardEnterCount': function (val) {
+            if (this.show) {
+                this.commit();
+            }
+        }
+    },
+    mounted() {
+        this.$nextTick(() => {
+            this.$store.dispatch('training/tipReload');
+        });
+    },
+    methods: {
+        doShow(operate, selected, message) {
+            this.selected = selected;
+            this.operate = operate.operation;
+            this.message = message;
+            this.dialogShow = true;
+            this.$nextTick(() => {
+                this.$store.dispatch('training/emitTipFresh');
+            });
+        },
+        doClose() {
+            this.loading = false;
+            this.dialogShow = false;
+            this.$store.dispatch('training/emitTipFresh');
+            mouseCancelState(this.selected);
+        },
+        commit() {
+            if (this.operate == OperationEvent.Signal.cancelGuide.menu.operation) {
+                this.cancelGuide();
+            } else if (this.operate == OperationEvent.Signal.guide.menu.operation) {
+                this.guide();
+            }
+        },
+        // 人解进路 / 取消进路引导
+        cancelGuide() {
+            this.sendCommand(menuOperate.Signal.cancelGuide);
+        },
+        // 引导进路
+        guide() {
+            this.sendCommand(menuOperate.Signal.guide);
+        },
+        sendCommand(operate) {
+            this.loading = true;
+            commitOperate(operate, {}, 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>
diff --git a/src/jmapNew/theme/race_01/menus/dialog/sectionAlxeReset.vue b/src/jmapNew/theme/race_01/menus/dialog/sectionAlxeReset.vue
new file mode 100644
index 000000000..d258b7ff3
--- /dev/null
+++ b/src/jmapNew/theme/race_01/menus/dialog/sectionAlxeReset.vue
@@ -0,0 +1,164 @@
+<template>
+  <el-dialog
+    v-dialogDrag
+    class="ningbo-01__systerm section-control"
+    :title="title"
+    :visible.sync="show"
+    width="300px"
+    :before-close="doClose"
+    :z-index="2000"
+    :modal="false"
+    :close-on-click-modal="false"
+  >
+    <el-row class="header">
+      <el-col :span="24">
+        <span style="margin-right: 10px;">区段:</span>
+        <el-select
+          :id="domIdChoose"
+          v-model="sectionCode"
+          filterable
+          size="mini"
+          @change="sectionSelectChange"
+        >
+          <el-option v-for="(option,index) in switchAndPhySicalSectionList" :key="index" :label="option.name" :value="option.name" />
+        </el-select>
+      </el-col>
+    </el-row>
+    <el-row justify="center" class="button-group">
+      <el-col :span="10" :offset="2">
+        <el-button :id="domIdConfirm" type="primary" :loading="loading" @click="commit">确定</el-button>
+      </el-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="ningbo-01__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 CMD from '@/scripts/cmdPlugin/CommandEnum';
+
+export default {
+    name: 'SectionControl',
+    components: {
+        NoticeInfo
+    },
+    data() {
+        return {
+            dialogShow: false,
+            loading: false,
+            operation: '',
+            sectionCode: ''
+        };
+    },
+    computed: {
+        ...mapGetters('map', [
+            'sectionList'
+        ]),
+        switchAndPhySicalSectionList() {
+            let list = [];
+            if (this.sectionList && this.sectionList.length) {
+                list = this.sectionList.filter(elem => { return elem.type === '01' || elem.type === '03'; });
+            }
+            return list;
+        },
+        show() {
+            return this.dialogShow && !this.$store.state.menuOperation.break;
+        },
+        domIdChoose() {
+            return this.dialogShow ? OperationEvent.AxleReset.SetAxleReset.choose.domId : '';
+        },
+        domIdCancel() {
+            return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
+        },
+        domIdConfirm() {
+            return this.dialogShow ? OperationHandler.getDomIdByOperation(this.operation) : '';
+        },
+        title() {
+            return '计轴复位';
+        }
+    },
+    watch: {
+        '$store.state.map.keyboardEnterCount': function (val) {
+            if (this.show && !this.loading) {
+                this.commit();
+            }
+        }
+    },
+    mounted() {
+        this.$nextTick(() => {
+            this.$store.dispatch('training/tipReload');
+        });
+    },
+    methods: {
+        doShow(operate) {
+            if (!this.dialogShow) {
+                this.sectionCode = '';
+                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');
+        },
+        sectionSelectChange() {
+            const operate = {
+                operation: OperationEvent.AxleReset.SetAxleReset.choose.operation,
+                val: this.sectionCode
+            };
+
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+            });
+        },
+        commit() {
+            const operate = {
+                over: true,
+                operation: this.operation,
+                cmdType: CMD.Section.CMD_SECTION_AXIS_PRE_RESET,
+                param: {
+                    sectionCode: this.sectionCode
+                }
+            };
+
+            this.sendCommand(operate);
+        },
+        sendCommand(operate) {
+            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/race_01/menus/dialog/standBulkBuckleTrain.vue b/src/jmapNew/theme/race_01/menus/dialog/standBulkBuckleTrain.vue
new file mode 100644
index 000000000..5380b391a
--- /dev/null
+++ b/src/jmapNew/theme/race_01/menus/dialog/standBulkBuckleTrain.vue
@@ -0,0 +1,280 @@
+<template>
+  <el-dialog v-dialogDrag class="ningbo-01__systerm stand-detain-train" :title="'批量设置' + title" :visible.sync="show" width="480px" :before-close="doClose" :z-index="2000" :modal="false" :close-on-click-modal="false">
+    <el-row :id="chooseId" style="margin-top: -13px; padding: 20px 0px 5px 0;">
+      <el-col :span="11">
+        <span>上行线路设置{{ title }}</span>
+        <el-table ref="tableUp" :data="upStandList" tooltip-effect="dark" height="400" style="width: 100%;margin: 5px 0;" @selection-change="handleSelectionChangeUp">
+          <el-table-column type="selection" width="50" />
+          <el-table-column label="站台名称">
+            <template slot-scope="scope">{{ scope.row.name }}</template>
+          </el-table-column>
+        </el-table>
+        <el-checkbox v-model="upForward" style="display: block; text-align: left;margin-bottom: 5px;">正向{{ title }}</el-checkbox>
+      </el-col>
+      <el-col :span="11" :offset="2">
+        <span>下行线路设置{{ title }}</span>
+        <el-table ref="tableDown" :data="downStandList" tooltip-effect="dark" height="400" style="width: 100%;margin: 5px 0;" @selection-change="handleSelectionChangeDown">
+          <el-table-column type="selection" width="50" />
+          <el-table-column label="站台名称">
+            <template slot-scope="scope">{{ scope.row.name }}</template>
+          </el-table-column>
+        </el-table>
+        <el-checkbox v-model="downForward" style="display: block; text-align: left;margin-bottom: 5px;">正向{{ title }}</el-checkbox>
+      </el-col>
+    </el-row>
+    <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="ningbo-01__systerm" />
+  </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';
+import CMD from '@/scripts/cmdPlugin/CommandEnum';
+import {mouseCancelState} from '@/jmapNew/theme/components/utils/menuItemStatus';
+import { mapGetters } from 'vuex';
+
+export default {
+    name: 'StandDetainTrain',
+    components: {
+        NoticeInfo
+    },
+    data() {
+        return {
+            dialogShow: false,
+            loading: false,
+            selected: null,
+            operation: null,
+            standCode: '',
+            radio: '1',
+            upSelectList: [],
+            downSelectList: [],
+            upStandList: [],
+            downStandList: [],
+            upForward: true, // 上行
+            downForward: 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 ? OperationHandler.getDomIdByOperation(this.operation) : '';
+        },
+        chooseId() {
+            if (this.operation == OperationEvent.StationStand.setBulkBuckleTrain.menu.operation) {
+                return OperationEvent.StationStand.setBulkBuckleTrain.choose.domId;
+            } else if (this.operation == OperationEvent.StationStand.cancelBulkBuckleTrain.menu.operation) {
+                return OperationEvent.StationStand.cancelBulkBuckleTrain.choose.domId;
+            }
+            return '';
+        },
+        title() {
+            if (this.operation == OperationEvent.StationStand.setBulkBuckleTrain.menu.operation) {
+                return '扣车';
+            } else if (this.operation == OperationEvent.StationStand.cancelBulkBuckleTrain.menu.operation) {
+                return '取消扣车';
+            }
+            return '';
+        }
+    },
+    watch: {
+        '$store.state.map.keyboardEnterCount': function (val) {
+            if (this.show && !this.loading) {
+                this.commit();
+            }
+        }
+    },
+    mounted() {
+        this.$nextTick(() => {
+            this.$store.dispatch('training/tipReload');
+        });
+    },
+    methods: {
+        doShow(operate, selected) {
+            this.selected = selected;
+            if (!this.dialogShow) {
+                this.standName = '';
+                this.stationName = '';
+                if (selected) {
+                    this.standName = selected.name;
+                }
+                if (selected && selected._type.toUpperCase() === 'StationStand'.toUpperCase()) {
+                    this.standName = selected.name;
+                    const station = this.$store.getters['map/getDeviceByCode'](selected.deviceStationCode);
+                    if (station) {
+                        this.stationName = station.name;
+                    }
+                }
+                this.initList();
+                this.upSelectList = [];
+                this.downSelectList = [];
+
+                this.operation = operate.operation;
+                this.standCode = operate.code;
+            }
+            this.dialogShow = true;
+            this.$nextTick(function () {
+                this.$store.dispatch('training/emitTipFresh');
+            });
+        },
+        initList() {
+            this.upStandList = [];
+            this.downStandList = [];
+            if (this.stationStandList && this.stationStandList.length) {
+                this.stationStandList.filter(elem => { return !elem.small; }).forEach(item => {
+                    if (item.right) {
+                        this.upStandList.push(item);
+                    } else {
+                        this.downStandList.push(item);
+                    }
+                });
+                this.upForward = false;
+                this.downForward = false;
+                this.$nextTick(() => {
+                    this.upStandList.forEach(item => {
+                        if (item.code == this.selected.code) {
+                            this.$refs.tableUp && this.$refs.tableUp.toggleRowSelection(item);
+                            this.upForward = true;
+                        }
+                    });
+                    this.downStandList.forEach(item => {
+                        if (item.code == this.selected.code) {
+                            this.$refs.tableDown && this.$refs.tableDown.toggleRowSelection(item);
+                            this.downForward = true;
+                        }
+                    });
+                });
+            }
+        },
+        doClose() {
+            this.loading = false;
+            this.dialogShow = false;
+            this.operation = '';
+            this.$store.dispatch('training/emitTipFresh');
+            mouseCancelState(this.selected);
+        },
+        handleSelectionChangeUp(val) {
+            this.upSelectList = val;
+        },
+        handleSelectionChangeDown(val) {
+            this.downSelectList = val;
+        },
+        commit() {
+            if (this.operation == OperationEvent.StationStand.setBulkBuckleTrain.menu.operation) {
+                /** 设置扣车*/
+                this.setDetainTrain();
+            } else if (this.operation == OperationEvent.StationStand.cancelBulkBuckleTrain.menu.operation) {
+                /** 取消扣车*/
+                this.cancelDetainTrain();
+            }
+        },
+        // 批量扣车
+        setDetainTrain() {
+            const operate = {
+                over: true,
+                operation: OperationEvent.StationStand.setBulkBuckleTrain.menu.operation,
+                cmdType: CMD.Stand.CMD_STAND_SET_HOLD_TRAIN_ALL,
+                param: {
+                    rightHoldTrain: { standCodes: [], forward: this.upForward },
+                    leftHoldTrain: { standCodes: [], forward: this.downForward }
+                }
+            };
+            this.upSelectList.forEach(item => {
+                operate.param.rightHoldTrain.standCodes.push(item.code);
+            });
+            this.downSelectList.forEach(item => {
+                operate.param.leftHoldTrain.standCodes.push(item.code);
+            });
+            if (!operate.param.rightHoldTrain.forward) {
+                operate.param.rightHoldTrain.standCodes = [];
+            }
+            if (!operate.param.leftHoldTrain.forward) {
+                operate.param.leftHoldTrain.standCodes = [];
+            }
+
+            this.loading = true;
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                this.loading = false;
+                this.doClose();
+                if (!valid) {
+                    this.$refs.noticeInfo.doShow();
+                }
+            }).catch(() => {
+                this.loading = false;
+                this.doClose();
+                this.$refs.noticeInfo.doShow();
+            });
+        },
+        // 批量取消扣车
+        cancelDetainTrain() {
+            const operate = {
+                over: true,
+                operation: OperationEvent.StationStand.cancelBulkBuckleTrain.menu.operation,
+                cmdType: CMD.Stand.CMD_STAND_CANCEL_HOLD_TRAIN_ALL,
+                param: {
+                    rightHoldTrain: { standCodes: [], forward: this.upForward },
+                    leftHoldTrain: { standCodes: [], forward: this.downForward }
+                }
+            };
+            this.upSelectList.forEach(item => {
+                operate.param.rightHoldTrain.standCodes.push(item.code);
+            });
+            this.downSelectList.forEach(item => {
+                operate.param.leftHoldTrain.standCodes.push(item.code);
+            });
+            if (!operate.param.rightHoldTrain.forward) {
+                operate.param.rightHoldTrain.standCodes = [];
+            }
+            if (!operate.param.leftHoldTrain.forward) {
+                operate.param.leftHoldTrain.standCodes = [];
+            }
+
+            this.loading = true;
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                this.loading = false;
+                this.doClose();
+                if (!valid) {
+                    this.$refs.noticeInfo.doShow();
+                }
+            }).catch(() => {
+                this.loading = false;
+                this.doClose();
+                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" scope>
+
+</style>
diff --git a/src/jmapNew/theme/race_01/menus/dialog/stationBackStrategy.vue b/src/jmapNew/theme/race_01/menus/dialog/stationBackStrategy.vue
new file mode 100644
index 000000000..6f2b46f55
--- /dev/null
+++ b/src/jmapNew/theme/race_01/menus/dialog/stationBackStrategy.vue
@@ -0,0 +1,186 @@
+<template>
+  <el-dialog
+    v-dialogDrag
+    class="ningbo-01__systerm stand-run-level"
+    :title="title"
+    :visible.sync="show"
+    width="320px"
+    :before-close="doClose"
+    :z-index="2000"
+    :modal="false"
+    :close-on-click-modal="false"
+  >
+    <div style="font-size: 16px; margin-bottom: 5px;">变通节点</div>
+    <div style="margin-bottom: 5px;">
+      <el-input v-model="stationName" size="mini" disabled />
+    </div>
+    <div style="font-size: 16px; margin-bottom: 5px;">当前变通策略</div>
+    <div style="margin-bottom: 5px;">
+      <el-input v-model="stationStrategy" size="mini" disabled />
+    </div>
+    <div style="font-size: 16px; margin-bottom: 5px;">变通策略选项</div>
+    <el-table
+      ref="table"
+      :data="strategyList"
+      border
+      :cell-style="tableStyle"
+      style="width: 100%; margin-top:10px"
+      size="mini"
+      height="180"
+      highlight-current-row
+      :show-header="false"
+      @row-click="clickEvent"
+    >
+      <el-table-column :id="domIdChoose" prop="label" style="margin-left:30px" />
+    </el-table>
+    <el-row justify="center" class="button-group">
+      <el-col :span="10" :offset="2">
+        <el-button :id="domIdConfirm" type="primary" :loading="loading" :disabled="!isConfirm" @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="ningbo-01__systerm" />
+  </el-dialog>
+</template>
+
+<script>
+import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
+import {menuOperate, commitOperate} from '@/jmapNew/theme/components/utils/menuOperate';
+import { mapGetters } from 'vuex';
+
+export default {
+    name: 'StandBackStrategy',
+    components: {
+        NoticeInfo
+    },
+    data() {
+        return {
+            dialogShow: false,
+            loading: false,
+            strategyList: [],
+            stationName: '',
+            stationStrategy: '',
+            selection: [],
+            isConfirm: false,
+            strategyId: '',
+            tableStyle: {
+                'border-bottom': 'none'
+            }
+        };
+    },
+    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.Station.setBackStrategy.menu.domId : '';
+        },
+        domIdChoose() {
+            return this.dialogShow ? OperationEvent.Station.setBackStrategy.choose.domId : '';
+        },
+        title() {
+            return '策略选择';
+        }
+    },
+    watch: {
+        '$store.state.map.keyboardEnterCount': function (val) {
+            if (this.show && !this.loading && this.isConfirm) {
+                this.commit();
+            }
+        }
+    },
+    mounted() {
+        this.$nextTick(() => {
+            this.$store.dispatch('training/tipReload');
+        });
+    },
+    methods: {
+        doShow(operate, selected) {
+            this.selected = selected;
+            if (!this.dialogShow) {
+                const name = selected.optionList.find(ele => ele.id == selected.tbStrategyId).label;
+                this.stationName = selected.name || '';
+                this.stationStrategy = selected.tbStrategyId ? name : '无策略折返'; // 当前默认折返策略
+                this.strategyList = selected.optionList; // 策略列表
+            }
+
+            this.dialogShow = true;
+            this.$nextTick(function () {
+                this.$store.dispatch('training/emitTipFresh');
+            });
+        },
+        clickEvent(row, column, event) {
+            const operate = {
+                operation: OperationEvent.Station.setBackStrategy.choose.operation
+            };
+            this.strategyId = row.id;
+            this.isConfirm = true;
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                }
+            });
+        },
+        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.selection = selection;
+            }
+        },
+        doClose() {
+            this.loading = false;
+            this.dialogShow = false;
+            this.$store.dispatch('training/emitTipFresh');
+        },
+        commit() {
+            if (this.isConfirm) {
+                this.loading = true;
+                commitOperate(menuOperate.StationControl.setBackStrategy, {id: this.strategyId}, 2).then(({valid})=>{
+                    this.loading = false;
+                    if (valid) {
+                        this.doClose();
+                    }
+                }).catch(() => {
+                    this.loading = false;
+                    this.doClose();
+                    this.$refs.noticeInfo.doShow();
+                });
+            } else {
+                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>
diff --git a/src/jmapNew/theme/race_01/menus/dialog/stationControl.vue b/src/jmapNew/theme/race_01/menus/dialog/stationControl.vue
new file mode 100644
index 000000000..f79a2eb45
--- /dev/null
+++ b/src/jmapNew/theme/race_01/menus/dialog/stationControl.vue
@@ -0,0 +1,313 @@
+<template>
+  <el-dialog v-dialogDrag class="ningbo-01__systerm route-setting" :title="title" :visible.sync="show" width="540px" :before-close="doClose" :z-index="2000" :modal="false" :close-on-click-modal="false">
+    <el-row style="margin-bottom: 10px;">
+      <el-col :span="17">
+        <el-table ref="table" :data="stationLists" border style="width: 100%;" size="mini" height="260" highlight-current-row @row-click="clickEvent">
+          <el-table-column label="选择" width="50">
+            <template slot-scope="scope">
+              <el-checkbox v-model="scope.row.checked" :disabled="scope.row.disable" />
+            </template>
+          </el-table-column>
+          <el-table-column label="车站名">
+            <template slot-scope="scope">{{ scope.row.name }}</template>
+          </el-table-column>
+          <el-table-column label="当前状态">
+            <template slot-scope="scope">
+              <span v-if="scope.row.controlMode == 'Center'">遥控</span>
+              <span v-else-if="scope.row.controlMode == 'Local'">站控</span>
+              <!-- <span v-else-if="scope.row.controlMode == 'Local' && $route.query.prdType == '02'">中心请求站控</span>
+              <span v-else-if="scope.row.controlMode == 'Center' && $route.query.prdType == '01'">现地请求遥控</span> -->
+              <span v-else>获取状态中...</span>
+            </template>
+          </el-table-column>
+        </el-table>
+      </el-col>
+      <el-col :span="6" :offset="1">
+        <el-radio v-model="controlMode" label="center" :disabled="disabledAll" style="margin-bottom: 8px;">请求站控</el-radio>
+        <el-radio v-model="controlMode" label="local" :disabled="disabledAll">请求遥控</el-radio>
+      </el-col>
+    </el-row>
+    <el-row style="margin-bottom: 15px;">
+      <el-col :span="17">
+        <el-col :span="11" style="text-align: center;"><el-checkbox v-model="checkedAll" size="medium" :disabled="disabledAll" @change="selectAll">全部选择</el-checkbox></el-col>
+        <el-col :span="11" :offset="2"><el-checkbox v-model="checked2" :disabled="disabledAll" size="medium">全部确认</el-checkbox></el-col>
+      </el-col>
+      <el-col :span="5" :offset="1" style="margin-top: -56px;">
+        <el-button :id="domIdConfirm" type="primary" :disabled="commitDisabled" :loading="loading" style="margin-left: 0; margin-bottom: 10px; width: 100%;" @click="commit">应 用</el-button>
+        <el-button :id="domIdCancel" style="margin-left: 0; width: 100%;" @click="cancel">关 闭</el-button>
+      </el-col>
+    </el-row>
+    <notice-info ref="noticeInfo" pop-class="ningbo-01__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';
+import {mouseCancelState} from '@/jmapNew/theme/components/utils/menuItemStatus';
+import { mapGetters } from 'vuex';
+
+export default {
+    name: 'StationControl',
+    components: {
+        NoticeInfo
+    },
+    data() {
+        return {
+            controlMode: 'center',
+            beforeSectionList: [],
+            checkedAll: false,
+            dialogShow: false,
+            loading: false,
+            selected: null,
+            row: null,
+            operation: '',
+            stationLists: [],
+            disabledAll: false,
+            checked2: false,
+            commitDisabled:false
+        };
+    },
+    computed: {
+        ...mapGetters('map', [
+            'stationList'
+        ]),
+        show() {
+            return this.dialogShow && !this.$store.state.menuOperation.break;
+        },
+        domIdCancel() {
+            return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
+        },
+        domIdChoose() {
+            if (this.operation == OperationEvent.StationControl.requestCentralControl.menu.operation) {
+                return OperationEvent.StationControl.requestCentralControl.choose.domId;
+            } else if (this.operation == OperationEvent.StationControl.requestStationControl.menu.operation) {
+                return OperationEvent.StationControl.requestStationControl.choose.domId;
+            }
+            return '';
+        },
+        domIdConfirm() {
+            if (this.operation == OperationEvent.StationControl.requestCentralControl.menu.operation) {
+                return OperationEvent.StationControl.requestCentralControl.confirm.domId;
+            } else if (this.operation == OperationEvent.StationControl.requestStationControl.menu.operation) {
+                return OperationEvent.StationControl.requestStationControl.confirm.domId;
+            }
+            return '';
+        },
+        title() {
+            return '站遥控转换';
+        }
+    },
+    watch: {
+        '$store.state.map.controlTransfer':function (controlTransferList) {
+            controlTransferList.forEach(controlTransfer=>{
+                this.updateTableValue(controlTransfer);
+            });
+        },
+        '$store.state.map.keyboardEnterCount': function (val) {
+            if (this.show && !this.loading) {
+                this.commit();
+            }
+        }
+    },
+    mounted() {
+        this.$nextTick(() => {
+            this.$store.dispatch('training/tipReload');
+        });
+    },
+    methods: {
+        getStationList(disable) {
+            this.stationLists = [];
+            if (this.stationList && this.stationList.length) {
+                this.stationList.forEach(item => {
+                    if (item.centralized) {
+                        const station = this.$store.getters['map/getDeviceByCode'](item.code);
+                        let checked = false;
+                        if (station.code == this.selected.code) {
+                            checked = true;
+                        }
+                        const param = {
+                            checked: checked,
+                            disable: disable,
+                            code: item.code,
+                            name: item.name,
+                            controlMode: station.controlMode
+                        };
+                        this.stationLists.push(param);
+                    }
+                });
+            }
+        },
+        updateTableValue(controlTransfer) {
+            this.stationLists.forEach((row, index) => {
+                if (row.code == controlTransfer.code) {
+                    if (controlTransfer.applicantId) {
+                        this.commitDisabled = true;
+                    } else {
+                        this.commitDisabled = false;
+                    }
+                }
+            });
+            // this.tableData.forEach((row, index) => {
+            //     if (row.code == controlTransfer.code) {
+            //         if (controlTransfer.applicantId) {
+            //             row.result = this.$t('menu.menuDialog.senedMessageOne') + controlTransfer.validDuration + this.$t('menu.menuDialog.senedMessageTwo');
+            //             row.disabled = true;
+            //             row.check = false;
+            //         } else {
+            //             if (row.control != this.controlProps[controlTransfer.controlMode]) {
+            //                 row.result = this.$t('menu.menuDialog.controlModeTransfersuccees');
+            //                 row.control = this.controlProps[controlTransfer.controlMode];
+            //                 this.removeSelection(controlTransfer.code);
+            //                 row.disabled = true;
+            //                 row.check = false;
+            //             } else {
+            //                 row.result = this.$t('menu.menuDialog.controlModeTransferFailed');
+            //                 this.removeSelection(controlTransfer.code);
+            //                 row.disabled = false;
+            //                 row.check = false;
+            //             }
+            //             this.disabledClose = false;
+            //             this.disabledSure = false;
+            //         }
+            //     }
+            // });
+        },
+        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;
+        },
+        doShow(operate, selected) {
+            this.selected = selected;
+            // 如果不是断点激活，而是第一次显示，则需要设置初始值
+            if (!this.dialogShow) {
+                this.operation = operate.operation;
+                if (selected) {
+                    this.getStationList(true);
+                    this.disabledAll = true;
+                } else {
+                    this.getStationList(false);
+                    this.disabledAll = false;
+                }
+
+                if (this.operation == OperationEvent.StationControl.requestCentralControl.menu.operation) {
+                    this.controlMode = 'local';
+                } else if (this.operation == OperationEvent.StationControl.requestStationControl.menu.operation) {
+                    this.controlMode = 'center';
+                }
+            }
+            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');
+            this.$store.dispatch('socket/shiftMsgQueue');
+            mouseCancelState(this.selected);
+        },
+        restoreBeforeDevices() {
+            // 恢复之前选中设备
+            if (this.beforeSectionList && this.beforeSectionList.length) {
+                this.beforeSectionList.forEach(elem => {
+                    elem.cutOff = false;
+                });
+            }
+
+            this.$store.dispatch('training/updateMapState', [...this.beforeSectionList]);
+            this.beforeSectionList = [];
+        },
+        selectAll() {
+            this.stationLists.forEach(row => {
+                if (this.checkedAll) {
+                    row.checked = true;
+                } else {
+                    row.checked = false;
+                }
+            });
+        },
+        clickEvent(row, event, column) {
+            this.row = row;
+            if (row) {
+                // 设置选中指令
+                const operate = {
+                    operation: OperationEvent.Signal.arrangementRoute.choose.operation
+                };
+
+                this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                    if (valid) {
+                        this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    }
+                });
+            }
+        },
+        commit() {
+            const list = [];
+            this.stationLists.forEach(row => {
+                if (row.checked) {
+                    list.push(row.code);
+                }
+            });
+            if (list && list.length) {
+                const operate = {
+                    over: true,
+                    operation: '',
+                    cmdType: '',
+                    param: {
+                        stationCodes: list
+                    }
+                };
+                if (this.controlMode == 'center') {
+                    operate.cmdType = CMD.ControlConvertMenu.CMD_CM_APPLY_FOR_STATION_CONTROL;
+                    operate.operation = OperationEvent.StationControl.requestStationControl.confirm.operation;
+                } else if (this.controlMode == 'local') {
+                    operate.cmdType = CMD.ControlConvertMenu.CMD_CM_APPLY_FOR_CENTER_CONTROL;
+                    operate.operation = OperationEvent.StationControl.requestCentralControl.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 = {
+                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/race_01/menus/dialog/trainDefine.vue b/src/jmapNew/theme/race_01/menus/dialog/trainDefine.vue
new file mode 100644
index 000000000..da0642ed6
--- /dev/null
+++ b/src/jmapNew/theme/race_01/menus/dialog/trainDefine.vue
@@ -0,0 +1,181 @@
+<template>
+  <el-dialog
+    v-dialogDrag
+    class="ningbo-01__systerm train-define"
+    :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="12">车站</el-col>
+      <el-col :span="11" :offset="1">车次窗</el-col>
+    </el-row>
+    <el-row>
+      <el-col :span="12">
+        <el-input v-model="addModel.stationName" :disabled="true" />
+      </el-col>
+      <el-col :span="11" :offset="1">
+        <el-input v-model="addModel.trainWindowCode" :disabled="true" />
+      </el-col>
+    </el-row>
+    <el-row>
+      <el-col :span="12">新车组号</el-col>
+    </el-row>
+    <el-row>
+      <el-col :span="12">
+        <el-input :id="domIdInput" v-model="addModel.tripNumber" @change="inputGroupNumber" />
+      </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 { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
+import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo';
+import {mouseCancelState} from '@/jmapNew/theme/components/utils/menuItemStatus';
+
+export default {
+    name: 'TrainDefine',
+    components: {
+        NoticeInfo
+    },
+    data() {
+        return {
+            trainNoList: [],
+            selected: null,
+            addModel: {
+                stationName: '',
+                trainWindowCode: '',
+                tripNumber: ''
+            },
+            dialogShow: false,
+            loading: false
+        };
+    },
+    computed: {
+        ...mapGetters('map', [
+            'stationStandList'
+        ]),
+        show() {
+            return this.dialogShow && !this.$store.state.menuOperation.break;
+        },
+        domIdInput() {
+            return this.dialogShow ? OperationEvent.Train.addTrainId.input.domId : '';
+        },
+        domIdCancel() {
+            return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
+        },
+        domIdConfirm() {
+            return this.dialogShow ? OperationEvent.Train.addTrainId.menu.domId : '';
+        },
+        title() {
+            return '设置车体号';
+        }
+    },
+    mounted() {
+        this.$nextTick(() => {
+            this.$store.dispatch('training/tipReload');
+        });
+    },
+    methods: {
+        doShow(operate, selected) {
+            this.selected = selected;
+            // 如果不是断点激活，则需要对初始值进行初始化
+            if (!this.dialogShow) {
+                const section = this.$store.getters['map/getDeviceByCode'](selected.sectionCode);
+                if (section) {
+                    const station = this.$store.getters['map/getDeviceByCode'](section.stationCode);
+                    if (station) {
+                        this.addModel.stationName = station.name;
+                    }
+                }
+                this.addModel.trainWindowCode = selected.code;
+            }
+            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);
+        },
+        inputGroupNumber() {
+            const operate = {
+                type: MapDeviceType.Train.type,
+                operation: OperationEvent.Train.addTrainId.input.operation,
+                val: this.addModel.tripNumber
+            };
+
+            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                }
+            });
+        },
+        commit() {
+            const operate = {
+                send: true,
+                type: MapDeviceType.Train.type,
+                operation: OperationEvent.Train.addTrainId.menu.operation,
+                val: this.addModel.tripNumber
+            };
+
+            this.loading = true;
+            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                this.loading = false;
+                if (valid) {
+                    this.doClose();
+                }
+            }).catch(() => {
+                this.loading = false;
+                this.doClose();
+                this.$refs.noticeInfo.doShow();
+            });
+        },
+        cancel() {
+            const operate = {
+                type: MapDeviceType.Train.type,
+                operation: OperationEvent.Command.cancel.menu.operation
+            };
+
+            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                if (valid) {
+                    this.doClose();
+                }
+            }).catch(() => { this.doClose(); });
+        }
+    }
+};
+</script>
+<style 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/jmap/theme/fuzhou_01/menus/dialog/trainDelete.vue b/src/jmapNew/theme/race_01/menus/dialog/trainDelete.vue
similarity index 79%
rename from src/jmap/theme/fuzhou_01/menus/dialog/trainDelete.vue
rename to src/jmapNew/theme/race_01/menus/dialog/trainDelete.vue
index a4ca45a8d..6230af224 100644
--- a/src/jmap/theme/fuzhou_01/menus/dialog/trainDelete.vue
+++ b/src/jmapNew/theme/race_01/menus/dialog/trainDelete.vue
@@ -1,7 +1,7 @@
 <template>
   <el-dialog
     v-dialogDrag
-    class="fuzhou-01__systerm stand-stop-time"
+    class="ningbo-01__systerm stand-stop-time"
     :title="title"
     :visible.sync="show"
     width="320px"
@@ -10,21 +10,21 @@
     :modal="false"
     :close-on-click-modal="false"
   >
-    <el-form ref="form" size="small" label-width="90px" :model="formModel" :rules="rules">
-      <el-form-item :label="this.$t('menu.groupNumber')+this.$t('global.colon')" prop="groupNumber">
-        <el-input :id="domIdTrainNumber" v-model="formModel.groupNumber" @change="trainNumberChange" />
+    <el-form ref="form" size="small" label-width="90px" :model="addModel" :rules="rules">
+      <el-form-item label="车 组 号:" prop="groupNumber">
+        <el-input :id="domIdInput" v-model="addModel.groupNumber" @change="inputGroupNumber" />
       </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">{{ $t('global.confirm') }}</el-button>
+        <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">{{ $t('global.cancel') }}</el-button>
+        <el-button :id="domIdCancel" @click="cancel">取 消</el-button>
       </el-col>
     </el-row>
     <confirm-control ref="confirmControl" />
-    <notice-info ref="noticeInfo" />
+    <notice-info ref="noticeInfo" pop-class="ningbo-01__systerm" />
   </el-dialog>
 </template>
 
@@ -33,7 +33,8 @@ import { mapGetters } from 'vuex';
 import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
 // import { getPublishMapTrainNos } from '@/api/runplan';
 import ConfirmControl from './childDialog/confirmControl';
-import NoticeInfo from './childDialog/childDialog/noticeInfo';
+import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo';
+import {mouseCancelState} from '@/jmapNew/theme/components/utils/menuItemStatus';
 
 export default {
     name: 'TrainDelete',
@@ -44,13 +45,14 @@ export default {
     data() {
         return {
             trainNoList: [],
-            formModel: {
+            selected: null,
+            addModel: {
                 groupNumber: ''
             },
 
             rules: {
                 groupNumber: [
-                    { required: true, message: this.$t('rules.selectGroupNumber'), trigger: 'blur' }
+                    { required: true, message: '请输入车组号', trigger: 'blur' }
                 ]
             },
             operation: null,
@@ -65,17 +67,17 @@ export default {
         show() {
             return this.dialogShow && !this.$store.state.menuOperation.break;
         },
+        domIdInput() {
+            return this.dialogShow ? OperationEvent.Train.delTrainId.input.domId : '';
+        },
         domIdCancel() {
             return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
         },
         domIdConfirm() {
             return this.dialogShow ? OperationEvent.Train.delTrainId.menu.domId : '';
         },
-        domIdTrainNumber() {
-            return this.dialogShow ? OperationEvent.Train.delTrainId.trainNumberChange.domId : '';
-        },
         title() {
-            return this.$t('menu.menuTrain.deleteTrainId');
+            return '删除车组号';
         }
     },
     mounted() {
@@ -94,6 +96,7 @@ export default {
             }
         },
         doShow(operate, selected) {
+            this.selected = selected;
             // 如果不是断点激活，则需要对初始值进行初始化
             if (!this.dialogShow) {
                 this.operation = operate.operation;
@@ -108,12 +111,13 @@ export default {
             this.dialogShow = false;
             this.$store.dispatch('training/emitTipFresh');
             this.$store.dispatch('map/setTrainWindowShow', false);
+            mouseCancelState(this.selected);
         },
-        trainNumberChange() {
+        inputGroupNumber() {
             const operate = {
                 type: MapDeviceType.Train.type,
-                val: `${this.formModel.groupNumber}`,
-                operation: OperationEvent.Train.delTrainId.trainNumberChange.operation
+                operation: OperationEvent.Train.delTrainId.input.operation,
+                val: this.addModel.groupNumber
             };
 
             this.$store.dispatch('training/next', operate).then(({ valid }) => {
@@ -129,7 +133,7 @@ export default {
                         send: true,
                         type: MapDeviceType.Train.type,
                         operation: OperationEvent.Train.delTrainId.menu.operation,
-                        val: this.formModel.groupNumber
+                        val: this.addModel.groupNumber
                     };
 
                     this.loading = true;
@@ -141,7 +145,7 @@ export default {
                     }).catch(() => {
                         this.loading = false;
                         this.doClose();
-                        this.$refs.noticeInfo.doShow(operate);
+                        this.$refs.noticeInfo.doShow();
                     });
                 } else {
                     return false;
diff --git a/src/jmapNew/theme/race_01/menus/dialog/trainMove.vue b/src/jmapNew/theme/race_01/menus/dialog/trainMove.vue
new file mode 100644
index 000000000..65be435f4
--- /dev/null
+++ b/src/jmapNew/theme/race_01/menus/dialog/trainMove.vue
@@ -0,0 +1,181 @@
+<template>
+  <el-dialog
+    v-dialogDrag
+    class="ningbo-01__systerm train-move"
+    :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="12">车组号</el-col>
+    </el-row>
+    <el-row>
+      <el-col :span="12">
+        <el-input :id="domIdInput" v-model="addModel.groupNumber" @change="inputGroupNumber" />
+      </el-col>
+    </el-row>
+    <el-row>
+      <el-col :span="12">车站</el-col>
+      <el-col :span="11" :offset="1">车次窗</el-col>
+    </el-row>
+    <el-row>
+      <el-col :span="12">
+        <el-input v-model="addModel.stationName" :disabled="true" />
+      </el-col>
+      <el-col :span="11" :offset="1">
+        <el-input v-model="addModel.trainWindowCode" :disabled="true" />
+      </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 { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
+import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo';
+import {mouseCancelState} from '@/jmapNew/theme/components/utils/menuItemStatus';
+
+export default {
+    name: 'TrainMove',
+    components: {
+        NoticeInfo
+    },
+    data() {
+        return {
+            trainNoList: [],
+            selected: null,
+            addModel: {
+                stationName: '',
+                trainWindowCode: '',
+                groupNumber: ''
+            },
+            dialogShow: false,
+            loading: false
+        };
+    },
+    computed: {
+        ...mapGetters('map', [
+            'stationStandList'
+        ]),
+        show() {
+            return this.dialogShow && !this.$store.state.menuOperation.break;
+        },
+        domIdInput() {
+            return this.dialogShow ? OperationEvent.Train.addTrainId.input.domId : '';
+        },
+        domIdCancel() {
+            return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
+        },
+        domIdConfirm() {
+            return this.dialogShow ? OperationEvent.Train.addTrainId.menu.domId : '';
+        },
+        title() {
+            return '移动车组号';
+        }
+    },
+    mounted() {
+        this.$nextTick(() => {
+            this.$store.dispatch('training/tipReload');
+        });
+    },
+    methods: {
+        doShow(operate, selected) {
+            this.selected = selected;
+            // 如果不是断点激活，则需要对初始值进行初始化
+            if (!this.dialogShow) {
+                const section = this.$store.getters['map/getDeviceByCode'](selected.sectionCode);
+                if (section) {
+                    const station = this.$store.getters['map/getDeviceByCode'](section.stationCode);
+                    if (station) {
+                        this.addModel.stationName = station.name;
+                    }
+                }
+                this.addModel.trainWindowCode = selected.code;
+            }
+            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);
+        },
+        inputGroupNumber() {
+            const operate = {
+                type: MapDeviceType.Train.type,
+                operation: OperationEvent.Train.addTrainId.input.operation,
+                val: this.addModel.groupNumber
+            };
+
+            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                }
+            });
+        },
+        commit() {
+            const operate = {
+                send: true,
+                type: MapDeviceType.Train.type,
+                operation: OperationEvent.Train.addTrainId.menu.operation,
+                val: this.addModel.groupNumber
+            };
+
+            this.loading = true;
+            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                this.loading = false;
+                if (valid) {
+                    this.doClose();
+                }
+            }).catch(() => {
+                this.loading = false;
+                this.doClose();
+                this.$refs.noticeInfo.doShow();
+            });
+        },
+        cancel() {
+            const operate = {
+                type: MapDeviceType.Train.type,
+                operation: OperationEvent.Command.cancel.menu.operation
+            };
+
+            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                if (valid) {
+                    this.doClose();
+                }
+            }).catch(() => { this.doClose(); });
+        }
+    }
+};
+</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, 0.3);
+        position: relative;
+        left: -5px;
+        top: -18px;
+        padding: 0 5px;
+        background-color: #F0F0F0;
+    }
+</style>
diff --git a/src/jmapNew/theme/race_01/menus/dialog/trainSetHead.vue b/src/jmapNew/theme/race_01/menus/dialog/trainSetHead.vue
new file mode 100644
index 000000000..2104b5fc2
--- /dev/null
+++ b/src/jmapNew/theme/race_01/menus/dialog/trainSetHead.vue
@@ -0,0 +1,182 @@
+<template>
+  <el-dialog
+    v-dialogDrag
+    class="ningbo-01__systerm train-set-head"
+    :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-col :span="11" :offset="2">服务号</el-col>
+    </el-row>
+    <el-row>
+      <el-col :span="11">
+        <el-input v-model="addModel.groupNumber" size="mini" :disabled="trueValue" />
+      </el-col>
+      <el-col :span="11" :offset="2">
+        <el-input v-model="addModel.serviceNumber" size="mini" />
+        <div style="color:red;font-size:13px;margin-top:5px;">{{ messageTip1 }}</div>
+      </el-col>
+    </el-row>
+    <el-row>
+      <el-col :span="12">目的地号</el-col>
+    </el-row>
+    <el-row>
+      <el-col :span="12">
+        <el-input :id="domIdTargetCodeChange" v-model="addModel.destinationCode" 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: 'TrainSetHead',
+    components: {
+        NoticeInfo
+    },
+    data() {
+        return {
+            trainNoList: [],
+            selected: null,
+            addModel: {
+                groupNumber: '',
+                destinationCode: '',
+                serviceNumber: ''
+            },
+            messageTip1:'',
+            messageTip2:'',
+            dialogShow: false,
+            trueValue: true,
+            loading: false
+        };
+    },
+    computed: {
+        ...mapGetters('map', [
+            'stationStandList'
+        ]),
+        show() {
+            return this.dialogShow && !this.$store.state.menuOperation.break;
+        },
+        domIdTargetCodeChange() {
+            return this.dialogShow ? OperationEvent.Train.destinationTrainId.targetCodeChange.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();
+            }
+        }
+    },
+    mounted() {
+        this.$nextTick(() => {
+            this.$store.dispatch('training/tipReload');
+        });
+    },
+    methods: {
+        doShow(operate, selected) {
+            this.selected = selected;
+            // 如果不是断点激活，则需要对初始值进行初始化
+            if (!this.dialogShow) {
+                this.addModel.groupNumber = selected.groupNumber;
+                this.addModel.serviceNumber = selected.serviceNumber;
+            }
+            this.dialogShow = true;
+            this.$nextTick(function () {
+                this.$store.dispatch('training/emitTipFresh');
+            });
+        },
+        doClose() {
+            this.loading = false;
+            this.dialogShow = false;
+            this.$store.dispatch('training/emitTipFresh');
+            this.$store.dispatch('map/setTrainWindowShow', false);
+            mouseCancelState(this.selected);
+        },
+        commit() {
+            if (!this.addModel.serviceNumber) {
+                this.messageTip1 = '请输入服务号';
+                return;
+            }
+            if (!this.addModel.destinationCode) {
+                this.messageTip1 = '';
+                this.messageTip2 = '请输入目的地号';
+                return;
+            }
+            const params = {
+                groupNumber: this.addModel.groupNumber,
+                destinationCode: this.addModel.destinationCode,
+                serviceNumber: this.addModel.serviceNumber
+            };
+            this.messageTip1 = '';
+            this.messageTip2 = '';
+            this.loading = true;
+            commitOperate(menuOperate.TrainWindow.destinationTrainId, 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/race_01/menus/dialog/trainSetPlan.vue b/src/jmapNew/theme/race_01/menus/dialog/trainSetPlan.vue
new file mode 100644
index 000000000..d3cb78679
--- /dev/null
+++ b/src/jmapNew/theme/race_01/menus/dialog/trainSetPlan.vue
@@ -0,0 +1,203 @@
+<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="domIdTrainNoChange" v-model="addModel.tripNumber" size="mini" />
+        <div style="color:red;font-size:13px;margin-top:5px;">{{ messageTip2 }}</div>
+      </el-col>
+      <el-col :span="11" :offset="2">
+        <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-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';
+import {getTrainDetailBytripNumber} from '@/api/simulation';
+
+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();
+            }
+        },
+        'addModel.tripNumber': function(val) {
+            if (val.length == 4) {
+                this.trainNoChange(val);
+            } else {
+                this.addModel.serviceNumber = '';
+            }
+        }
+    },
+    mounted() {
+        this.$nextTick(() => {
+            this.$store.dispatch('training/tipReload');
+        });
+    },
+    methods: {
+        doShow(operate, selected) {
+            this.selected = selected;
+            // 如果不是断点激活，则需要对初始值进行初始化
+            // if (!this.dialogShow) {
+            // }
+            this.addModel.groupNumber = selected.groupNumber;
+            this.tripNumber = '';
+            this.serviceNumber = '';
+            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);
+        },
+        trainNoChange(tripNumber) {
+            getTrainDetailBytripNumber(this.$route.query.group, {tripNumber:tripNumber}).then(resp => {
+                if (resp.data) {
+                    this.addModel.serviceNumber = resp.data.serviceNumber;
+                }
+            }).catch(() => {
+                this.$message.error('获取列车信息失败！');
+            });
+        },
+        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/race_01/menus/dialog/trainSetWork.vue b/src/jmapNew/theme/race_01/menus/dialog/trainSetWork.vue
new file mode 100644
index 000000000..5dd137285
--- /dev/null
+++ b/src/jmapNew/theme/race_01/menus/dialog/trainSetWork.vue
@@ -0,0 +1,144 @@
+<template>
+  <el-dialog
+    v-dialogDrag
+    class="ningbo-01__systerm train-set-work"
+    :title="title"
+    :visible.sync="show"
+    width="320px"
+    :before-close="doClose"
+    :z-index="2000"
+    :modal="false"
+    :close-on-click-modal="false"
+  >
+    <el-row>
+      <el-col :span="6" style="line-height: 44px;">车组号:</el-col>
+      <el-col :span="18">
+        <el-input v-model="addModel.groupNumber" size="mini" :disabled="true" />
+      </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: 'TrainSetWork',
+    components: {
+        NoticeInfo
+    },
+    data() {
+        return {
+            trainNoList: [],
+            selected: null,
+            addModel: {
+                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.artificialTrainId.menu.domId : '';
+        },
+        title() {
+            return '设置人工车';
+        }
+    },
+    watch:{
+        '$store.state.map.keyboardEnterCount': function (val) {
+            if (this.dialogShow) {
+                this.commit();
+            }
+        }
+    },
+    mounted() {
+        this.$nextTick(() => {
+            this.$store.dispatch('training/tipReload');
+        });
+    },
+    methods: {
+        doShow(operate, 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.$store.dispatch('training/emitTipFresh');
+            this.$store.dispatch('map/setTrainWindowShow', false);
+            mouseCancelState(this.selected);
+        },
+        commit() {
+            const params = {
+                groupNumber: this.addModel.groupNumber
+            };
+            this.loading = true;
+            commitOperate(menuOperate.TrainWindow.artificialTrainId, 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/race_01/menus/dialog/trainSetWorkATP.vue b/src/jmapNew/theme/race_01/menus/dialog/trainSetWorkATP.vue
new file mode 100644
index 000000000..ba5b78c2f
--- /dev/null
+++ b/src/jmapNew/theme/race_01/menus/dialog/trainSetWorkATP.vue
@@ -0,0 +1,176 @@
+<template>
+  <el-dialog
+    v-dialogDrag
+    class="ningbo-01__systerm train-set-work"
+    :title="title"
+    :visible.sync="show"
+    width="320px"
+    :before-close="doClose"
+    :z-index="2000"
+    :modal="false"
+    :close-on-click-modal="false"
+  >
+    <el-row>
+      <el-col :span="6">车组号:</el-col>
+    </el-row>
+    <el-row>
+      <el-col :span="18">
+        <el-input :id="domIdInput" v-model="addModel.groupNumber" size="mini" @change="inputGroupNumber" />
+      </el-col>
+    </el-row>
+    <el-row>
+      <el-col :span="11">
+        <el-radio v-model="radio" label="01">标记ATP切除</el-radio>
+      </el-col>
+      <el-col :span="11" :offset="2">
+        <el-radio v-model="radio" label="02">标记APT恢复</el-radio>
+      </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 { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
+import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo';
+import {mouseCancelState} from '@/jmapNew/theme/components/utils/menuItemStatus';
+
+export default {
+    name: 'TrainSetWork',
+    components: {
+        NoticeInfo
+    },
+    data() {
+        return {
+            trainNoList: [],
+            selected: null,
+            addModel: {
+                groupNumber: ''
+            },
+            radio: '01',
+            dialogShow: false,
+            loading: false
+        };
+    },
+    computed: {
+        ...mapGetters('map', [
+            'stationStandList'
+        ]),
+        show() {
+            return this.dialogShow && !this.$store.state.menuOperation.break;
+        },
+        domIdInput() {
+            return this.dialogShow ? OperationEvent.Train.editTrainId.input.domId : '';
+        },
+        domIdCancel() {
+            return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
+        },
+        domIdConfirm() {
+            return this.dialogShow ? OperationEvent.Train.editTrainId.menu.domId : '';
+        },
+        title() {
+            return 'ATP切除功能';
+        }
+    },
+    mounted() {
+        this.$nextTick(() => {
+            this.$store.dispatch('training/tipReload');
+        });
+    },
+    methods: {
+        doShow(operate, selected) {
+            this.selected = selected;
+            // 如果不是断点激活，则需要对初始值进行初始化
+            if (!this.dialogShow) {
+                const section = this.$store.getters['map/getDeviceByCode'](selected.sectionCode);
+                if (section) {
+                    const station = this.$store.getters['map/getDeviceByCode'](section.stationCode);
+                    if (station) {
+                        this.addModel.stationName = station.name;
+                    }
+                }
+                this.addModel.trainWindowCode = selected.code;
+            }
+            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);
+        },
+        inputGroupNumber() {
+            const operate = {
+                type: MapDeviceType.Train.type,
+                operation: OperationEvent.Train.editTrainId.input.operation,
+                val: this.addModel.tripNumber
+            };
+
+            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                }
+            });
+        },
+        commit() {
+            const operate = {
+                send: true,
+                type: MapDeviceType.Train.type,
+                operation: OperationEvent.Train.editTrainId.menu.operation,
+                val: this.addModel.tripNumber
+            };
+
+            this.loading = true;
+            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                this.loading = false;
+                if (valid) {
+                    this.doClose();
+                }
+            }).catch(() => {
+                this.loading = false;
+                this.doClose();
+                this.$refs.noticeInfo.doShow();
+            });
+        },
+        cancel() {
+            const operate = {
+                type: MapDeviceType.Train.type,
+                operation: OperationEvent.Command.cancel.menu.operation
+            };
+
+            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                if (valid) {
+                    this.doClose();
+                }
+            }).catch(() => { this.doClose(); });
+        }
+    }
+};
+</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/race_01/menus/dialog/turnBackControl.vue b/src/jmapNew/theme/race_01/menus/dialog/turnBackControl.vue
new file mode 100644
index 000000000..91129ba4f
--- /dev/null
+++ b/src/jmapNew/theme/race_01/menus/dialog/turnBackControl.vue
@@ -0,0 +1,181 @@
+<template>
+  <el-dialog
+    v-dialogDrag
+    class="ningbo-01__systerm signal-control"
+    :title="title"
+    :visible.sync="show"
+    width="300px"
+    :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>
+    <el-row style="margin: 12px 0;">
+      <el-col :span="11">
+        <el-radio v-model="passRadio" label="1" style="display: block; padding-left: 10px; margin-bottom: 10px;" :disabled="passRadio == '2'">设置</el-radio>
+      </el-col>
+      <el-col :span="11" :offset="2">
+        <el-radio v-model="passRadio" label="2" style="display: block; padding-left: 10px;" :disabled="passRadio == '1'">取消</el-radio>
+      </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>
+    <confirm-control ref="confirmControl" />
+    <notice-info ref="noticeInfo" pop-class="ningbo-01__systerm" />
+  </el-dialog>
+</template>
+
+<script>
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
+import ConfirmControl from './childDialog/confirmControl';
+import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo';
+import {mouseCancelState} from '@/jmapNew/theme/components/utils/menuItemStatus';
+import {menuOperate, commitOperate} from '@/jmapNew/theme/components/utils/menuOperate';
+
+export default {
+    name: 'RouteControl',
+    components: {
+        ConfirmControl,
+        NoticeInfo
+    },
+    data() {
+        return {
+            dialogShow: false,
+            loading: false,
+            selected: null,
+            operation: null,
+            stationName: '',
+            signalName: '',
+            passRadio: '1'
+        };
+    },
+    computed: {
+        show() {
+            return this.dialogShow && !this.$store.state.menuOperation.break;
+        },
+        domIdCancel() {
+            return this.dialogShow ? OperationEvent.Command.close.menu.domId : '';
+        },
+        domIdConfirm() {
+            if (this.dialogShow) {
+                if (this.operation == OperationEvent.AutoTurnBack.SetAutoTurnBackButton.menu.operation) {
+                    return OperationEvent.AutoTurnBack.SetAutoTurnBackButton.menu.domId;
+                } else if (this.operation == OperationEvent.AutoTurnBack.CancelAutoTurnBackButton.menu.operation) {
+                    return OperationEvent.AutoTurnBack.CancelAutoTurnBackButton.menu.domId;
+                } else {
+                    return '';
+                }
+            } else {
+                return '';
+            }
+        },
+        title() {
+            return '自动折返';
+        }
+    },
+    watch: {
+        '$store.state.map.keyboardEnterCount': function (val) {
+            if (this.show && !this.loading) {
+                this.commit();
+            }
+        }
+    },
+    mounted() {
+        this.$nextTick(() => {
+            this.$store.dispatch('training/tipReload');
+        });
+    },
+    methods: {
+        doShow(operate, selected) {
+            this.selected = selected;
+            if (!this.dialogShow) {
+                this.signalName = '';
+                this.stationName = '';
+                if (selected && selected._type.toUpperCase() === 'AutoTurnBack'.toUpperCase()) {
+                    const autoReentryData = this.$store.getters['map/autoReentryData'];
+                    this.signalName = autoReentryData[selected.cycleCode].name;
+                    const station = this.$store.getters['map/getDeviceByCode'](selected.stationCode);
+                    if (station) {
+                        this.stationName = station.name;
+                    }
+                }
+                this.operation = operate.operation;
+                if (this.operation == OperationEvent.AutoTurnBack.SetAutoTurnBackButton.menu.operation) {
+                    this.passRadio = '1';
+                } else if (this.operation == OperationEvent.AutoTurnBack.CancelAutoTurnBackButton.menu.operation) {
+                    this.passRadio = '2';
+                }
+            }
+            this.dialogShow = true;
+            this.$nextTick(function () {
+                this.$store.dispatch('training/emitTipFresh');
+            });
+        },
+        doClose() {
+            this.loading = false;
+            this.dialogShow = false;
+            this.$store.dispatch('training/emitTipFresh');
+            mouseCancelState(this.selected);
+        },
+        commit() {
+            if (this.operation == OperationEvent.AutoTurnBack.SetAutoTurnBackButton.menu.operation) {
+                this.singalPassModel(); // 设置自动折返
+            } else if (this.operation == OperationEvent.AutoTurnBack.CancelAutoTurnBackButton.menu.operation) {
+                this.singalCancelPassModel(); // 取消自动折返
+            }
+        },
+        // 设置自动折返
+        singalPassModel() {
+            this.sendCommand(menuOperate.Signal.setAutoTurnBack);
+        },
+        // 取消自动折返
+        singalCancelPassModel() {
+            this.sendCommand(menuOperate.Signal.cancelAutoTurnBack);
+        },
+        sendCommand(operate) {
+            this.loading = true;
+            commitOperate(operate, {}, 2).then((data)=>{
+                this.loading = false;
+                this.doClose();
+            }).catch(() => {
+                this.loading = false;
+                this.doClose();
+                this.$refs.noticeInfo.doShow();
+            });
+        },
+        // 取消
+        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();
+            });
+        }
+    }
+};
+</script>
diff --git a/src/jmap/theme/fuzhou_01/menus/index.vue b/src/jmapNew/theme/race_01/menus/index.vue
similarity index 50%
rename from src/jmap/theme/fuzhou_01/menus/index.vue
rename to src/jmapNew/theme/race_01/menus/index.vue
index 720e59539..0dda8422f 100644
--- a/src/jmap/theme/fuzhou_01/menus/index.vue
+++ b/src/jmapNew/theme/race_01/menus/index.vue
@@ -1,19 +1,22 @@
 <template>
   <div class="menus" :style="{width: width + 'px'}">
     <menu-cancel ref="menuCancel" />
-    <template v-show="isShowAll">
-      <menu-bar v-show="isShowBar" ref="menuBar" :selected="selected" />
-      <menu-station-control ref="menuStationControl" :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" />
-      <passive-Timeout ref="passiveTimeout" />
-    </template>
+    <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" />
+    <!--<passive-alarm ref="passiveAlarm" />-->
+    <passive-contorl ref="passiveControl" pop-class="ningbo-01__systerm" />
+    <!--<passive-Timeout ref="passiveTimeout" />-->
   </div>
 </template>
 
@@ -21,32 +24,42 @@
 import { mapGetters } from 'vuex';
 import MenuCancel from './menuCancel';
 import MenuSignal from './menuSignal';
-import MenuStationControl from './menuStationControl';
+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 './menuBar';
-import PassiveAlarm from './passiveDialog/alarm';
-import PassiveContorl from './passiveDialog/control';
-import PassiveTimeout from './passiveDialog/timeout';
+import MenuLimit from './menuLimit';
+import MenuStationTurnBack from './menuStationTurnBack';
+import MenuPower from './menuPower';
+// 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,
+        MenuAxleReset,
+        MenuAutoTrunRoute,
         MenuCancel,
         MenuSignal,
         MenuSwitch,
         MenuSection,
-        MenuStationControl,
         MenuStationStand,
+        MenuStationControl,
         MenuStation,
         MenuTrain,
-        PassiveAlarm,
-        PassiveContorl,
-        PassiveTimeout
+        MenuStationTurnBack,
+        MenuLimit,
+        MenuPower,
+        // PassiveAlarm,
+        PassiveContorl
+        // PassiveTimeout
     },
     props: {
         selected: {
@@ -60,13 +73,8 @@ export default {
         ...mapGetters('config', [
             'width'
         ]),
-        isShowAll() {
-            return this.$route.params.mode != 'dp' &&
-                    this.$route.params.mode != 'plan' &&
-                    this.$store.state.training.roles != 'BigScreen';
-        },
         isShowBar() {
-            return this.$store.state.training.prdType;
+            return this.$store.state.training.prdType && this.$store.state.training.prdType !== '07';
         }
     },
     watch: {
@@ -83,6 +91,9 @@ export default {
 </script>
 
 <style>
+    .menus{
+        height:0px;
+    }
     .menus .pop-menu {
         background: #F0F0F0;
     }
@@ -95,43 +106,40 @@ export default {
         color: #B4B3B8;
     }
 
-    .fuzhou-01__systerm {
+    .ningbo-01__systerm {
         overflow: hidden !important;
     }
 
-    .fuzhou-01__systerm .el-dialog {
+    .ningbo-01__systerm .el-dialog {
         background: rgba(100, 100, 100, 0.3);
-        border: 2px solid rgb(144, 144, 144, 0.8);
+        border: 2px solid rgba(144, 144, 144, 0.8);
         border-radius: 6px;
         color: #000;
         font-size: 14px;
     }
 
-    .fuzhou-01__systerm .el-dialog .el-dialog__header {
-        padding: 5px;
+    .ningbo-01__systerm .el-dialog .el-dialog__header {
+        padding: 10px;
         height: 26px;
     }
 
-    .fuzhou-01__systerm .el-dialog .el-dialog__footer {
+    .ningbo-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;
+    .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;
     }
 
-    .fuzhou-01__systerm .el-dialog .el-dialog__title {
+    .ningbo-01__systerm .el-dialog .el-dialog__title {
         position: absolute;
-        top: 4px;
+        top: 6px;
         color: #000;
         border-radius: 4px;
         padding: 0px 2px;
@@ -139,37 +147,36 @@ export default {
         line-height: 20px
     }
 
-    .fuzhou-01__systerm .el-dialog .el-dialog__title::before {
+    .ningbo-01__systerm .el-dialog .el-dialog__title::before {
         content: '';
         position: absolute;
         top: 0;
         left: 0;
-        -webkit-filter: blur(10px);
-        filter: blur(10px);
+        filter: blur(7px);
         height: 20px;
         width: -webkit-fill-available;
-        background: rgba(128, 128, 128, 0.8);
+        background: rgba(190, 190, 190, 0.8);
         z-index: -1;
     }
 
-    .fuzhou-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;
-        top: 4px;
+        top: 5px;
         right: 5px;
-        line-height: 16px;
+        line-height: 18px;
     }
 
-    .fuzhou-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;
     }
 
-    .fuzhou-01__systerm .el-dialog .el-dialog__headerbtn .el-dialog__close {
+    .ningbo-01__systerm .el-dialog .el-dialog__headerbtn .el-dialog__close {
         color: #fff;
     }
 
-    .fuzhou-01__systerm .el-dialog .el-button {
+    .ningbo-01__systerm .el-dialog .el-button {
         height: 32px;
         line-height: 32px;
         padding: 0px;
@@ -180,27 +187,31 @@ export default {
         background: #F0F0F0;
     }
 
-    .fuzhou-01__systerm .el-dialog .el-button:focus span {
+    .ningbo-01__systerm .el-dialog .expand {
+        width: 120px;
+    }
+
+    .ningbo-01__systerm .el-dialog .el-button:focus span {
         border: 1px dashed gray;
     }
 
-    .fuzhou-01__systerm .el-dialog .el-button:active {
+    .ningbo-01__systerm .el-dialog .el-button:active {
         border: 2px inset #E2E2E2;
     }
 
-    .fuzhou-01__systerm .el-dialog .el-button:disabled {
+    .ningbo-01__systerm .el-dialog .el-button:disabled {
         border: 2px inset #E2E2E2;
     }
 
-    .fuzhou-01__systerm .el-dialog .el-button:disabled span {
+    .ningbo-01__systerm .el-dialog .el-button:disabled span {
         border: 0px;
     }
 
-    .fuzhou-01__systerm .el-dialog .el-input {
+    .ningbo-01__systerm .el-dialog .el-input {
         border: 2px inset #E9E9E9;
     }
 
-    .fuzhou-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;
@@ -208,16 +219,16 @@ export default {
         box-sizing: border-box;
     }
 
-    .fuzhou-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;
     }
 
-    .fuzhou-01__systerm .el-dialog .el-textarea {
+    .ningbo-01__systerm .el-dialog .el-textarea {
         border: 2px inset #E9E9E9;
         border-radius: 0px;
     }
 
-    .fuzhou-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;
@@ -225,20 +236,24 @@ export default {
         box-sizing: border-box;
     }
 
-    .fuzhou-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;
     }
 
-    .fuzhou-01__systerm .el-dialog .el-table {
+    .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;
     }
 
-    .fuzhou-01__systerm .el-dialog .el-table .cell {
+    .ningbo-01__systerm .el-dialog .el-table .cell {
         line-height: unset !important;
     }
 
-    .fuzhou-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;
@@ -247,42 +262,57 @@ export default {
         padding: 0px;
     }
 
-    .fuzhou-01__systerm .el-dialog .el-table tr td {
+    .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;
     }
 
-    .fuzhou-01__systerm .el-dialog .el-table .el-table__empty-text {
+    .ningbo-01__systerm .el-dialog .el-table .el-table__empty-text {
         top: 15px !important;
     }
 
-    .fuzhou-01__systerm .el-dialog .current-row>td {
+    .ningbo-01__systerm .el-dialog .current-row>td {
         background: #3399FF !important;
         color: #fff !important;
     }
 
-    .fuzhou-01__systerm .el-dialog .el-checkbox__inner {
+    .ningbo-01__systerm .el-dialog .el-checkbox__inner {
         border: 1px inset #dcdfe6 !important;
     }
 
-    .fuzhou-01__systerm .el-dialog .el-checkbox__label {
+    .ningbo-01__systerm .el-dialog .el-checkbox__label {
         color: #000 !important;
     }
 
-    .fuzhou-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;
     }
 
-    .fuzhou-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;
     }
 
-    .fuzhou-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;
     }
 
-    .fuzhou-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;
@@ -295,20 +325,20 @@ export default {
         top: 1px;
     }
 
-    .fuzhou-01__systerm .el-dialog .el-radio__inner {
+    .ningbo-01__systerm .el-dialog .el-radio__inner {
         border: 1px inset #dcdfe6 !important;
     }
 
-    .fuzhou-01__systerm .el-dialog .el-radio__label {
+    .ningbo-01__systerm .el-dialog .el-radio__label {
         color: #000 !important;
     }
 
-    .fuzhou-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;
     }
 
-    .fuzhou-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%;
@@ -318,42 +348,43 @@ export default {
         top: 50%;
     }
 
-    .fuzhou-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;
     }
 
-    .fuzhou-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;
     }
 
-    .fuzhou-01__systerm .el-dialog .base-label {
-        background: rgba(0, 0, 0, x);
+    .ningbo-01__systerm .el-dialog .base-label {
+        background: #F0F0F0;
+        padding: 0 5px;
         position: relative;
         left: -15px;
         top: -18px;
     }
 
-    .fuzhou-01__systerm .el-dialog .el-form-item label {
+    .ningbo-01__systerm .el-dialog .el-form-item label {
         font-weight: normal !important;
         color: #000 !important;
     }
 
-    .fuzhou-01__systerm .el-dialog .context {
+    .ningbo-01__systerm .el-dialog .context {
         height: 100px;
         border: 2px inset #E2E2E2;
         overflow-y: scroll;
     }
 
-    .fuzhou-01__systerm .el-dialog .table {
+    .ningbo-01__systerm .el-dialog .table {
         margin-top: 10px;
     }
 
-    .fuzhou-01__systerm .el-dialog .notice {
+    .ningbo-01__systerm .el-dialog .notice {
         margin-left: 62px;
         line-height: 30px;
     }
 
-    .fuzhou-01__systerm .el-dialog .button-group {
+    .ningbo-01__systerm .el-dialog .button-group {
         margin-top: 10px;
     }
 </style>
diff --git a/src/jmapNew/theme/race_01/menus/menuAutoTrunRoute.vue b/src/jmapNew/theme/race_01/menus/menuAutoTrunRoute.vue
new file mode 100644
index 000000000..ed34443f4
--- /dev/null
+++ b/src/jmapNew/theme/race_01/menus/menuAutoTrunRoute.vue
@@ -0,0 +1,125 @@
+<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
new file mode 100644
index 000000000..acc598954
--- /dev/null
+++ b/src/jmapNew/theme/race_01/menus/menuAxleReset.vue
@@ -0,0 +1,103 @@
+<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
new file mode 100644
index 000000000..2f982d957
--- /dev/null
+++ b/src/jmapNew/theme/race_01/menus/menuBar.vue
@@ -0,0 +1,1135 @@
+<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="ningbo-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, OperationEvent } from '@/scripts/ConstDic';
+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/jmap/theme/fuzhou_01/menus/menuCancel.vue b/src/jmapNew/theme/race_01/menus/menuCancel.vue
similarity index 63%
rename from src/jmap/theme/fuzhou_01/menus/menuCancel.vue
rename to src/jmapNew/theme/race_01/menus/menuCancel.vue
index 97f6db860..69031a452 100644
--- a/src/jmap/theme/fuzhou_01/menus/menuCancel.vue
+++ b/src/jmapNew/theme/race_01/menus/menuCancel.vue
@@ -6,10 +6,11 @@
 
 <script>
 import PopMenu from '@/components/PopMenu';
-import { Notification } from 'element-ui';
 import { mapGetters } from 'vuex';
 import { DeviceMenu } from '@/scripts/ConstDic';
 import { exitFullscreen } from '@/utils/screen';
+import { runDiagramQuit } from '@/api/simulation';
+import { EventBus } from '@/scripts/event-bus';
 
 export default {
     name: 'CancelMenu',
@@ -22,17 +23,17 @@ export default {
             menuNormal: [],
             menuScreen: [
                 {
-                    label: this.$t('menu.menuCancle.zoomIn'),
+                    label: '放大地图',
                     handler: this.magnifyMap,
                     disabled: false
                 },
                 {
-                    label: this.$t('menu.menuCancle.zoomOut'),
+                    label: '缩小地图',
                     handler: this.shrinkMap,
                     disabled: false
                 },
                 {
-                    label: this.$t('menu.menuCancle.back'),
+                    label: '返回',
                     handler: this.back,
                     disabled: false
                 }
@@ -45,14 +46,17 @@ export default {
         ]),
         isScreen() { // 大屏隐藏所有菜单
             return this.$route.params.mode === 'dp' ||
-             this.$store.state.training.roles == 'BigScreen';
+				this.$store.state.training.roles == 'BigScreen';
+        },
+        group() {
+            return this.$route.query.group;
         }
     },
     watch: {
         '$store.state.menuOperation.buttonOperation': function (val, old) {
             if (!this.isScreen && this.menu && this.menu.length > 1) {
-                // this.menu[0].disabled = (this.menu[0] && val) ? true : true;
-                // this.menu[1].disabled = !((this.menu[1] && val));
+                this.menu[0].disabled = true;
+                this.menu[1].disabled = !((this.menu[1] && val));
             }
         },
         '$store.state.menuOperation.menuCount': function (val) {
@@ -72,38 +76,8 @@ export default {
         },
         initMenu() {
             this.menuNormal = [];
-            this.stationList.forEach(station => {
-                if (station.code === station.concentrateStationCode) {
-                    const node = {
-                        label: station.name,
-                        children: []
-                    };
-
-                    this.stationList.forEach(elem => {
-                        if (elem.visible) {
-                            let next = elem;
-                            while (next.code != next.concentrateStationCode || !next.concentrateStationCode) {
-                                next = this.$store.getters['map/getDeviceByCode'](next.concentrateStationCode);
-                            }
-
-                            if (station.code == next.code) {
-                                node.children.push({
-                                    code: elem.code,
-                                    label: elem.name,
-                                    handler: this.mapLocation
-                                });
-                            }
-                        }
-                    });
-
-                    this.menuNormal.push(node);
-                }
-            });
-
             if (this.isScreen) {
                 this.menu = [...this.menuScreen];
-            } else {
-                this.menu = [...this.menuNormal];
             }
         },
         doShow(point) {
@@ -135,8 +109,9 @@ export default {
         },
         // 返回
         async back() {
+            await runDiagramQuit(this.group);
+            EventBus.$emit('trainingSubscribeStop');
             history.go(-1);
-            Notification.closeAll();
             exitFullscreen();
         }
     }
diff --git a/src/jmapNew/theme/race_01/menus/menuDialog/childDialog/twoConfirmation.vue b/src/jmapNew/theme/race_01/menus/menuDialog/childDialog/twoConfirmation.vue
new file mode 100644
index 000000000..af3fea2f1
--- /dev/null
+++ b/src/jmapNew/theme/race_01/menus/menuDialog/childDialog/twoConfirmation.vue
@@ -0,0 +1,139 @@
+<template>
+  <el-dialog
+    v-dialogDrag
+    class="ningbo-01__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" pop-class="ningbo-01__systerm" />
+  </el-dialog>
+</template>
+
+<script>
+import CMD from '@/scripts/cmdPlugin/CommandEnum';
+import { OperationEvent } 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,
+            operation: '',
+            operate: '',
+            timer: null
+        };
+    },
+    computed: {
+        show() {
+            return this.dialogShow && !this.$store.state.menuOperation.break;
+        },
+        domIdConfirm() {
+            if (this.operation == OperationEvent.StationControl.emergencyStationControl.menu.operation) {
+                return OperationEvent.StationControl.emergencyStationControl.confirm.domId;
+            } else if (this.operation == OperationEvent.StationControl.requestStationControl.menu.operation) {
+                return OperationEvent.StationControl.requestStationControl.confirm.domId;
+            } else if (this.operation == OperationEvent.StationControl.requestCentralControl.menu.operation) {
+                return OperationEvent.StationControl.requestCentralControl.confirm.domId;
+            } else {
+                return '';
+            }
+        },
+        domIdCancel() {
+            return this.dialogShow ? OperationEvent.Command.close.confirm.domId : '';
+        },
+        messages() {
+            if (this.operate) {
+                return this.operate.messages;
+            }
+            return [];
+        }
+    },
+    watch: {
+        '$store.state.map.keyboardEnterCount': function (val) {
+            if (this.show && !this.loading) {
+                this.commit();
+            }
+        }
+    },
+    mounted() {
+        this.$nextTick(() => {
+            this.$store.dispatch('training/tipReload');
+        });
+    },
+    methods: {
+        doShow(operate, message) {
+            this.operate = operate || {};
+            this.operate.messages = [];
+            this.operate.messages.push(message);
+            this.operation = this.operate.operation;
+            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.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    this.doClose();
+                }
+            });
+        },
+        commit() {
+            const operate = {
+                over: true,
+                operation:this.operation
+            };
+            if (this.operation == OperationEvent.StationControl.requestCentralControl.menu.operation) {
+                operate.cmdType = CMD.ControlConvertMenu.CMD_CM_APPLY_FOR_CENTER_CONTROL;
+            } else if (this.operation == OperationEvent.StationControl.requestStationControl.menu.operation) {
+                operate.cmdType = CMD.ControlConvertMenu.CMD_CM_APPLY_FOR_STATION_CONTROL;
+            } else if (this.operation == OperationEvent.StationControl.emergencyStationControl.menu.operation) {
+                operate.cmdType = CMD.ControlConvertMenu.CMD_CM_EMERGENCY_STATION_CONTROL;
+            }
+            this.doClose();
+            this.$store.dispatch('training/nextNew', operate).then(({ valid, response }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                }
+            }, 1000).catch(() => {
+                this.$refs.noticeInfo.doShow();
+            });
+        }
+    }
+};
+</script>
diff --git a/src/jmapNew/theme/race_01/menus/menuDialog/childDialog/userAdd.vue b/src/jmapNew/theme/race_01/menus/menuDialog/childDialog/userAdd.vue
new file mode 100644
index 000000000..eac2e8cea
--- /dev/null
+++ b/src/jmapNew/theme/race_01/menus/menuDialog/childDialog/userAdd.vue
@@ -0,0 +1,162 @@
+<template>
+    <el-dialog class="ningbo-01__systerm user-add" :title="title" :visible.sync="show" width="420px"
+        :before-close="doClose" :zIndex="2000" :modal="false" :close-on-click-modal="false" append-to-body v-dialogDrag>
+        <div style="padding: 15px 40px; border: 1px double lightgray; margin: 20px 10px; ">
+            <el-form size="small" label-width="90px" :model="model" label-position="left" :rules="rules" ref="form">
+                <el-form-item label="工号:" prop="jobNumber">
+                    <el-input v-model="model.jobNumber"></el-input>
+                </el-form-item>
+                <el-form-item label="用户名:" prop="userName">
+                    <el-input v-model="model.userName"></el-input>
+                </el-form-item>
+                <el-form-item label="密码:" prop="password">
+                    <el-input type="password" v-model="model.password"></el-input>
+                </el-form-item>
+                <el-form-item label="确认密码:" prop="confirm">
+                    <el-input type="password" v-model="model.confirm"></el-input>
+                </el-form-item>
+
+            </el-form>
+        </div>
+        <el-row justify="center" class="button-group">
+            <el-col :span="8" :offset="6">
+                <el-button :id="domIdConfirm" type="primary" :loading="loading" @click="commit">确定</el-button>
+            </el-col>
+            <el-col :span="8" :offset="0">
+                <el-button :id="domIdCancel" @click="cancel">取 消</el-button>
+            </el-col>
+        </el-row>
+    </el-dialog>
+</template>
+
+<script>
+    import { mapGetters } from 'vuex';
+    import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
+
+    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 '增加用户'
+            }
+        },
+        mounted() {
+            this.$nextTick(() => {
+                this.$store.dispatch('training/tipReload');
+            })
+        },
+        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/next', operate).then(({ valid }) => {
+                            this.loading = false;
+                            if (valid) {
+                                if (this.model.password === this.model.confirm) {
+                                    this.doClose();
+                                    this.$emit('operateUser', this.model);
+                                } else {
+                                    this.$messageBox('二次输入密码不一致');
+                                }
+                            }
+                        })
+                    } else {
+                        return false;
+                    }
+                });
+            },
+            cancel() {
+                let operate = {
+                    type: this.operate.type,
+                    operation: OperationEvent.Command.cancel.menu.operation,
+                }
+
+                this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                    if (valid) {
+                        this.doClose();
+                    }
+                }).catch(error => { this.doClose(); this.model });
+            }
+        }
+    }
+</script>
+<style scoped>
+    .ningbo-01__systerm .el-dialog .base-label {
+        background: rgba(0, 0, 0, x);
+        position: relative;
+        left: -5px;
+        top: -10px;
+        padding: 0 5px;
+        background-color: #F0F0F0;
+    }
+</style>
\ No newline at end of file
diff --git a/src/jmapNew/theme/race_01/menus/menuDialog/childDialog/userDelete.vue b/src/jmapNew/theme/race_01/menus/menuDialog/childDialog/userDelete.vue
new file mode 100644
index 000000000..243fe7ec2
--- /dev/null
+++ b/src/jmapNew/theme/race_01/menus/menuDialog/childDialog/userDelete.vue
@@ -0,0 +1,134 @@
+<template>
+    <el-dialog class="ningbo-01__systerm user-delete" :title="title" :visible.sync="show" width="260px"
+        :before-close="doClose" :zIndex="2000" :modal="false" :close-on-click-modal="false" append-to-body v-dialogDrag>
+        <div style="padding-left: 10px; padding-bottom: 10px">
+            <i class="el-icon-info"></i>
+            <template v-for="(message, index) in messages">
+                <span :key="index">{{message}}</span>
+            </template>
+        </div>
+        <el-row justify="center" class="button-group">
+            <el-col :span="8" :offset="3">
+                <el-button :id="domIdConfirm" type="primary" :loading="loading" @click="commit">确定</el-button>
+            </el-col>
+            <el-col :span="8" :offset="2">
+                <el-button :id="domIdCancel" @click="cancel">取 消</el-button>
+            </el-col>
+        </el-row>
+    </el-dialog>
+</template>
+
+<script>
+    import { mapGetters } from 'vuex';
+    import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
+
+    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 '删除用户'
+            }
+        },
+        mounted() {
+            this.$nextTick(() => {
+                this.$store.dispatch('training/tipReload');
+            })
+        },
+        methods: {
+            doShow(operate, selected) {
+                //非断电激活时设置初始值
+                if (!this.dialogShow) {
+                    this.loading = false;
+                    this.operate = operate || {};
+                    this.operation = operate.operation;
+                    this.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/next', 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/next', operate).then(({ valid }) => {
+                    if (valid) {
+                        this.doClose();
+                    }
+                }).catch(error => { this.doClose(); });
+            }
+        }
+    }
+</script>
+<style scoped>
+    .ningbo-01__systerm .el-dialog .base-label {
+        background: rgba(0, 0, 0, x);
+        position: relative;
+        left: -5px;
+        top: -10px;
+        padding: 0 5px;
+        background-color: #F0F0F0;
+    }
+</style>
\ No newline at end of file
diff --git a/src/jmapNew/theme/race_01/menus/menuDialog/childDialog/userEdit.vue b/src/jmapNew/theme/race_01/menus/menuDialog/childDialog/userEdit.vue
new file mode 100644
index 000000000..33d38059f
--- /dev/null
+++ b/src/jmapNew/theme/race_01/menus/menuDialog/childDialog/userEdit.vue
@@ -0,0 +1,178 @@
+<template>
+    <el-dialog class="ningbo-01__systerm user-edit" :title="title" :visible.sync="show" width="420px"
+        :before-close="doClose" :zIndex="2000" :modal="false" :close-on-click-modal="false" append-to-body v-dialogDrag>
+        <div style="padding: 15px 40px; border: 1px double lightgray; margin: 20px 10px; ">
+            <el-form size="small" label-width="90px" :model="model" label-position="left" :rules="rules" ref="form">
+                <el-form-item label="工号:" prop="jobNumber">
+                    <el-input v-model="model.jobNumber" disabled></el-input>
+                </el-form-item>
+                <el-form-item label="用户名:" prop="userName">
+                    <el-input v-model="model.userName" disabled></el-input>
+                </el-form-item>
+                <el-form-item label="原始密码:" prop="oldPassword">
+                    <el-input type="oldPassword" v-model="model.oldPassword"></el-input>
+                </el-form-item>
+                <el-form-item label="密码:" prop="password">
+                    <el-input type="password" v-model="model.password"></el-input>
+                </el-form-item>
+                <el-form-item label="确认密码:" prop="confirm">
+                    <el-input type="password" v-model="model.confirm"></el-input>
+                </el-form-item>
+
+            </el-form>
+        </div>
+        <el-row justify="center" class="button-group">
+            <el-col :span="8" :offset="6">
+                <el-button :id="domIdConfirm" type="primary" :loading="loading" @click="commit">确定</el-button>
+            </el-col>
+            <el-col :span="8" :offset="0">
+                <el-button :id="domIdCancel" @click="cancel">取 消</el-button>
+            </el-col>
+        </el-row>
+    </el-dialog>
+</template>
+
+<script>
+    import { mapGetters } from 'vuex';
+    import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
+
+    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 '用户编辑页面'
+            }
+        },
+        mounted() {
+            this.$nextTick(() => {
+                this.$store.dispatch('training/tipReload');
+            })
+        },
+        methods: {
+            doShow(operate, selected) {
+                //非断电激活时设置初始值
+                if (!this.dialogShow) {
+                    this.loading = false;
+                    this.operate = operate || {};
+                    this.operation = operate.operation;
+                    this.$nextTick(() => {
+                        this.$refs.form.resetFields();
+                        this.selected = selected;
+                        if (selected) {
+                            this.model.jobNumber = selected.jobNumber;
+                            this.model.userName = selected.userName;
+                        }
+                    });
+                }
+
+                this.dialogShow = true;
+                this.$nextTick(function () {
+                    this.$store.dispatch('training/emitTipFresh');
+                });
+            },
+            doClose() {
+                this.loading = false;
+                this.dialogShow = false;
+                this.$store.dispatch('training/emitTipFresh');
+            },
+            commit() {
+                this.$refs['form'].validate((valid) => {
+                    if (valid) {
+                        let operate = {
+                            type: this.operate.type,
+                            operation: OperationEvent.Command.close.confirm.operation,
+                        }
+
+                        this.loading = true;
+                        this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                            this.loading = false;
+                            if (valid)
+                                if (this.selected.password !== this.model.oldPassword) {
+                                    this.$messageBox('原始密码错误');
+                                } else if (this.model.password !== this.model.confirm) {
+                                    this.$messageBox('二次输入的密码错误');
+                                } else if (this.model.oldPassword === this.model.password) {
+                                    this.$messageBox('老密码和新密相同');
+                                } else {
+                                    this.doClose();
+                                    this.$emit('operateUser', this.model);
+                                }
+                        })
+                    } else {
+                        return false;
+                    }
+                });
+            },
+            cancel() {
+                let operate = {
+                    type: this.operate.type,
+                    operation: OperationEvent.Command.cancel.menu.operation,
+                }
+
+                this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                    if (valid) {
+                        this.doClose();
+                    }
+                }).catch(error => { this.doClose(); });
+            }
+        }
+    }
+</script>
+<style scoped>
+    .ningbo-01__systerm .el-dialog .base-label {
+        background: rgba(0, 0, 0, x);
+        position: relative;
+        left: -5px;
+        top: -10px;
+        padding: 0 5px;
+        background-color: #F0F0F0;
+    }
+</style>
\ No newline at end of file
diff --git a/src/jmapNew/theme/race_01/menus/menuDialog/detainTrainContorl.vue b/src/jmapNew/theme/race_01/menus/menuDialog/detainTrainContorl.vue
new file mode 100644
index 000000000..d3b7c130e
--- /dev/null
+++ b/src/jmapNew/theme/race_01/menus/menuDialog/detainTrainContorl.vue
@@ -0,0 +1,213 @@
+<template>
+  <el-dialog
+    v-dialogDrag
+    class="ningbo-01__systerm station-control"
+    :title="title"
+    :visible.sync="show"
+    width="400px"
+    :before-close="doClose"
+    :show-close="true"
+    :z-index="2000"
+    :modal="false"
+    :close-on-click-modal="false"
+  >
+    <el-radio-group v-model="control">
+      <el-row v-for="item in Object.keys(controlProps)" :key="item" style="padding-bottom: 10px;padding-top:10px">
+        <el-radio :label="item" :disabled="controlPropDisabled[item]">{{ controlProps[item] }}</el-radio>
+      </el-row>
+    </el-radio-group>
+    <el-row type="flex" justify="center" class="button-group">
+      <el-button :id="domIdCommit" :disabled="disabledCommit" @click="handleCommit">设置</el-button>
+      <el-button :id="domIdCancel" :disabled="disabledClose" style="margin-left: 200px" @click="cancel">退出
+      </el-button>
+    </el-row>
+    <notice-info ref="noticeInfo" pop-class="ningbo-01__systerm" />
+  </el-dialog>
+</template>
+
+<script>
+import { mapGetters } from 'vuex';
+import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
+import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo';
+
+export default {
+    name: 'StationStand',
+    components: {
+        NoticeInfo
+    },
+    data() {
+        return {
+            operate: null,
+            dialogShow: false,
+            disabledClose: false,
+            disabledCommit: false,
+            control: '01',
+            controlProps: {
+                '01': '全线扣车',
+                '02': '取消全线扣车'
+            },
+            controlPropDisabled:{
+                '01':false,
+                '02':false
+            }
+
+        };
+    },
+    computed: {
+        ...mapGetters('map', [
+            'stationList'
+        ]),
+        ...mapGetters('training', [
+            'mode',
+            'started'
+        ]),
+        show() {
+            return this.dialogShow && !this.$store.state.menuOperation.break;
+        },
+        title() {
+            if (this.dialogShow) {
+                if (this.operation == OperationEvent.StationStand.setDetainTrainAll.mbar.operation) {
+                    return '全线扣车';
+                } else if (this.operation == OperationEvent.StationStand.cancelDetainTrainAll.mbar.operation) {
+                    return '取消全线扣车';
+                } else {
+                    return '';
+                }
+            } else {
+                return '';
+            }
+        },
+        domIdCommit() {
+            if (this.dialogShow) {
+                if (this.operation == OperationEvent.StationStand.setDetainTrainAll.mbar.operation) {
+                    return OperationEvent.StationStand.setDetainTrainAll.menu.domId;
+                } else if (this.operation == OperationEvent.StationStand.cancelDetainTrainAll.mbar.operation) {
+                    return OperationEvent.StationStand.cancelDetainTrainAll.menu.domId;
+                }
+            }
+            return '';
+        },
+        domIdCancel() {
+            return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
+        }
+    },
+    watch: {
+        '$store.state.map.keyboardEnterCount': function (val) {
+            if (this.show && !this.disabledCommit) {
+                this.handleCommit();
+            }
+        }
+    },
+    mounted() {
+        this.$nextTick(() => {
+            this.$store.dispatch('training/tipReload');
+        });
+    },
+    methods: {
+        doShow(operate) {
+            if (!this.dialogShow) {
+                this.operate = operate || {};
+                this.operation = operate.operation;
+            }
+
+            if (this.operation == OperationEvent.StationStand.setDetainTrainAll.mbar.operation) {
+                // 设置全线扣车
+                this.control = '01';
+                this.controlPropDisabled['01'] = false;
+                this.controlPropDisabled['02'] = true;
+            } else if (this.operation == OperationEvent.StationStand.cancelDetainTrainAll.mbar.operation) {
+                // 取消全线扣车
+                this.control = '02';
+                this.controlPropDisabled['01'] = true;
+                this.controlPropDisabled['02'] = false;
+            }
+
+            this.dialogShow = true;
+            this.$store.dispatch('training/emitTipFresh');
+        },
+        doClose() {
+            this.dialogShow = false;
+            this.$store.dispatch('training/emitTipFresh');
+        },
+        cancel() {
+            const operate = {
+                type: 'bar',
+                operation: OperationEvent.Command.cancel.menu.operation
+            };
+
+            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                if (valid) {
+                    this.doClose();
+                }
+            });
+        },
+
+        // 路由指令
+        handleCommit() {
+            if (this.operation == OperationEvent.StationStand.setDetainTrainAll.mbar.operation) {
+                // 设置全线扣车
+                this.setDetainTrainAll();
+            } else if (this.operation == OperationEvent.StationStand.cancelDetainTrainAll.mbar.operation) {
+                // 取消全线扣车
+                this.cancelDetainTrainAll();
+            }
+        },
+
+        // 设置全线扣车
+        setDetainTrainAll() {
+            const operate = {
+                send: true,
+                type: MapDeviceType.StationStand.type,
+                operation: OperationEvent.StationStand.setDetainTrainAll.menu.operation,
+                val: this.control,
+                messages: ['确认设置全线扣车！']
+            };
+
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    this.doClose();
+                } else {
+                    this.disabledSure = false;
+                }
+            }).catch(() => {
+                this.loading = false;
+                this.doClose();
+                this.$refs.noticeInfo.doShow();
+            });
+        },
+
+        // 取消全线扣车
+        cancelDetainTrainAll() {
+            const operate = {
+                send: true,
+                type: MapDeviceType.StationStand.type,
+                operation: OperationEvent.StationStand.cancelDetainTrainAll.menu.operation,
+                val: this.control,
+                messages: ['确认取消全线扣车！']
+            };
+
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    this.doClose();
+                } else {
+                    this.disabledSure = false;
+                }
+            }).catch(() => {
+                this.loading = false;
+                this.doClose();
+                this.$refs.noticeInfo.doShow();
+            });
+        }
+    }
+};
+</script>
+<style scoped rel="stylesheet/scss" lang="scss">
+    @import "src/styles/mixin.scss";
+
+    /deep/ .el-radio {
+        color: #000;
+        font-weight: bold;
+    }
+</style>
diff --git a/src/jmapNew/theme/race_01/menus/menuDialog/detainTrainContorlUpDown.vue b/src/jmapNew/theme/race_01/menus/menuDialog/detainTrainContorlUpDown.vue
new file mode 100644
index 000000000..d3f0835a1
--- /dev/null
+++ b/src/jmapNew/theme/race_01/menus/menuDialog/detainTrainContorlUpDown.vue
@@ -0,0 +1,209 @@
+<template>
+  <el-dialog
+    v-dialogDrag
+    class="ningbo-01__systerm station-control"
+    :title="title"
+    :visible.sync="show"
+    width="400px"
+    :before-close="doClose"
+    :show-close="true"
+    :z-index="2000"
+    :modal="false"
+    :close-on-click-modal="false"
+  >
+    <el-radio-group v-model="control">
+      <el-row v-for="item in Object.keys(controlProps)" :key="item" style="padding-bottom: 10px;padding-top:10px">
+        <el-radio :label="item" :disabled="controlPropDisabled[item]">{{ controlProps[item] }}</el-radio>
+      </el-row>
+    </el-radio-group>
+    <el-row type="flex" justify="center" class="button-group">
+      <el-button :id="domIdCommit" :disabled="disabledCommit" @click="handleCommit">设置</el-button>
+      <el-button :id="domIdCancel" :disabled="disabledClose" style="margin-left: 200px" @click="cancel">退出
+      </el-button>
+    </el-row>
+    <notice-info ref="noticeInfo" pop-class="ningbo-01__systerm" />
+  </el-dialog>
+</template>
+
+<script>
+import { mapGetters } from 'vuex';
+import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
+import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo';
+
+export default {
+    name: 'StationStand',
+    components: {
+        NoticeInfo
+    },
+    data() {
+        return {
+            operate: null,
+            dialogShow: false,
+            disabledClose: false,
+            disabledCommit: false,
+            control: '01',
+            controlProps: {
+                '01': '取消上行扣车',
+                '02': '取消下行扣车'
+            },
+            controlPropDisabled:{
+                '01':false,
+                '02':false
+            }
+        };
+    },
+    computed: {
+        ...mapGetters('map', [
+            'stationList'
+        ]),
+        ...mapGetters('training', [
+            'mode',
+            'started'
+        ]),
+        show() {
+            return this.dialogShow && !this.$store.state.menuOperation.break;
+        },
+        title() {
+            if (this.dialogShow) {
+                if (this.operation == OperationEvent.StationStand.cancelUpDetainTrainAll.mbar.operation) {
+                    return '取消上行扣车';
+                } else if (this.operation == OperationEvent.StationStand.cancelDownDetainTrainAll.mbar.operation) {
+                    return '取消下行扣车';
+                }
+            }
+            return '';
+        },
+        domIdCommit() {
+            if (this.dialogShow) {
+                if (this.operation == OperationEvent.StationStand.cancelUpDetainTrainAll.mbar.operation) {
+                    return OperationEvent.StationStand.cancelUpDetainTrainAll.menu.domId;
+                } else if (this.operation == OperationEvent.StationStand.cancelDownDetainTrainAll.mbar.operation) {
+                    return OperationEvent.StationStand.cancelDownDetainTrainAll.menu.domId;
+                }
+            }
+            return '';
+        },
+        domIdCancel() {
+            return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
+        }
+    },
+    watch: {
+        '$store.state.map.keyboardEnterCount': function (val) {
+            if (this.show && !this.disabledCommit) {
+                this.handleCommit();
+            }
+        }
+    },
+    mounted() {
+        this.$nextTick(() => {
+            this.$store.dispatch('training/tipReload');
+        });
+    },
+    methods: {
+        doShow(operate) {
+            if (!this.dialogShow) {
+                this.operate = operate || {};
+                this.operation = operate.operation;
+            }
+
+            if (this.operation == OperationEvent.StationStand.cancelUpDetainTrainAll.mbar.operation) {
+                // 取消全线上行扣车
+                this.control = '01';
+                this.controlPropDisabled['01'] = false;
+                this.controlPropDisabled['02'] = true;
+            } else if (this.operation == OperationEvent.StationStand.cancelDownDetainTrainAll.mbar.operation) {
+                // 取消全线下行扣车
+                this.control = '02';
+                this.controlPropDisabled['01'] = true;
+                this.controlPropDisabled['02'] = false;
+            }
+
+            this.dialogShow = true;
+            this.$store.dispatch('training/emitTipFresh');
+        },
+        doClose() {
+            this.dialogShow = false;
+            this.$store.dispatch('training/emitTipFresh');
+        },
+        cancel() {
+            const operate = {
+                type: 'bar',
+                operation: OperationEvent.Command.cancel.menu.operation
+            };
+
+            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                if (valid) {
+                    this.doClose();
+                }
+            });
+        },
+
+        // 路由指令
+        handleCommit() {
+            if (this.operation == OperationEvent.StationStand.cancelUpDetainTrainAll.mbar.operation) {
+                // 取消全线上行扣车
+                this.cancelUpDetainTrainAll();
+            } else if (this.operation == OperationEvent.StationStand.cancelDownDetainTrainAll.mbar.operation) {
+                // 取消全线下行扣车
+                this.cancelDownDetainTrainAll();
+            }
+        },
+
+        // 取消全线上行扣车
+        cancelUpDetainTrainAll() {
+            const operate = {
+                send: true,
+                type: MapDeviceType.StationStand.type,
+                operation: OperationEvent.StationStand.cancelUpDetainTrainAll.menu.operation,
+                val: this.control,
+                messages: ['确认取消全线上行扣车！']
+            };
+
+            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    this.doClose();
+                } else {
+                    this.disabledSure = false;
+                }
+            }).catch(() => {
+                this.loading = false;
+                this.doClose();
+                this.$refs.noticeInfo.doShow();
+            });
+        },
+
+        // 取消全线下行扣车
+        cancelDetainTrainAll() {
+            const operate = {
+                send: true,
+                type: MapDeviceType.StationStand.type,
+                operation: OperationEvent.StationStand.cancelDownDetainTrainAll.menu.operation,
+                val: this.control,
+                messages: ['确认取消全线下行扣车！']
+            };
+
+            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    this.doClose();
+                } else {
+                    this.disabledSure = false;
+                }
+            }).catch(() => {
+                this.loading = false;
+                this.doClose();
+                this.$refs.noticeInfo.doShow();
+            });
+        }
+    }
+};
+</script>
+<style scoped rel="stylesheet/scss" lang="scss">
+    @import "src/styles/mixin.scss";
+
+    /deep/ .el-radio {
+        color: #000;
+        font-weight: bold;
+    }
+</style>
diff --git a/src/jmapNew/theme/race_01/menus/menuDialog/helpAbout.vue b/src/jmapNew/theme/race_01/menus/menuDialog/helpAbout.vue
new file mode 100644
index 000000000..0348a0cd8
--- /dev/null
+++ b/src/jmapNew/theme/race_01/menus/menuDialog/helpAbout.vue
@@ -0,0 +1,131 @@
+<template>
+    <el-dialog class="ningbo-01__systerm manage-user" :title="title" :visible.sync="show" width="600px" :before-close="doClose"
+        :zIndex="2000" :modal="false" :close-on-click-modal="false" v-dialogDrag>
+        <div style="height: 70px;">
+            <div style="position: relative; left: 10px;">
+            </div>
+            <div style="position: relative; left: 80px;">
+                <div style="width:100%">
+                    <span style="padding-left: 60px">ControlMonitor 1.3.5.0</span>
+                    <el-button style="position: absolute; right: 95px;" :id="domIdConfirm" type="primary"
+                        :loading="loading" @click="commit">确定</el-button>
+                </div>
+                <div style="width:100%; padding-top: 20px">
+                    <span> 版权所有（C）2010-2011 北京玖琏科技有限公司</span>
+                </div>
+            </div>
+        </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 { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
+
+    export default {
+        name: 'ManageUser',
+        data() {
+            return {
+                tableData: [
+                    {
+                        moduleName: '主程序版本:',
+                        version: '123',
+                        updateDate: '123'
+                    }
+                ],
+                operate: {},
+                operation: null,
+                dialogShow: false,
+                loading: false,
+                selected: null,
+            }
+        },
+        computed: {
+            show() {
+                return this.dialogShow && !this.$store.state.menuOperation.break;
+            },
+            domIdCancel() {
+                return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
+            },
+            domIdConfirm() {
+                return this.dialogShow ? OperationEvent.Command.close.menu.domId : '';
+            },
+            title() {
+                return '关于ControlMonitor'
+            }
+        },
+        mounted() {
+            this.$nextTick(() => {
+                this.$store.dispatch('training/tipReload');
+            })
+        },
+        methods: {
+            doShow(operate) {
+                //非断电激活时设置初始值
+                if (!this.dialogShow) {
+                    this.loading = false;
+                    this.operate = operate || {};
+                    this.operation = operate.operation;
+                }
+
+                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/next', operate).then(({ valid }) => {
+                    this.loading = false;
+                    if (valid) {
+                        this.doClose();
+                    }
+                }).catch(error => {
+                    this.loading = false;
+                    this.doClose();
+                })
+            },
+            cancel() {
+                let operate = {
+                    type: this.operate.type,
+                    operation: OperationEvent.Command.cancel.menu.operation,
+                }
+
+                this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                    if (valid) {
+                        this.doClose();
+                    }
+                }).catch(error => { this.doClose(); });
+            }
+        }
+    }
+</script>
+<style scoped>
+    .ningbo-01__systerm .el-dialog .base-label {
+        background: rgba(0, 0, 0, x);
+        position: relative;
+        left: -5px;
+        top: -10px;
+        padding: 0 5px;
+        background-color: #F0F0F0;
+    }
+</style>
\ No newline at end of file
diff --git a/src/jmapNew/theme/race_01/menus/menuDialog/manageUser.vue b/src/jmapNew/theme/race_01/menus/menuDialog/manageUser.vue
new file mode 100644
index 000000000..6c22ac606
--- /dev/null
+++ b/src/jmapNew/theme/race_01/menus/menuDialog/manageUser.vue
@@ -0,0 +1,290 @@
+<template>
+    <el-dialog class="ningbo-01__systerm manage-user" :title="title" :visible.sync="show" width="420px"
+        :before-close="doClose" :zIndex="2000" :modal="false" :close-on-click-modal="false" v-dialogDrag>
+        <div style="padding: 5px 5px; border: 1px double lightgray; margin: 20px 0px; ">
+            <span class="base-label">用户列表</span>
+            <el-row>
+                <el-col :span="18">
+                    <el-table ref="multipleTable" :data="tableData" border row-key="code" style="width: 100%"
+                        height="450" center size="mini" highlight-current-row @row-click="chooseUser">
+                        <el-table-column prop="jobNumber" label="工号" width="120">
+                            <template slot-scope="scope">
+                                <span>{{scope.row.jobNumber}}</span>
+                            </template>
+                        </el-table-column>
+                        <el-table-column prop="userName" label="用户名">
+                            <template slot-scope="scope">
+                                <span>{{scope.row.userName}}</span>
+                            </template>
+                        </el-table-column>
+                        <el-table-column width="20">
+                        </el-table-column>
+                    </el-table>
+                </el-col>
+                <el-col :span="4">
+                    <el-button style="margin-top: 140px; margin-left: 10px;" :id="domIdFreshUser" @click="freshUser">刷新
+                    </el-button>
+                    <el-button style="margin-top: 30px; margin-left: 10px;" :id="domIdAddUser" @click="addUser">增加
+                    </el-button>
+                    <el-button style="margin-top: 30px; margin-left: 10px;" :id="domIdEditUser" @click="editUser">修改
+                    </el-button>
+                    <el-button style="margin-top: 30px; margin-left: 10px;" :id="domIdDelUser" @click="delUser">删除
+                    </el-button>
+                </el-col>
+            </el-row>
+        </div>
+        <el-row justify="center" class="button-group">
+            <el-col :span="8" :offset="6">
+                <el-button :id="domIdConfirm" type="primary" :loading="loading" @click="commit">确定</el-button>
+            </el-col>
+            <el-col :span="8" :offset="0">
+                <el-button :id="domIdCancel" @click="cancel">取 消</el-button>
+            </el-col>
+        </el-row>
+        <user-add ref="userAdd" @operateUser="operateUser"></user-add>
+        <user-edit ref="userEdit" @operateUser="operateUser"></user-edit>
+        <user-delete ref="userDelete" @operateUser="operateUser"></user-delete>
+    </el-dialog>
+</template>
+
+<script>
+    import { mapGetters } from 'vuex';
+    import UserAdd from './childDialog/userAdd';
+    import UserEdit from './childDialog/userEdit';
+    import UserDelete from './childDialog/userDelete';
+    import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
+
+    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 '用户管理'
+            }
+        },
+        mounted() {
+            this.$nextTick(() => {
+                this.$store.dispatch('training/tipReload');
+            })
+        },
+        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/next', 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/next', operate).then(({ valid }) => {
+                        this.loading = false;
+                        if (valid) {
+                            this.$refs.userEdit.doShow(operate, this.selected);
+                        }
+                    }).catch(error => {
+                        this.loading = false;
+                    })
+                } else {
+                    this.$messageBox('请先选择用户');
+                }
+            },
+            //删除用户
+            delUser() {
+                if (this.selected) {
+                    let operate = {
+                        type: this.operate.type,
+                        operation: OperationEvent.Command.manage.delUser.operation,
+                        messages: [`你确定删除用户${this.selected.userName}吗？`]
+                    }
+
+                    this.loading = true;
+                    this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                        this.loading = false;
+                        if (valid) {
+                            this.$refs.userDelete.doShow(operate, this.selected);
+                        }
+                    }).catch(error => {
+                        this.loading = false;
+                    })
+                } else {
+                    this.$messageBox('请先选择用户');
+                }
+            },
+            //刷新用户
+            freshUser() {
+                let operate = {
+                    type: this.operate.type,
+                    operation: OperationEvent.Command.manage.freshUser.operation,
+                }
+
+                this.loading = true;
+                this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                    this.loading = false;
+                }).catch(error => {
+                    this.loading = false;
+                })
+            },
+            //选择用户
+            chooseUser(row) {
+                let operate = {
+                    type: this.operate.type,
+                    operation: OperationEvent.Command.manage.chooseUser.operation,
+                }
+
+                this.loading = true;
+                this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                    this.loading = false;
+                    this.selected = row;
+                }).catch(error => {
+                    this.loading = false;
+                })
+            },
+            commit() {
+                let operate = {
+                    type: this.operate.type,
+                    operation: OperationEvent.Command.close.menu.operation,
+                }
+
+                this.loading = true;
+                this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                    this.loading = false;
+                    if (valid) {
+                        this.doClose();
+                    }
+                }).catch(error => {
+                    this.loading = false;
+                    this.doClose();
+                })
+            },
+            cancel() {
+                let operate = {
+                    type: this.operate.type,
+                    operation: OperationEvent.Command.cancel.menu.operation,
+                }
+
+                this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                    if (valid) {
+                        this.doClose();
+                    }
+                }).catch(error => { this.doClose(); });
+            },
+            //增删改函数处理
+            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>
+    .ningbo-01__systerm .el-dialog .base-label {
+        background: rgba(0, 0, 0, x);
+        position: relative;
+        left: -5px;
+        top: -10px;
+        padding: 0 5px;
+        background-color: #F0F0F0;
+    }
+</style>
\ No newline at end of file
diff --git a/src/jmapNew/theme/race_01/menus/menuDialog/stationControl.vue b/src/jmapNew/theme/race_01/menus/menuDialog/stationControl.vue
new file mode 100644
index 000000000..219792dfc
--- /dev/null
+++ b/src/jmapNew/theme/race_01/menus/menuDialog/stationControl.vue
@@ -0,0 +1,272 @@
+<template>
+  <el-dialog
+    v-dialogDrag
+    class="ningbo-01__systerm station-control"
+    title="控制模式转换"
+    :visible.sync="show"
+    width="400px"
+    :before-close="doClose"
+    :show-close="true"
+    :z-index="2000"
+    :modal="false"
+    :close-on-click-modal="false"
+  >
+    <el-row> 集中站 </el-row>
+    <el-row style="margin-bottom: 20px">
+      <el-select
+        :id="domIdChooseStation"
+        ref="chooseStation"
+        v-model="station"
+        value-key="code"
+        filterable
+        placeholder="请选择"
+        style="width: 100%;"
+        @change="handleChooseChangeStation"
+      >
+        <el-option v-for="item in concertrateStationList" :key="item.code" :label="item.name" :value="item" />
+      </el-select>
+
+    </el-row>
+    <el-radio-group :id="domIdChooseControl" v-model="stationType">
+      <el-row v-for="item in Object.keys(controlProps)" :key="item" style="padding-bottom: 10px">
+        <el-radio :label="item" @change="handleChooseChangeControl">
+          {{ controlProps[item] }}</el-radio>
+      </el-row>
+    </el-radio-group>
+    <div class="message" style="color:#ff0000;font-size:14px;margin-left:10px">{{ message }}</div>
+    <el-row type="flex" justify="center" class="button-group">
+      <el-button :id="domIdCommit" :disabled="disabledCommit" @click="handleCommit">设置</el-button>
+      <el-button :id="domIdCancel" :disabled="disabledClose" style="margin-left: 200px" @click="cancel">退出
+      </el-button>
+    </el-row>
+
+    <two-confirmation ref="twoConfirmation" />
+  </el-dialog>
+</template>
+
+<script>
+import { mapGetters } from 'vuex';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
+import TwoConfirmation from './childDialog/twoConfirmation';
+import {menuOperate, commitOperate} from '@/jmapNew/theme/components/utils/menuOperate';
+
+export default {
+    name: 'StationControl',
+    components: {
+        TwoConfirmation
+    },
+    data() {
+        return {
+            operate: null,
+            dialogShow: false,
+            disabledClose: false,
+            disabledCommit: false,
+            stationType: '01',
+            station:{},
+            stationCode: '',
+            stationName:'',
+            message:'',
+            controlProps: {
+                '03': '紧急站控',
+                '02': '站控',
+                '01': '遥控'
+            }
+        };
+    },
+    computed: {
+        ...mapGetters('map', [
+            'stationList'
+        ]),
+        ...mapGetters('training', [
+            'mode',
+            'started'
+        ]),
+        show() {
+            return this.dialogShow && !this.$store.state.menuOperation.break;
+        },
+        domIdChooseControl() {
+            return this.dialogShow ? OperationEvent.Command.order.choose.domId : '';
+        },
+        domIdChooseStation() {
+            return this.dialogShow ? OperationEvent.Command.order.choose1.domId : '';
+        },
+        domIdCommit() {
+            if (this.dialogShow) {
+                if (this.stationType == '01') {
+                    return OperationEvent.StationControl.requestCentralControl.menu.domId;
+                } else if (this.stationType == '02') {
+                    return OperationEvent.StationControl.requestStationControl.menu.domId;
+                } else if (this.stationType == '03') {
+                    return OperationEvent.StationControl.emergencyStationControl.menu.domId;
+                } else {
+                    return '';
+                }
+            } else {
+                return '';
+            }
+        },
+        domIdCancel() {
+            return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
+        },
+        concertrateStationList() {
+            return this.stationList.filter(station=>{
+                return station.centralized;
+            });
+        }
+    },
+    watch: {
+        '$store.state.map.keyboardEnterCount': function (val) {
+            if (this.show && !this.disabledCommit) {
+                this.handleCommit();
+            }
+        },
+        '$store.state.map.controlTransfer':function (controlTransferList) {
+            controlTransferList.forEach(controlTransfer=>{
+                this.updateTableValue(controlTransfer);
+            });
+        }
+    },
+    mounted() {
+        this.$nextTick(() => {
+            this.$store.dispatch('training/tipReload');
+        });
+    },
+    methods: {
+        doShow(operate) {
+            this.message = '';
+            if (!this.dialogShow) {
+                this.operate = operate || {};
+                this.operation = operate.operation;
+            }
+            this.dialogShow = true;
+            // if (this.$store.state.training.prdType == '01') {
+            //     this.controlProps = {
+            //         '03': '紧急站控',
+            //         '02': '站控'
+            //     };
+            // }
+            this.$store.dispatch('training/emitTipFresh');
+        },
+        updateTableValue(controlTransfer) {
+            this.concertrateStationList.forEach((row, index) => {
+                if (row.code == controlTransfer.code) {
+                    if (controlTransfer.applicantId) {
+                        this.disabledCommit = true;
+                    } else {
+                        this.disabledCommit = false;
+                    }
+                }
+            });
+        },
+        doClose() {
+            this.dialogShow = false;
+            this.$store.dispatch('training/emitTipFresh');
+            this.$store.dispatch('socket/shiftMsgQueue');
+        },
+        cancel() {
+            const operate = {
+                type: 'bar',
+                operation: OperationEvent.Command.cancel.menu.operation
+            };
+
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                if (valid) {
+                    this.doClose();
+                }
+            });
+        },
+        handleChooseChangeStation(data) {
+            this.stationCode = data.code;
+            this.stationName = data.name;
+            this.message = '';
+            const operate = {
+                operation: OperationEvent.Command.order.choose1.operation,
+                val: this.stationCode
+            };
+
+            // if (this.stationType == '01') {
+            //     operate.operation = OperationEvent.StationControl.requestCentralControl.choose1.operation
+            // } else if (this.stationType == '02') {
+            //     operate.operation = OperationEvent.StationControl.requestStationControl.choose1.operation
+            // } else if (this.stationType == '03') {
+            //     operate.operation = OperationEvent.StationControl.emergencyStationControl.choose1.operation
+            // }
+
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    this.$refs.chooseStation.blur();
+                }
+            });
+        },
+        handleChooseChangeControl() {
+            const operate = {
+                operation: OperationEvent.Command.order.choose.operation,
+                val: this.stationCode
+            };
+
+            // if (this.stationType == '01') {
+            //     operate.operation = OperationEvent.StationControl.requestCentralControl.choose.operation
+            // } else if (this.stationType == '02') {
+            //     operate.operation = OperationEvent.StationControl.requestStationControl.choose.operation
+            // } else if (this.stationType == '03') {
+            //     operate.operation = OperationEvent.StationControl.emergencyStationControl.choose.operation
+            // }
+
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                }
+            });
+        },
+        // 路由指令
+        handleCommit() {
+            if (this.stationCode == '' || this.stationCode == null) {
+                this.message = '请选择车站';
+                return false;
+            } else {
+                this.message = '';
+                if (this.stationType == '01') {
+                // 请求遥控
+                    this.conterCommit();
+                } else if (this.stationType == '02') {
+                // 请求站控
+                    this.requestCommit();
+                } else if (this.stationType == '03') {
+                // 紧急站控
+                    this.emergencyCommit();
+                }
+            }
+        },
+        // 请求遥控
+        conterCommit() {
+            commitOperate(menuOperate.StationControl.requestCentralControl, {stationCodes:[this.stationCode]}, 0).then((data)=>{
+                this.doClose();
+                this.$refs.twoConfirmation.doShow(data.operate, '确认将如下操作区域的控制模式由站控转为遥控:\n' + this.stationName);
+            });
+        },
+        // 请求站控
+        requestCommit() {
+            commitOperate(menuOperate.StationControl.requestStationControl, {stationCodes:[this.stationCode]}, 0).then((data)=>{
+                this.doClose();
+                this.$refs.twoConfirmation.doShow(data.operate, '确认将如下操作区域的控制模式由中控转为站控:\n' + this.stationName);
+            });
+        },
+        // 紧急站控
+        emergencyCommit() {
+            commitOperate(menuOperate.StationControl.emergencyStationControl, {stationCodes:[this.stationCode]}, 0).then((data)=>{
+                this.doClose();
+                this.$refs.twoConfirmation.doShow(data.operate, '确认将如下操作区域的控制模式由中控转为站控:\n' + this.stationName);
+            });
+        }
+    }
+};
+</script>
+<style scoped rel="stylesheet/scss" lang="scss" scoped>
+    @import "src/styles/mixin.scss";
+
+    /deep/ .el-radio {
+        color: #000;
+        font-weight: bold;
+    }
+</style>
diff --git a/src/jmap/theme/fuzhou_01/menus/menuDialog/trainAdd.vue b/src/jmapNew/theme/race_01/menus/menuDialog/trainAdd.vue
similarity index 78%
rename from src/jmap/theme/fuzhou_01/menus/menuDialog/trainAdd.vue
rename to src/jmapNew/theme/race_01/menus/menuDialog/trainAdd.vue
index a200845d9..ae759a395 100644
--- a/src/jmap/theme/fuzhou_01/menus/menuDialog/trainAdd.vue
+++ b/src/jmapNew/theme/race_01/menus/menuDialog/trainAdd.vue
@@ -1,7 +1,7 @@
 <template>
   <el-dialog
     v-dialogDrag
-    class="fuzhou-01__systerm stand-stop-time"
+    class="ningbo-01__systerm stand-stop-time"
     :title="title"
     :visible.sync="show"
     width="320px"
@@ -12,11 +12,11 @@
   >
     <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">{{ $t('menu.menuDialog.addLocation') }}</span>
+        <span class="base-label">添加位置</span>
         <div style="position: relative; top:-10px;">
           <el-form-item prop="stationStandCode">
-            <span slot="label">{{ $t('menu.menuDialog.terminalOne') }}</span>
-            <el-select v-model="addModel.stationStandCode" filterable :placeholder="$t('menu.menuDialog.pleaseSelect')">
+            <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"
@@ -25,22 +25,21 @@
               />
             </el-select>
           </el-form-item>
-          <el-form-item prop="trainNumberLimber">
-            <span id="frontTrainNumber" slot="label">{{ $t('menu.menuDialog.frontTrainNumber') }}</span>
+          <el-form-item label="前车车次号:" prop="trainNumberLimber">
             <el-input v-model="addModel.trainNumberLimber" />
           </el-form-item>
         </div>
       </div>
-      <el-form-item id="groupNumber" :label="$t('menu.menuDialog.addTrainNumber')" label-width="115px" prop="groupNumber">
+      <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">{{ $t('menu.menuDialog.confirm') }}</el-button>
+        <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">{{ $t('menu.menuDialog.cancel') }}</el-button>
+        <el-button :id="domIdCancel" @click="cancel">取 消</el-button>
       </el-col>
     </el-row>
   </el-dialog>
@@ -65,13 +64,13 @@ export default {
 
             rules: {
                 groupNumber: [
-                    { required: true, message: this.$t('menu.menuDialog.inputTrainNumber'), trigger: 'blur' }
+                    { required: true, message: '请输入车次号', trigger: 'blur' }
                 ],
                 // trainNumberLimber: [
                 //     { required: true, message: '请输入前车车次号', trigger: 'blur' }
                 // ],
                 stationStandCode: [
-                    { required: true, message: this.$t('menu.menuDialog.selectTerminal'), trigger: 'change' }
+                    { required: true, message: '请选择终端', trigger: 'change' }
                 ]
             },
             operation: null,
@@ -93,7 +92,7 @@ export default {
             return this.dialogShow ? OperationEvent.Command.planTrain.addPlanTrain.domId : '';
         },
         title() {
-            return this.$t('menu.menuDialog.addPlanTrain');
+            return '添加计划车';
         }
     },
     mounted() {
@@ -135,13 +134,10 @@ export default {
                         this.loading = false;
                         if (valid) {
                             this.doClose();
-                        } else {
-                            // this.$refs.noticeInfo.doShow(operate);
                         }
                     }).catch(() => {
                         this.loading = false;
                         this.doClose();
-                        // this.$refs.noticeInfo.doShow(operate);
                     });
                 } else {
                     return false;
@@ -164,7 +160,7 @@ export default {
 };
 </script>
 <style scoped>
-    .fuzhou-01__systerm .el-dialog .base-label {
+    .ningbo-01__systerm .el-dialog .base-label {
         background: rgba(0, 0, 0, x);
         position: relative;
         left: -5px;
@@ -172,8 +168,4 @@ export default {
         padding: 0 5px;
         background-color: #F0F0F0;
     }
-    #frontTrainNumber,#groupNumber label{
-        line-height: 100%;
-        display: inline-block;
-    }
 </style>
diff --git a/src/jmap/theme/fuzhou_01/menus/menuDialog/trainDelete.vue b/src/jmapNew/theme/race_01/menus/menuDialog/trainDelete.vue
similarity index 81%
rename from src/jmap/theme/fuzhou_01/menus/menuDialog/trainDelete.vue
rename to src/jmapNew/theme/race_01/menus/menuDialog/trainDelete.vue
index 3e9138938..5eaa74ee4 100644
--- a/src/jmap/theme/fuzhou_01/menus/menuDialog/trainDelete.vue
+++ b/src/jmapNew/theme/race_01/menus/menuDialog/trainDelete.vue
@@ -1,7 +1,7 @@
 <template>
   <el-dialog
     v-dialogDrag
-    class="fuzhou-01__systerm stand-stop-time"
+    class="ningbo-01__systerm stand-stop-time"
     :title="title"
     :visible.sync="show"
     width="320px"
@@ -12,21 +12,21 @@
   >
     <el-form ref="form" size="small" label-width="100px" :model="addModel" :rules="rules">
       <el-form-item prop="stationStandCode">
-        <span slot="label">{{ $t('menu.menuDialog.terminalTwo') }}</span>
-        <el-select v-model="addModel.stationStandCode" filterable :placeholder="$t('menu.menuDialog.pleaseSelect')">
+        <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="$t('menu.menuDialog.trainNumber')" prop="groupNumber">
+      <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">{{ $t('menu.menuDialog.confirm') }}</el-button>
+        <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">{{ $t('menu.menuDialog.cancel') }}</el-button>
+        <el-button :id="domIdCancel" @click="cancel">取 消</el-button>
       </el-col>
     </el-row>
   </el-dialog>
@@ -50,10 +50,10 @@ export default {
 
             rules: {
                 groupNumber: [
-                    { required: true, message: this.$t('menu.menuDialog.inputTrainNumber'), trigger: 'blur' }
+                    { required: true, message: '请输入车次号', trigger: 'blur' }
                 ],
                 stationStandCode: [
-                    { required: true, message: this.$t('menu.menuDialog.selectTerminal'), trigger: 'change' }
+                    { required: true, message: '请选择终端', trigger: 'change' }
                 ]
             },
             operation: null,
@@ -75,7 +75,7 @@ export default {
             return this.dialogShow ? OperationEvent.Command.planTrain.delPlanTrain.domId : '';
         },
         title() {
-            return this.$t('menu.menuDialog.deletePlanTrain');
+            return '删除计划车';
         }
     },
     mounted() {
@@ -117,13 +117,10 @@ export default {
                         this.loading = false;
                         if (valid) {
                             this.doClose();
-                        } else {
-                            // this.$refs.noticeInfo.doShow(operate);
                         }
                     }).catch(() => {
                         this.loading = false;
                         this.doClose();
-                        // this.$refs.noticeInfo.doShow(operate);
                     });
                 } else {
                     return false;
@@ -146,7 +143,7 @@ export default {
 };
 </script>
 <style scoped>
-    .fuzhou-01__systerm .el-dialog .base-label {
+    .ningbo-01__systerm .el-dialog .base-label {
         background: rgba(0, 0, 0, x);
         position: relative;
         left: -5px;
diff --git a/src/jmap/theme/fuzhou_01/menus/menuDialog/trainTranstalet.vue b/src/jmapNew/theme/race_01/menus/menuDialog/trainTranstalet.vue
similarity index 79%
rename from src/jmap/theme/fuzhou_01/menus/menuDialog/trainTranstalet.vue
rename to src/jmapNew/theme/race_01/menus/menuDialog/trainTranstalet.vue
index a6b93c428..133de1d96 100644
--- a/src/jmap/theme/fuzhou_01/menus/menuDialog/trainTranstalet.vue
+++ b/src/jmapNew/theme/race_01/menus/menuDialog/trainTranstalet.vue
@@ -1,7 +1,7 @@
 <template>
   <el-dialog
     v-dialogDrag
-    class="fuzhou-01__systerm stand-stop-time"
+    class="ningbo-01__systerm stand-stop-time"
     :title="title"
     :visible.sync="show"
     width="320px"
@@ -11,15 +11,15 @@
     :close-on-click-modal="false"
   >
     <el-form ref="form" size="small" label-width="100px" :model="addModel" :rules="rules">
-      <el-form-item :label="$t('menu.menuDialog.trainNumber')" label-width="115px" prop="groupNumber">
+      <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">{{ $t('menu.menuDialog.purpose') }}</span>
+        <span class="base-label">目的</span>
         <div style="position: relative; top:-10px;">
           <el-form-item prop="stationStandCode">
-            <span slot="label">{{ $t('menu.menuDialog.terminalTwo') }}</span>
-            <el-select v-model="addModel.stationStandCode" filterable :placeholder="$t('menu.menuDialog.pleaseSelect')">
+            <span slot="label">终&emsp;&emsp;端:</span>
+            <el-select v-model="addModel.stationStandCode" filterable placeholder="请选择">
               <el-option
                 v-for="item in stationStandList"
                 :key="item.code"
@@ -28,7 +28,7 @@
               />
             </el-select>
           </el-form-item>
-          <el-form-item :label="$t('menu.menuDialog.trainNumber')" prop="trainNumberLimber">
+          <el-form-item label="车 次 号:" prop="trainNumberLimber">
             <el-input v-model="addModel.trainNumberLimber" />
           </el-form-item>
         </div>
@@ -36,10 +36,10 @@
     </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">{{ $t('menu.menuDialog.confirm') }}</el-button>
+        <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">{{ $t('menu.menuDialog.cancel') }}</el-button>
+        <el-button :id="domIdCancel" @click="cancel">取 消</el-button>
       </el-col>
     </el-row>
   </el-dialog>
@@ -64,13 +64,13 @@ export default {
 
             rules: {
                 groupNumber: [
-                    { required: true, message: this.$t('menu.menuDialog.inputTrainNumber'), trigger: 'blur' }
+                    { required: true, message: '请输入车次号', trigger: 'blur' }
                 ],
                 trainNumberLimber: [
-                    { required: true, message: this.$t('menu.menuDialog.inputFrontNumber'), trigger: 'blur' }
+                    { required: true, message: '请输入前车车次号', trigger: 'blur' }
                 ],
                 stationStandCode: [
-                    { required: true, message: this.$t('menu.menuDialog.selectTerminal'), trigger: 'change' }
+                    { required: true, message: '请选择终端', trigger: 'change' }
                 ]
             },
             operation: null,
@@ -92,7 +92,7 @@ export default {
             return this.dialogShow ? OperationEvent.Command.planTrain.translatPlanTrain.domId : '';
         },
         title() {
-            return this.$t('menu.menuDialog.panPlanCar');
+            return '平移计划车';
         }
     },
     mounted() {
@@ -134,13 +134,10 @@ export default {
                         this.loading = false;
                         if (valid) {
                             this.doClose();
-                        } else {
-                            // this.$refs.noticeInfo.doShow(operate);
                         }
                     }).catch(() => {
                         this.loading = false;
                         this.doClose();
-                        // this.$refs.noticeInfo.doShow(operate);
                     });
                 } else {
                     return false;
diff --git a/src/jmapNew/theme/race_01/menus/menuLimit.vue b/src/jmapNew/theme/race_01/menus/menuLimit.vue
new file mode 100644
index 000000000..d574ef2b6
--- /dev/null
+++ b/src/jmapNew/theme/race_01/menus/menuLimit.vue
@@ -0,0 +1,104 @@
+<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:'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
+                    }
+                ]
+            }
+        };
+    },
+    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
new file mode 100644
index 000000000..319ddf7f4
--- /dev/null
+++ b/src/jmapNew/theme/race_01/menus/menuPower.vue
@@ -0,0 +1,117 @@
+<template>
+  <div>
+    <pop-menu ref="popMenu" :menu="menu" />
+    <set-fault ref="setFault" pop-class="ningbo-01__systerm" />
+  </div>
+</template>
+<script>
+import PopMenu from '@/components/PopMenu';
+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',
+    components: {
+        PopMenu,
+        SetFault
+    },
+    props: {
+        selected: {
+            type: Object,
+            default() {
+                return null;
+            }
+        }
+    },
+    data( ) {
+        return {
+            menu: [],
+            menuForce: [
+                {
+                    label: '设置故障',
+                    handler: this.setStoppage,
+                    cmdType:CMD.Fault.CMD_SET_FAULT
+                },
+                {
+                    label: '取消故障',
+                    handler: this.cancelStoppage,
+                    cmdType:CMD.Fault.CMD_CANCEL_FAULT
+                },
+                {
+                    label: '触发故障管理',
+                    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.Power) && !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();
+            }
+        },
+        // 设置故障
+        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);
+                }
+            });
+        },
+        triggerFaultManagement() {
+            this.$store.dispatch('training/setTriggerFaultCount', this.selected);
+        }
+    }
+};
+</script>
diff --git a/src/jmapNew/theme/race_01/menus/menuSection.vue b/src/jmapNew/theme/race_01/menus/menuSection.vue
new file mode 100644
index 000000000..03bd20178
--- /dev/null
+++ b/src/jmapNew/theme/race_01/menus/menuSection.vue
@@ -0,0 +1,309 @@
+<template>
+  <div>
+    <pop-menu ref="popMenu" :menu="menu" />
+    <section-control ref="sectionControl" pop-class="ningbo-01__systerm" />
+    <section-un-lock ref="sectionUnLock" pop-class="ningbo-01__systerm" />
+    <speed-limit-control ref="speedLimitControl" pop-class="ningbo-01__systerm" />
+    <alxe-effective ref="alxeEffective" />
+    <notice-info ref="noticeInfo" pop-class="ningbo-01__systerm" />
+    <set-fault ref="setFault" pop-class="ningbo-01__systerm" />
+    <train-add-plan ref="trainAddPlan" pop-class="ningbo-01__systerm" />
+    <load-spare-train ref="loadSpareTrain" pop-class="ningbo-01__systerm" />
+  </div>
+</template>
+
+<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 SectionUnLock from '@/jmapNew/theme/components/menus/dialog/sectionUnLock';
+import SpeedLimitControl from '@/jmapNew/theme/components/menus/dialog/speedCmdControl';
+import AlxeEffective from './dialog/alxeEffective';
+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 LoadSpareTrain from '@/jmapNew/theme/components/menus/dialog/loadSpareTrain';
+
+export default {
+    name: 'SectionMenu',
+    components: {
+        PopMenu,
+        SectionControl,
+        SectionUnLock,
+        SpeedLimitControl,
+        AlxeEffective,
+        NoticeInfo,
+        TrainAddPlan,
+        SetFault,
+        LoadSpareTrain
+    },
+    props: {
+        selected: {
+            type: Object,
+            default() {
+                return null;
+            }
+        }
+    },
+    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
+                    }
+                ]
+            },
+            menuForce: [
+                {
+                    label: this.$t('menu.menuSection.setFault'),
+                    handler: this.setStoppage,
+                    cmdType: CMD.Fault.CMD_SET_FAULT
+                },
+                {
+                    label: this.$t('menu.menuSection.cancelFault'),
+                    handler: this.cancelStoppage,
+                    cmdType: CMD.Fault.CMD_CANCEL_FAULT
+                },
+                {
+                    label: '触发故障管理',
+                    handler: this.triggerFaultManagement,
+                    cmdType: CMD.Fault.CMD_TRIGGER_FAULT
+                },
+                {
+                    label: '设置备用车',
+                    handler: this.loadSpare,
+                    cmdType: CMD.Section.CMD_TRAIN_LOAD_SPARE_TRAIN
+                }
+            ]
+        };
+    },
+    computed: {
+        ...mapGetters('training', [
+            'mode',
+            'operatemode'
+        ]),
+        ...mapGetters('menuOperation', [
+            'buttonOperation'
+        ])
+    },
+    watch: {
+        '$store.state.menuOperation.menuCount': function (val) {
+            if (this.$store.getters['menuOperation/checkDialogIsOpen'](DeviceMenu.Section) && !this.buttonOperation) {
+                this.doShow(this.$store.state.menuOperation.menuPosition);
+            } else {
+                this.doClose();
+            }
+        }
+    },
+    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
+            });
+        }
+    },
+    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();
+            }
+        },
+        // 新建计划车(开发专用)
+        addPlanTrain() {
+            commitOperate(menuOperate.Train.createPlanTrain, {sectionCode:this.selected.code}, 0).then(({valid, operate})=>{
+                if (valid) {
+                    this.$refs.trainAddPlan.doShow(operate);
+                }
+            });
+        },
+        // // 设置计轴失效
+        // alxeFailure() {
+        //     this.mouseCancelState(this.selected);
+        //     commitOperate(menuOperate.Section.alxeFailure, {sectionCode:this.selected.code}, 3).then(({valid, operate})=>{
+        //     }).catch(()=>{
+        //         this.$refs.noticeInfo.doShow();
+        //     });
+        // },
+        // 故障解锁
+        fault() {
+            commitOperate(menuOperate.Section.fault, {sectionCode:this.selected.code}, 0).then(({valid, operate})=>{
+                if (valid) {
+                    this.$refs.sectionUnLock.doShow(operate, this.selected);
+                }
+            });
+        },
+        // 切除
+        split() {
+            const hasParentCode = (this.selected.type == '02' || this.selected.type == '03');
+            const sectionCode = hasParentCode ? this.selected.parentCode : this.selected.code;
+            commitOperate(menuOperate.Section.split, {sectionCode:sectionCode}, 0).then(({valid, operate})=>{
+                if (valid) {
+                    this.$refs.sectionControl.doShow(operate, this.selected);
+                }
+            });
+        },
+        loadSpare() {
+            commitOperate(menuOperate.Section.loadSpareTrain, {sectionCode:this.selected.code}).then(({valid, operate})=>{
+                if (valid) {
+                    this.$refs.loadSpareTrain.doShow(operate, this.selected);
+                }
+            });
+        },
+        // 确认计轴有效
+        alxeEffective() {
+            commitOperate(menuOperate.Section.alxeEffective, {sectionCode:this.selected.code}, 0).then(({valid, operate})=>{
+                if (valid) {
+                    this.$refs.alxeEffective.doShow(operate, this.selected);
+                }
+            });
+        },
+        // 区段激活
+        active() {
+            const hasParentCode = (this.selected.type == '02' || this.selected.type == '03');
+            const sectionCode = hasParentCode ? this.selected.parentCode : this.selected.code;
+            commitOperate(menuOperate.Section.active, {sectionCode:sectionCode}, 0).then(({valid, operate})=>{
+                if (valid) {
+                    this.$refs.sectionControl.doShow(operate, this.selected);
+                }
+            });
+        },
+        // 区段封锁
+        lock() {
+            commitOperate(menuOperate.Section.lock, {sectionCode:this.selected.code}, 0).then(({valid, operate})=>{
+                if (valid) {
+                    this.$refs.sectionControl.doShow(operate, this.selected);
+                }
+            });
+        },
+        // 区段解锁
+        unlock() {
+            commitOperate(menuOperate.Section.unlock, {sectionCode:this.selected.code}, 0).then(({valid, operate})=>{
+                if (valid) {
+                    this.$refs.sectionUnLock.doShow(operate, this.selected);
+                }
+            });
+        },
+        // 设置速度
+        setSpeed() {
+            let sectionCode = this.selected.code;
+            if (this.selected.type == '02' || this.selected.type == '03') {
+                sectionCode = this.selected.parentCode;
+            }
+            commitOperate(menuOperate.Section.setSpeed, {sectionCode:sectionCode}, 0).then(({valid, operate})=>{
+                if (valid) {
+                    this.$refs.speedLimitControl.doShow(operate, this.selected);
+                }
+            });
+        },
+        cancelSpeed() {
+            let sectionCode = this.selected.code;
+            if (this.selected.type == '02' || this.selected.type == '03') {
+                sectionCode = this.selected.parentCode;
+            }
+            commitOperate(menuOperate.Section.cancelSpeed, {sectionCode:sectionCode}).then(({valid, operate})=>{
+                if (valid) {
+                    this.$refs.speedLimitControl.doShow(operate, this.selected);
+                }
+            });
+        },
+        // 设置故障
+        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);
+                }
+            });
+        },
+        triggerFaultManagement() {
+            this.$store.dispatch('training/setTriggerFaultCount', this.selected);
+        }
+    }
+};
+</script>
diff --git a/src/jmapNew/theme/race_01/menus/menuSignal.vue b/src/jmapNew/theme/race_01/menus/menuSignal.vue
new file mode 100644
index 000000000..cbe028284
--- /dev/null
+++ b/src/jmapNew/theme/race_01/menus/menuSignal.vue
@@ -0,0 +1,371 @@
+<template>
+  <div>
+    <pop-menu ref="popMenu" :menu="menu" />
+    <route-selection ref="routeSelection" />
+    <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" />
+    <route-detail ref="routeDetail" system-name="ningbo-01__systerm" />
+    <router-command ref="routerCommand" />
+    <notice-info ref="noticeInfo" pop-class="ningbo-01__systerm" />
+    <set-fault ref="setFault" pop-class="ningbo-01__systerm" />
+  </div>
+</template>
+
+<script>
+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 RouteUnLock from '@/jmapNew/theme/components/menus/dialog/sectionUnLock';
+import RouteHandControl from '@/jmapNew/theme/components/menus/dialog/routeHandControl';
+import RouterCommand from './dialog/routerCommand';
+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';
+
+export default {
+    name: 'SignalMenu',
+    components: {
+        PopMenu,
+        RouteControl,
+        RouteSelection,
+        RouteUnLock,
+        RouteHandControl,
+        RouteDetail,
+        RouterCommand,
+        NoticeInfo,
+        SetFault
+    },
+    props: {
+        selected: {
+            type: Object,
+            default() {
+                return null;
+            }
+        }
+    },
+    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
+                    }
+                ]
+            },
+            menuForce: [
+                {
+                    label: '设置故障',
+                    handler: this.setStoppage,
+                    cmdType: CMD.Fault.CMD_SET_FAULT
+                },
+                {
+                    label: '取消故障',
+                    handler: this.cancelStoppage,
+                    cmdType: CMD.Fault.CMD_CANCEL_FAULT
+                },
+                {
+                    label: '触发故障管理',
+                    handler: this.triggerFaultManagement,
+                    cmdType: CMD.Fault.CMD_TRIGGER_FAULT
+                }
+            ]
+        };
+    },
+    computed: {
+        ...mapGetters('training', [
+            'mode',
+            'operatemode'
+        ]),
+        ...mapGetters('menuOperation', [
+            'buttonOperation'
+        ]),
+        ...mapGetters('map', [
+            'routeList'
+        ]),
+        group() {
+            return this.$route.query.group;
+        }
+    },
+    watch: {
+        '$store.state.menuOperation.menuCount': function (val) {
+            if (this.$store.getters['menuOperation/checkDialogIsOpen'](DeviceMenu.Signal) && !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();
+            }
+        },
+        // 获取进路列表
+        getRouteList(selectType) {
+            const routes = [];
+            this.routeList.forEach(elem => {
+                if (elem.startSignalCode === selectType.code) {
+                    routes.push(elem);
+                }
+            });
+            return routes;
+        },
+        // 排列进路
+        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));
+                }
+            });
+        },
+        // 取消进路
+        cancelTrainRoute() {
+            commitOperate(menuOperate.Signal.cancelTrainRoute, {signalCode:this.selected.code}, 0).then(({valid, operate})=>{
+                if (valid) {
+                    this.$refs.routeControl.doShow(operate, this.selected);
+                }
+            });
+        },
+        // 信号封锁
+        lock() {
+            commitOperate(menuOperate.Signal.lock, {signalCode:this.selected.code}, 0).then(({valid, operate})=>{
+                if (valid) {
+                    this.$refs.routeControl.doShow(operate, this.selected);
+                }
+            });
+        },
+        // 信号解封
+        unlock() {
+            commitOperate(menuOperate.Signal.unlock, {signalCode:this.selected.code}, 0).then(({valid, operate})=>{
+                if (valid) {
+                    this.$refs.routeUnLock.doShow(operate, this.selected);
+                }
+            });
+        },
+        // 信号重开
+        reopenSignal() {
+            commitOperate(menuOperate.Signal.reopenSignal, {signalCode:this.selected.code}, 0).then(({valid, operate})=>{
+                if (valid) {
+                    this.$refs.routeControl.doShow(operate, this.selected);
+                }
+            });
+        },
+        // 信号关灯
+        signalClose() {
+            commitOperate(menuOperate.Signal.signalClose, {signalCode:this.selected.code}, 0).then(({valid, operate})=>{
+                if (valid) {
+                    this.$refs.routeControl.doShow(operate, this.selected);
+                }
+            });
+        },
+        // 进路自排关
+        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));
+                }
+            });
+        },
+        // 进路自排开
+        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));
+                }
+            });
+        },
+        // 设置通过模式
+        singalPassModel() {
+            commitOperate(menuOperate.Signal.setAutoInterlock, {signalCode:this.selected.code}, 0).then(({valid, operate})=>{
+                if (valid) {
+                    this.$refs.routeControl.doShow(operate, this.selected);
+                }
+            });
+        },
+        // 取消通过模式
+        singalCancelPassModel() {
+            commitOperate(menuOperate.Signal.cancelAutoInterlock, {signalCode:this.selected.code}, 0).then(({valid, operate})=>{
+                if (valid) {
+                    this.$refs.routeControl.doShow(operate, 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));
+                }
+            });
+        },
+        // 人工解锁进路（信号机取消引导）
+        humanTrainRoute() {
+            commitOperate(menuOperate.Signal.cancelGuide, {signalCode:this.selected.code}, 0).then(({valid, operate})=>{
+                if (valid) {
+                    this.$refs.routerCommand.doShow(operate, this.selected, '是否执行人解列车进路命令?');
+                }
+            });
+        },
+        // 进路引导
+        guide() {
+            commitOperate(menuOperate.Signal.guide, {signalCode:this.selected.code}, 0).then(({valid, operate})=>{
+                if (valid) {
+                    this.$refs.routerCommand.doShow(operate, this.selected, '是否执行引导命令?');
+                }
+            });
+        },
+        // 设置故障
+        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);
+                }
+            });
+        },
+        triggerFaultManagement() {
+            this.$store.dispatch('training/setTriggerFaultCount', this.selected);
+        }
+    }
+};
+</script>
diff --git a/src/jmapNew/theme/race_01/menus/menuStation.vue b/src/jmapNew/theme/race_01/menus/menuStation.vue
new file mode 100644
index 000000000..f57c1d652
--- /dev/null
+++ b/src/jmapNew/theme/race_01/menus/menuStation.vue
@@ -0,0 +1,226 @@
+<template>
+  <div>
+    <pop-menu ref="popMenu" :menu="menu" />
+    <station-cmd-control ref="stationCmdControl" pop-class="ningbo-01__systerm" />
+    <station-human-control-all ref="stationHumanControlAll" pop-class="ningbo-01__systerm" />
+    <station-set-route-control-all ref="stationSetRouteControlAll" pop-class="ningbo-01__systerm" />
+    <set-fault ref="setFault" pop-class="ningbo-01__systerm" />
+    <notice-info ref="noticeInfo" pop-class="ningbo-01__systerm" />
+  </div>
+</template>
+
+<script>
+import PopMenu from '@/components/PopMenu';
+import StationCmdControl from '@/jmapNew/theme/components/menus/dialog/stationCmdControl';
+import StationHumanControlAll from '@/jmapNew/theme/components/menus/dialog/stationHumanControlAll';
+import StationSetRouteControlAll from '@/jmapNew/theme/components/menus/dialog/stationSetRouteControlAll';
+import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo';
+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';
+export default {
+    name: 'StationMenu',
+    components: {
+        PopMenu,
+        StationCmdControl,
+        StationHumanControlAll,
+        SetFault,
+        StationSetRouteControlAll,
+        NoticeInfo
+    },
+    props: {
+        selected: {
+            type: Object,
+            default() {
+                return null;
+            }
+        }
+    },
+    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
+                    }
+                ]
+            },
+            menuForce: [
+                {
+                    label: '设置ZC故障',
+                    handler: this.setStoppage,
+                    cmdType: CMD.Station.CMD_STATION_ADD_FAULT
+                },
+                {
+                    label: '取消ZC故障',
+                    handler: this.cancelStoppage,
+                    cmdType: CMD.Station.CMD_STATION_REMOVE_FAULT
+                },
+                {
+                    label: '触发故障管理',
+                    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.Station) && !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();
+            }
+        },
+        // 设置故障
+        setStoppage() {
+            commitOperate(menuOperate.Common.setFault, { code: this.selected.zcCode }, 0).then(({valid, operate})=>{
+                if (valid) {
+                    this.$refs.setFault.doShow(menuOperate.Common.setFault, this.selected);
+                }
+            });
+        },
+        // 取消故障
+        cancelStoppage() {
+            commitOperate(menuOperate.Common.cancelFault, { code: this.selected.zcCode }, 0).then(({valid, operate})=>{
+                if (valid) {
+                    this.$refs.setFault.doShow(menuOperate.Common.cancelFault, this.selected);
+                }
+            });
+        },
+        // 全站设置联锁自动触发
+        setAutoTrigger() {
+            commitOperate(menuOperate.Station.setAutoTrigger, { stationCode: this.selected.code }, 3).then(({valid, operate})=>{
+            }).catch(error=>{
+                this.$refs.noticeInfo.doShow(error.message);
+            });
+        },
+        // 全站取消联锁自动触发
+        cancelAutoTrigger() {
+            commitOperate(menuOperate.Station.cancelAutoTrigger, { stationCode: this.selected.code }, 3).then(({valid, operate})=>{
+            }).catch(error=>{
+                this.$refs.noticeInfo.doShow(error.message);
+            });
+        },
+        // 上电解锁
+        powerUnLock() {
+            commitOperate(menuOperate.Station.powerUnLock, { stationCode: this.selected.code }, 0).then(({valid, operate})=>{
+                if (valid) {
+                    this.$refs.stationCmdControl.doShow(operate, this.selected);
+                }
+            });
+        },
+        // 执行关键操作测试
+        execKeyOperationTest() {
+            commitOperate(menuOperate.Station.execKeyOperationTest, { stationCode: this.selected.code }, 0).then(({valid, operate})=>{
+                if (valid) {
+                    this.$refs.stationCmdControl.doShow(operate, this.selected);
+                }
+            });
+        },
+        // 所有进路自排关
+        humanControlALL() {
+            commitOperate(menuOperate.Station.humanControlALL, { stationCode: this.selected.code }, 0).then(({valid, operate})=>{
+                if (valid) {
+                    this.$refs.stationHumanControlAll.doShow(operate, this.selected);
+                }
+            });
+        },
+        // 所有进路自排开
+        atsAutoControlALL() {
+            commitOperate(menuOperate.Station.atsAutoControlALL, { stationCode: this.selected.code }, 0).then(({valid, operate})=>{
+                if (valid) {
+                    this.$refs.stationSetRouteControlAll.doShow(operate, this.selected);
+                }
+            });
+        },
+        undeveloped() {
+            this.doClose();
+            this.$alert('实现中......', '提示', {
+                confirmButtonText: '确定',
+                callback: action => {
+                }
+            });
+        },
+        triggerFaultManagement() {
+            this.$store.dispatch('training/setTriggerFaultCount', this.selected);
+        }
+    }
+};
+</script>
diff --git a/src/jmapNew/theme/race_01/menus/menuStationControl.vue b/src/jmapNew/theme/race_01/menus/menuStationControl.vue
new file mode 100644
index 000000000..0425495e9
--- /dev/null
+++ b/src/jmapNew/theme/race_01/menus/menuStationControl.vue
@@ -0,0 +1,131 @@
+<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
new file mode 100644
index 000000000..e037f1557
--- /dev/null
+++ b/src/jmapNew/theme/race_01/menus/menuStationStand.vue
@@ -0,0 +1,335 @@
+<template>
+  <div>
+    <pop-menu ref="popMenu" :menu="menu" />
+    <stand-control ref="standControl" system-name="ningbo-01__systerm" />
+    <stand-jump-stop-control ref="standJumpStopControl" system-name="ningbo-01__systerm" />
+    <stand-detail ref="standDetail" pop-class="ningbo-01__systerm" />
+    <stand-run-level ref="standRunLevel" system-name="ningbo-01__systerm" />
+    <stand-stop-time ref="standStopTime" system-name="ningbo-01__systerm" />
+    <StandBulkBuckleTrain ref="standBulkBuckleTrain" />
+    <notice-info ref="noticeInfo" pop-class="ningbo-01__systerm" />
+    <set-fault ref="setFault" pop-class="ningbo-01__systerm" />
+  </div>
+</template>
+
+<script>
+import PopMenu from '@/components/PopMenu';
+import StandControl from '@/jmapNew/theme/components/menus/dialog/standControl';
+import StandJumpStopControl from '@/jmapNew/theme/components/menus/dialog/standJumpStopControl';
+import SetFault from '@/jmapNew/theme/components/menus/dialog/setFault';
+import StandDetail from '@/jmapNew/theme/components/menus/dialog/standDetail';
+import StandRunLevel from '@/jmapNew/theme/components/menus/dialog/standRunLevel';
+import StandStopTime from '@/jmapNew/theme/components/menus/dialog/standStopTime';
+import StandBulkBuckleTrain from './dialog/standBulkBuckleTrain';
+import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo';
+import {menuOperate, commitOperate} from '@/jmapNew/theme/components/utils/menuOperate';
+import { mapGetters } from 'vuex';
+import { DeviceMenu, OperateMode } from '@/scripts/ConstDic';
+import CMD from '@/scripts/cmdPlugin/CommandEnum';
+import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler';
+
+export default {
+    name: 'StationStandMenu',
+    components: {
+        PopMenu,
+        StandControl,
+        StandJumpStopControl,
+        StandBulkBuckleTrain,
+        StandDetail,
+        StandRunLevel,
+        NoticeInfo,
+        StandStopTime,
+        SetFault
+    },
+    props: {
+        selected: {
+            type: Object,
+            default() {
+                return null;
+            }
+        }
+    },
+    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
+                    }
+                ]
+            },
+            menuForce: [
+                {
+                    label: '设置故障',
+                    handler: this.setStoppage,
+                    cmdType:CMD.Fault.CMD_SET_FAULT
+                },
+                {
+                    label: '取消故障',
+                    handler: this.cancelStoppage,
+                    cmdType:CMD.Fault.CMD_CANCEL_FAULT
+                },
+                {
+                    label: '手动开启屏蔽门',
+                    handler: this.openPsdByHand,
+                    cmdType: CMD.Stand.CMD_STAND_OPEN_PSD
+                },
+                {
+                    label: '触发故障管理',
+                    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.StationStand) && !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();
+            }
+        },
+        // 设置故障
+        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);
+                }
+            });
+        },
+        // 设置扣车
+        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);
+                }
+            });
+        },
+        // 区间列车数量限制
+        setDetainTrainAll() {
+            commitOperate(menuOperate.StationStand.setDetainTrainAuto, {standCode:this.selected.code}, 0).then(({valid, operate})=>{
+                if (valid) {
+                    this.$refs.standControl.doShow(operate, this.selected);
+                }
+            });
+        },
+        // 取消区间列车数量限制
+        cancelDetainTrainAll() {
+            commitOperate(menuOperate.StationStand.cancelDetainTrainAuto, {standCode:this.selected.code}, 0).then(({valid, operate})=>{
+                if (valid) {
+                    this.$refs.standControl.doShow(operate, this.selected);
+                }
+            });
+        },
+        // 批量扣车
+        setBulkBuckleTrain() {
+            commitOperate(menuOperate.StationStand.setBulkBuckleTrain, {}, 0).then(({valid, operate})=>{
+                if (valid) {
+                    this.$refs.standBulkBuckleTrain.doShow(operate, this.selected);
+                }
+            });
+        },
+        // 批量取消扣车
+        cancelBulkBuckleTrain() {
+            commitOperate(menuOperate.StationStand.cancelBulkBuckleTrain, {}, 0).then(({valid, operate})=>{
+                if (valid) {
+                    this.$refs.standBulkBuckleTrain.doShow(operate, this.selected);
+                }
+            });
+        },
+        // 设置跳停
+        setJumpStop() {
+            commitOperate(menuOperate.StationStand.setJumpStop, {standCode:this.selected.code}, 0).then(({valid, operate})=>{
+                if (valid) {
+                    this.$refs.standJumpStopControl.doShow(operate, this.selected);
+                }
+            });
+        },
+        // 取消跳停
+        cancelJumpStop() {
+            commitOperate(menuOperate.StationStand.cancelJumpStop, {standCode:this.selected.code}, 0).then(({valid, operate})=>{
+                if (valid) {
+                    this.$refs.standJumpStopControl.doShow(operate, this.selected);
+                }
+            });
+        },
+        // 设置停站时间
+        setStopTime() {
+            commitOperate(menuOperate.StationStand.setStopTime, {standCode:this.selected.code}, 0).then(({valid, operate})=>{
+                if (valid) {
+                    this.$refs.standStopTime.doShow(operate, this.selected);
+                }
+            });
+        },
+        // 设置运行等级
+        setRunLevel() {
+            commitOperate(menuOperate.StationStand.setRunLevel, {standCode:this.selected.code}, 0).then(({valid, operate})=>{
+                if (valid) {
+                    this.$refs.standRunLevel.doShow(operate, this.selected);
+                }
+            });
+        },
+        // 设置提前发车
+        earlyDeparture() {
+            commitOperate(menuOperate.StationStand.earlyDeparture, {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);
+        },
+        // 手动开启屏蔽门
+        openPsdByHand() {
+            commitOperate(menuOperate.StationStand.openPsdByHand, {standCode:this.selected.code}, 3).then(({valid, operate})=>{
+            }).catch(error=>{
+                this.$refs.noticeInfo.doShow({}, error.message);
+            });
+        }
+    }
+};
+</script>
diff --git a/src/jmapNew/theme/race_01/menus/menuStationTurnBack.vue b/src/jmapNew/theme/race_01/menus/menuStationTurnBack.vue
new file mode 100644
index 000000000..57fd3c2e5
--- /dev/null
+++ b/src/jmapNew/theme/race_01/menus/menuStationTurnBack.vue
@@ -0,0 +1,111 @@
+<template>
+  <div>
+    <pop-menu ref="popMenu" :menu="menu" />
+    <station-back-strategy ref="stationBackStrategy" />
+  </div>
+</template>
+
+<script>
+import PopMenu from '@/components/PopMenu';
+import StationBackStrategy from './dialog/stationBackStrategy';
+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: 'MenuStationTurnBack',
+    components: {
+        PopMenu,
+        StationBackStrategy
+    },
+    props: {
+        selected: {
+            type: Object,
+            default() {
+                return null;
+            }
+        }
+    },
+    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
+                    }
+                ]
+            },
+            menuForce: [
+            ]
+        };
+    },
+    computed: {
+        ...mapGetters('training', [
+            'mode',
+            'operatemode'
+        ]),
+        ...mapGetters('menuOperation', [
+            'buttonOperation'
+        ])
+    },
+    watch: {
+        '$store.state.menuOperation.menuCount': function (val) {
+            if (this.$store.getters['menuOperation/checkDialogIsOpen'](DeviceMenu.StationTurnBack) && !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();
+            }
+        },
+        // 设置折返策略
+        setBackStrategy() {
+            commitOperate(menuOperate.StationControl.setBackStrategy, {stationCode: this.selected.stationCode}, 0).then(({valid, operate})=>{
+                if (valid) {
+                    this.$refs.stationBackStrategy.doShow(operate, this.selected);
+                }
+            });
+        }
+    }
+};
+</script>
diff --git a/src/jmapNew/theme/race_01/menus/menuSwitch.vue b/src/jmapNew/theme/race_01/menus/menuSwitch.vue
new file mode 100644
index 000000000..c60c311b5
--- /dev/null
+++ b/src/jmapNew/theme/race_01/menus/menuSwitch.vue
@@ -0,0 +1,360 @@
+<template>
+  <div>
+    <pop-menu ref="popMenu" :menu="menu" />
+    <switch-control ref="switchControl" pop-class="ningbo-01__systerm" />
+    <section-un-lock ref="sectionUnLock" pop-class="ningbo-01__systerm" />
+    <speed-limit-control ref="speedLimitControl" pop-class="ningbo-01__systerm" />
+    <alxe-effective ref="alxeEffective" />
+    <switch-hook-lock ref="switchHookLock" pop-class="ningbo-01__systerm" />
+    <notice-info ref="noticeInfo" pop-class="ningbo-01__systerm" />
+    <set-fault ref="setFault" pop-class="ningbo-01__systerm" />
+  </div>
+</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 SectionUnLock from '@/jmapNew/theme/components/menus/dialog/sectionUnLock';
+import SpeedLimitControl from '@/jmapNew/theme/components/menus/dialog/speedCmdControl';
+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 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 {
+    name: 'SwitchMenu',
+    components: {
+        PopMenu,
+        SwitchControl,
+        SectionUnLock,
+        SpeedLimitControl,
+        AlxeEffective,
+        NoticeInfo,
+        SetFault,
+        SwitchHookLock
+    },
+    props: {
+        selected: {
+            type: Object,
+            default() {
+                return null;
+            }
+        }
+    },
+    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
+                    }
+                ]
+            },
+            menuForce: [
+                {
+                    label: '设置故障',
+                    handler: this.setStoppage,
+                    cmdType: CMD.Fault.CMD_SET_FAULT
+                },
+                {
+                    label: '取消故障',
+                    handler: this.cancelStoppage,
+                    cmdType: CMD.Fault.CMD_CANCEL_FAULT
+                },
+                {
+                    label: '触发故障管理',
+                    handler: this.triggerFaultManagement,
+                    cmdType: CMD.Fault.CMD_TRIGGER_FAULT
+                },
+                {
+                    label: '道岔钩锁',
+                    handler: this.hookLock,
+                    cmdType: CMD.Switch.CMD_SWITCH_HOOK_LOCK
+                }
+                //
+            ]
+        };
+    },
+    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();
+            }
+        }
+    },
+    methods: {
+        clickEvent() {
+            const self = this;
+            window.onclick = function (e) {
+                self.doClose();
+            };
+        },
+        initMenu() {
+            // 编辑模式菜单列表
+            this.menu = MenuContextHandler.covert(this.menuNormal);
+            // 故障模式菜单列表
+            if (this.operatemode === OperateMode.FAULT) {
+                // if (!this.$store.state.scriptRecord.bgSet) {
+                // Switch_Hook_Lock
+                const menuHook = [{
+                    label: '语音指令-道岔钩锁',
+                    handler: this.voiceCommandHookLock
+                }];
+                this.menu = [...this.menuForce, ...menuHook];
+                // } else {
+                //     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();
+            }
+        },
+        // 定操定位
+        locate() {
+            commitOperate(menuOperate.Switch.locate, {switchCode:this.selected.code}, 0).then(({valid, operate})=>{
+                if (valid) {
+                    this.$refs.switchControl.doShow(operate, this.selected);
+                }
+            });
+        },
+        // 定操反位
+        reverse() {
+            commitOperate(menuOperate.Switch.reverse, {switchCode:this.selected.code}, 0).then(({valid, operate})=>{
+                if (valid) {
+                    this.$refs.switchControl.doShow(operate, 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.sectionUnLock.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.sectionUnLock.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.speedLimitControl.doShow(operate, this.selected);
+                }
+            });
+        },
+        // 道岔取消速度
+        cancelSpeed() {
+            commitOperate(menuOperate.Switch.cancelSpeed, { switchCode: this.selected.code}, 0).then(({valid, operate}) => {
+                if (valid) {
+                    this.$refs.speedLimitControl.doShow(operate, this.selected);
+                }
+            });
+        },
+        // 确认计轴有效
+        alxeEffective() {
+            commitOperate(menuOperate.Switch.alxeEffective, {switchCode:this.selected.code}, 0).then(({valid, operate})=>{
+                if (valid) {
+                    this.$refs.alxeEffective.doShow(operate, this.selected);
+                }
+            });
+        },
+        undeveloped() {
+            this.doClose();
+            this.$alert('实现中......', '提示', {
+                confirmButtonText: '确定',
+                callback: action => {
+                }
+            });
+        },
+        // 设置故障
+        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);
+                }
+            });
+        },
+        // 道岔钩锁
+        voiceCommandHookLock() {
+            this.$refs.switchHookLock.doShow(this.selected);
+        },
+        hookLock() {
+            commitOperate(menuOperate.Switch.hookLock, { switchCode: this.selected.code}, 0).then(({valid, operate}) => {
+                if (valid) {
+                    this.$refs.switchHookLock.doShow(this.selected, operate);
+                }
+            });
+        },
+        triggerFaultManagement() {
+            this.$store.dispatch('training/setTriggerFaultCount', this.selected);
+        }
+    }
+};
+</script>
diff --git a/src/jmapNew/theme/race_01/menus/menuTrain.vue b/src/jmapNew/theme/race_01/menus/menuTrain.vue
new file mode 100644
index 000000000..7149c071e
--- /dev/null
+++ b/src/jmapNew/theme/race_01/menus/menuTrain.vue
@@ -0,0 +1,569 @@
+<template>
+  <div>
+    <pop-menu ref="popMenu" :menu="menu" />
+    <notice-info ref="noticeInfo" pop-class="ningbo-01__systerm" />
+    <train-delete ref="trainDelete" />
+    <train-define ref="trainDefine" />
+    <train-move ref="trainMove" />
+    <train-set-plan ref="trainSetPlan" />
+    <train-set-head ref="trainSetHead" />
+    <train-set-work ref="trainSetWork" />
+    <trainSetWorkATP ref="trainSetWorkATP" />
+    <SpeedLimit ref="speedLimit" pop-class="ningbo-01__systerm" />
+    <set-fault ref="setFault" pop-class="ningbo-01__systerm" />
+  </div>
+</template>
+
+<script>
+import PopMenu from '@/components/PopMenu';
+import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo';
+import SetFault from '@/jmapNew/theme/components/menus/dialog/setFault';
+import TrainDelete from './dialog/trainDelete';
+import TrainDefine from './dialog/trainDefine';
+import TrainMove from './dialog/trainMove';
+import TrainSetPlan from './dialog/trainSetPlan';
+import TrainSetHead from './dialog/trainSetHead';
+import TrainSetWork from './dialog/trainSetWork';
+import trainSetWorkATP from './dialog/trainSetWorkATP';
+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, commitTrainSend } from '@/jmapNew/theme/components/utils/menuOperate';
+
+export default {
+    name: 'MenuTrain',
+    components: {
+        PopMenu,
+        NoticeInfo,
+        TrainDelete,
+        TrainDefine,
+        TrainMove,
+        TrainSetPlan,
+        TrainSetHead,
+        TrainSetWork,
+        trainSetWorkATP,
+        SetFault,
+        SpeedLimit
+    },
+    props: {
+        selected: {
+            type: Object,
+            default() {
+                return null;
+            }
+        }
+    },
+    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
+                    }
+                ]
+            },
+            menuForce: [
+                {
+                    label: '设置故障',
+                    handler: this.setStoppage
+                },
+                {
+                    label: '取消故障',
+                    handler: this.cancelStoppage
+                }
+            ],
+            menuDirective: [
+                {
+                    label: '确认运行至前方站',
+                    handler: this.nextStation
+                },
+                {
+                    label: '进路闭塞法行车',
+                    handler: this.routeBlockRun
+                },
+                {
+                    label: '限速指令',
+                    handler: this.handleSpeedLimit
+                },
+                {
+                    label: '越引导信号行驶',
+                    handler: this.handleOverFuideSignal
+                },
+                {
+                    label: 'URM模式驾驶',
+                    handler: this.handleURMTrain
+                },
+                {
+                    label: '越红灯行驶',
+                    handler: this.handleOverEedLight
+                },
+                {
+                    label: '开/关门',
+                    handler: this.handleOpenCloseDoor
+                }
+            ],
+            menuSpeed: [
+                {
+                    label: '限速行驶',
+                    handler: this.limitSpeed
+                }
+            ]
+        };
+    },
+    computed: {
+        ...mapGetters('training', [
+            'mode',
+            'operatemode',
+            'memberList'
+        ]),
+        ...mapGetters('menuOperation', [
+            'buttonOperation'
+        ])
+    },
+    watch: {
+        '$store.state.menuOperation.menuCount': function () {
+            if (this.$store.getters['menuOperation/checkDialogIsOpen'](DeviceMenu.Train) && !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) {
+                if (!this.$store.state.scriptRecord.bgSet) {
+                    this.menu = [...this.menuForce, ...this.menuDirective];
+                } else {
+                    this.menu = [...this.menuForce];
+                }
+            }
+            // 指令模式列表
+            if (this.operatemode === OperateMode.DIRECTIVE) {
+                if (!this.$store.state.scriptRecord.bgSet) {
+                    this.menu = [...this.menuDirective];
+                }
+            }
+        },
+        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();
+                // this.$store.dispatch('map/setTrainWindowShow', false);
+            }
+        },
+        // 设置故障
+        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);
+                }
+            });
+        },
+        nextStation() {
+            // commitOperate(menuOperate.Train.nextStation, { groupNumber: this.selected.code }, 3).then(({valid, operate})=>{
+            // }).catch((error) => {
+            //     this.$refs.noticeInfo.doShow(error.message);
+            // });
+            const group = this.$route.query.group;
+            const param = {
+                commandType: 'Drive_Ahead',
+                targetMemberId: this.memberList.find(ele => ele.deviceCode == this.selected.code).id,
+                params: {}
+            };
+            commitTrainSend(group, param).then(({valid, operate})=>{
+            }).catch((error) => {
+                this.$refs.noticeInfo.doShow(error.message);
+            });
+        },
+        routeBlockRun() {
+            // commitOperate(menuOperate.Train.routeBlockRun, { groupNumber: this.selected.code }, 3).then(({valid, operate})=>{
+            // }).catch((error) => {
+            //     this.$refs.noticeInfo.doShow(error.message);
+            // });
+            const group = this.$route.query.group;
+            const param = {
+                commandType: 'Route_Block_Drive',
+                targetMemberId: this.memberList.find(ele => ele.deviceCode == this.selected.code).id,
+                params: {}
+            };
+            commitTrainSend(group, param).then(({valid, operate})=>{
+            }).catch((error) => {
+                this.$refs.noticeInfo.doShow(error.message);
+            });
+        },
+        handleOverFuideSignal() {
+            const group = this.$route.query.group;
+            const param = {
+                commandType: 'Drive_Through_The_Guide_Signal',
+                targetMemberId: this.memberList.find(ele => ele.deviceCode == this.selected.code).id,
+                params: {}
+            };
+            commitTrainSend(group, param).then(({valid, operate})=>{
+            }).catch((error) => {
+                this.$refs.noticeInfo.doShow(error.message);
+            });
+        },
+        handleOverEedLight() {
+            const group = this.$route.query.group;
+            const param = {
+                commandType: 'Drive_Through_The_Red_Light',
+                targetMemberId: this.memberList.find(ele => ele.deviceCode == this.selected.code).id,
+                params: {}
+            };
+            commitTrainSend(group, param).then(({valid, operate})=>{
+            }).catch((error) => {
+                this.$refs.noticeInfo.doShow(error.message);
+            });
+        },
+        handleURMTrain() {
+            const group = this.$route.query.group;
+            const param = {
+                commandType: 'Drive_In_Urm_Mode',
+                targetMemberId: this.memberList.find(ele => ele.deviceCode == this.selected.code).id,
+                params: {}
+            };
+            commitTrainSend(group, param).then(({valid, operate})=>{
+            }).catch((error) => {
+                this.$refs.noticeInfo.doShow(error.message);
+            });
+        },
+        handleSpeedLimit() { // 限速指令
+            this.$refs.speedLimit.doShow(this.selected);
+        },
+        // 操作列车 开/关门
+        handleOpenCloseDoor() {
+            const group = this.$route.query.group;
+            const param = {
+                commandType: 'Open_Or_Close_Door',
+                targetMemberId: this.memberList.find(ele => ele.deviceCode == this.selected.code).id,
+                params: {}
+            };
+            commitTrainSend(group, param).then(({valid, operate})=>{
+            }).catch((error) => {
+                this.$refs.noticeInfo.doShow(error.message);
+            });
+        },
+        // 限速行驶
+        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();
+            });
+        },
+        undeveloped() {
+            this.doClose();
+            this.$alert('实现中......', '提示', {
+                confirmButtonText: '确定',
+                callback: action => {
+                }
+            });
+        },
+        // 设置车体号
+        addTrainId() {
+            const operate = {
+                start: true,
+                code: this.selected.code,
+                operation: OperationEvent.Train.addTrainId.menu.operation,
+                param: {
+                    sectionCode: this.$store.state.map.trainWindowSectionCode
+                }
+            };
+
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    this.$refs.trainDefine.doShow(operate, this.selected);
+                }
+            });
+        },
+        // 删除车组号
+        delTrainId() {
+            const operate = {
+                start: true,
+                code: this.selected.code,
+                operation: OperationEvent.Train.delTrainId.menu.operation,
+                param: {
+                    sectionCode: this.$store.state.map.trainWindowSectionCode
+                }
+            };
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    this.$refs.trainDelete.doShow(operate, this.selected);
+                }
+            });
+        },
+        // 移动车组号
+        moveTrainId() {
+            const operate = {
+                start: true,
+                code: this.selected.code,
+                operation: OperationEvent.Train.moveTrainId.menu.operation,
+                param: {
+                    sectionCode: this.$store.state.map.trainWindowSectionCode
+                }
+            };
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    this.$refs.trainMove.doShow(operate, this.selected);
+                }
+            });
+        },
+        // 设置计划车
+        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);
+                }
+            });
+        },
+        // 设置头码车
+        setHeadTrain() {
+            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.trainSetHead.doShow(operate, this.selected);
+                }
+            });
+        },
+        // 设置人工车
+        setWorkTrain() {
+            const operate = {
+                start: true,
+                code: this.selected.code,
+                operation: OperationEvent.Train.editTrainId.menu.operation,
+                param: {
+                    sectionCode: this.$store.state.map.trainWindowSectionCode
+                }
+            };
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    this.$refs.trainSetWork.doShow(operate, this.selected);
+                }
+            });
+        },
+        // 标记ATP切除
+        setTrainATPdel() {
+            const operate = {
+                start: true,
+                code: this.selected.code,
+                operation: OperationEvent.Train.editTrainId.menu.operation,
+                param: {
+                    sectionCode: this.$store.state.map.trainWindowSectionCode
+                }
+            };
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    this.$refs.trainSetWorkATP.doShow(operate, this.selected);
+                }
+            });
+        },
+        // 标记ATP恢复
+        setTrainATPRec() {
+            const operate = {
+                start: true,
+                code: this.selected.code,
+                operation: OperationEvent.Train.editTrainId.menu.operation,
+                param: {
+                    sectionCode: this.$store.state.map.trainWindowSectionCode
+                }
+            };
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    this.$refs.trainSetWorkATP.doShow(operate, this.selected);
+                }
+            });
+        }
+    }
+};
+</script>
diff --git a/src/jmap/theme/fuzhou_01/menus/passiveDialog/alarm.vue b/src/jmapNew/theme/race_01/menus/passiveDialog/alarm.vue
similarity index 70%
rename from src/jmap/theme/fuzhou_01/menus/passiveDialog/alarm.vue
rename to src/jmapNew/theme/race_01/menus/passiveDialog/alarm.vue
index d1f1124a9..2e98c6476 100644
--- a/src/jmap/theme/fuzhou_01/menus/passiveDialog/alarm.vue
+++ b/src/jmapNew/theme/race_01/menus/passiveDialog/alarm.vue
@@ -1,8 +1,8 @@
 <template>
   <el-dialog
     v-dialogDrag
-    class="fuzhou-01__systerm alarm-detail"
-    :title="level+$t('menu.passiveDialog.alarmDetailInformation')"
+    class="ningbo-01__systerm alarm-detail"
+    :title="level+'级告警详细信息'"
     :visible.sync="show"
     width="760px"
     :before-close="doClose"
@@ -13,35 +13,35 @@
     <el-form label-width="80px" size="mini">
       <el-row>
         <el-col :span="8">
-          <el-form-item :label="$t('menu.passiveDialog.lineName')">
+          <el-form-item label="线路名称">
             <el-input v-model="model.lineName" disabled />
           </el-form-item>
         </el-col>
         <el-col :span="8">
-          <el-form-item :label="$t('menu.passiveDialog.unitName')">
+          <el-form-item label="单位名称">
             <el-input v-model="model.unitName" disabled />
           </el-form-item>
         </el-col>
         <el-col :span="8">
-          <el-form-item :label="$t('menu.passiveDialog.moduleName')">
+          <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="$t('menu.passiveDialog.alarmDate')">
-            <el-date-picker v-model="model.alarmDate" type="datetime" :placeholder="$t('menu.passiveDialog.selectDate')" disabled />
+          <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">{{ $t('menu.passiveDialog.level') }}</span>
+            <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="$t('menu.passiveDialog.confirmStatus')">
+          <el-form-item label="确认状态">
             <el-input v-model="model.confirm" disabled />
           </el-form-item>
         </el-col>
@@ -49,33 +49,33 @@
       <el-row>
         <el-col :span="9" class="alarm-type">
           <el-form-item>
-            <span slot="label">{{ $t('menu.passiveDialog.type') }}</span>
+            <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="$t('menu.passiveDialog.childType')">
+          <el-form-item label="子类型">
             <el-input v-model="model.childType" disabled />
           </el-form-item>
         </el-col>
       </el-row>
-      <el-form-item :label="$t('menu.passiveDialog.timeSummary')">
+      <el-form-item label="时间摘要">
         <el-input v-model="model.timeSummary" disabled />
       </el-form-item>
-      <el-form-item :label="$t('menu.passiveDialog.recommendedOperation')">
+      <el-form-item label="推荐操作">
         <el-input v-model="model.recommendedOperation" disabled />
       </el-form-item>
       <div class="alarm-detail-description">
-        <span>{{ $t('menu.passiveDialog.alarmDetailedDescription') }}</span><br>
-        <el-input v-model="model.alarmDetail" type="textarea" :rows="5" :placeholder="$t('menu.passiveDialog.inputContent')" disabled />
+        <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">{{ $t('menu.passiveDialog.confirm') }}</el-button>
+        <el-button :id="domIdCancel" type="primary" :loading="loading" @click="commit">确 定</el-button>
       </el-col>
       <el-col :span="10">
-        <span style="line-height:26px">{{ $t('menu.passiveDialog.unconfirmedMessageOne') }}{{ level }}{{ $t('menu.passiveDialog.unconfirmedMessageTwo') }}</span>
+        <span style="line-height:26px">未确认{{ level }}级报警数目：1</span>
       </el-col>
     </el-row>
   </el-dialog>
@@ -94,8 +94,8 @@ export default {
             level: 0,
             operate: null,
             controlProps: {
-                '01': this.$t('menu.passiveDialog.centralControl'),
-                '02': this.$t('menu.passiveDialog.stationControl')
+                '01': '中控',
+                '02': '站控'
             },
             model: {
                 lineName: '',
@@ -125,15 +125,14 @@ export default {
     },
     watch: {
         '$store.state.socket.msgHead': function (elem) {
-            if (elem && elem.type == 'resp' && elem.agree) {
-                if (elem.agree) {
+            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 newOperate = {
                         type: operate.type,
-                        name: station.name,
-                        currentMode: elem.currentMode
+                        name: station.name
                     };
 
                     this.doShow(newOperate);
@@ -152,15 +151,15 @@ export default {
             this.model = {
                 lineName: this.name,
                 unitName: this.operate.name,
-                moduleName: this.$t('menu.passiveDialog.cmmControlModeConversionMode'),
-                level: this.$t('menu.passiveDialog.zeroLevelAlarm'),
-                confirm: this.$t('menu.passiveDialog.confirmStatus'),
+                moduleName: 'CMM控制模式转换模式',
+                level: '0级告警',
+                confirm: '确认状态',
                 alarmDate: new Date(),
-                type: this.$t('menu.passiveDialog.systemEvent'),
-                childType: this.$t('menu.passiveDialog.childTypeTips'),
-                timeSummary: this.$t('menu.passiveDialog.controlModeSummary'),
+                type: '系统事件',
+                childType: '依据信号设备操作命令设置控制模式',
+                timeSummary: '控制模式摘要',
                 recommendedOperation: '',
-                alarmDetail: `${this.$t('menu.passiveDialog.controlModeTransfer')} ${this.operate.name}${this.$t('menu.passiveDialog.alarmDetailOne')}${operate.currentMode == '01' ? this.$t('menu.passiveDialog.stationToCentral') : this.$t('menu.passiveDialog.centralToStation')}！`
+                alarmDetail: `控制模式转换：${this.operate.name}由中控转为站控模式！`
             };
             this.dialogShow = true;
             this.$nextTick(function () {
diff --git a/src/jmap/theme/fuzhou_01/menus/passiveDialog/timeout.vue b/src/jmapNew/theme/race_01/menus/passiveDialog/timeout.vue
similarity index 86%
rename from src/jmap/theme/fuzhou_01/menus/passiveDialog/timeout.vue
rename to src/jmapNew/theme/race_01/menus/passiveDialog/timeout.vue
index 5dbdcd924..40a2936a9 100644
--- a/src/jmap/theme/fuzhou_01/menus/passiveDialog/timeout.vue
+++ b/src/jmapNew/theme/race_01/menus/passiveDialog/timeout.vue
@@ -1,8 +1,8 @@
 <template>
   <el-dialog
     v-dialogDrag
-    class="fuzhou-01__systerm cmd-notice"
-    :title="$t('menu.passiveDialog.operationCommandTips')"
+    class="ningbo-01__systerm cmd-notice"
+    title="操作命令提示"
     :visible.sync="show"
     width="400px"
     :before-close="doClose"
@@ -12,7 +12,7 @@
   >
     <span>{{ name }}，{{ msg }}!</span>
     <el-row class="button-group">
-      <el-button :id="domIdCancel" type="primary" :loading="loading" @click="commit">{{ $t('menu.passiveDialog.operationConfirm') }}</el-button>
+      <el-button :id="domIdCancel" type="primary" :loading="loading" @click="commit">确认</el-button>
     </el-row>
   </el-dialog>
 </template>
@@ -40,7 +40,7 @@ export default {
     },
     watch: {
         '$store.state.socket.msgHead': function (elem) {
-            if (elem && elem.type == 'resp' && (elem.timeout || !elem.agree)) {
+            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);
@@ -50,10 +50,10 @@ export default {
                 };
 
                 if (elem.timeout) {
-                    newOperate['msg'] = this.$t('menu.passiveDialog.requestTimedOut');
+                    newOperate['msg'] = '请求超时';
                     this.doShow(newOperate);
-                } else if (!elem.agree) {
-                    newOperate['msg'] = this.$t('menu.passiveDialog.requestRejection');
+                } else if (!elem.success) {
+                    newOperate['msg'] = '请求拒绝';
                     this.doShow(newOperate);
                 }
             }
@@ -83,7 +83,6 @@ export default {
         },
         cancel() {
             const operate = {
-                type: this.operate.type,
                 operation: OperationEvent.Command.close.notice.operation
             };
 
diff --git a/src/jmap/theme/fuzhou_01/model.js b/src/jmapNew/theme/race_01/model.js
similarity index 77%
rename from src/jmap/theme/fuzhou_01/model.js
rename to src/jmapNew/theme/race_01/model.js
index 3dd21ca8f..c00fd4260 100644
--- a/src/jmap/theme/fuzhou_01/model.js
+++ b/src/jmapNew/theme/race_01/model.js
@@ -2,6 +2,9 @@ import deviceType from '../../constant/deviceType';
 
 class Model {
     constructor() {
+        this.screenLine = 3;
+        this.screenSplit = ['5165', '10303'];
+        this.screenDifference = 180;
         // 公共字段部分默认初始值
         this['public'] = {};
         this['public'][deviceType.Signal] = {
@@ -14,6 +17,9 @@ class Model {
         this['private'][deviceType.StationControl] = {
             indicatorShow: true									// 标识灯名称显示
         };
+        this['private'][deviceType.Station] = {
+            kmPostShow: true									// 公里标显示
+        };
         this['private'][deviceType.Switch] = {
             nameShow: true
         };
@@ -26,18 +32,26 @@ class Model {
             transferTrackNameShow: true							// 转换轨名称显示
         };
         this['private'][deviceType.Signal] = {
+            nameShow: true,										// 信号机名称显示
             linkageAutoRouteShow: true,							// 联锁自动进路表示灯显示
             atsAutoTriggerShow: true							// ATS自动触发表示灯显示
         };
         this['private'][deviceType.Train] = {
-            nameFormat: 'targetCode:serviceNumber:tripNumber',	// 字体格式
-            nameFontSize: 10					 				// 字体大小
         };
         this['private'][deviceType.TrainWindow] = {
-            trainWindowShow: true
+            trainWindowShow: false
         };
     }
 
+    handleScreenProps(viewModel) { // 大屏隐藏元素
+        const model = viewModel.model;
+        if (model._type == deviceType.OutFrame ||
+			model._type == deviceType.Text ||
+			model._type == deviceType.AutoTurnBack) {
+            return true;
+        }
+    }
+
     initPublicProps(model) {
         if (model) {
             var modelInitial = this.public[model._type];
diff --git a/src/jmapNew/theme/race_01/operationConfig.js b/src/jmapNew/theme/race_01/operationConfig.js
new file mode 100644
index 000000000..2f5746222
--- /dev/null
+++ b/src/jmapNew/theme/race_01/operationConfig.js
@@ -0,0 +1,885 @@
+export default {
+    list: [
+        {
+            maxDuration: 8,
+            minDuration: 5,
+            operateType: 'Stand_Set_Hold_Train',
+            skinCode: '06',
+            trainingName: '扣车({10}-{12} 站台)',
+            trainingRemark: '设置扣车功能',
+            trainingType: 'Stand',
+            productTypes: ['01', '02'], // 产品类型 01 现地 02 行调
+            stepVOList: [
+                { deviceType: '06', orderNum: 1, operateCode: '504', tip: '鼠标右键菜单选择【扣车】' },
+                { deviceType: '06', orderNum: 2, operateCode: '504', tip: '鼠标左键点击【确定】按钮' }
+            ]
+        },
+        {
+            maxDuration: 8,
+            minDuration: 5,
+            operateType: 'Stand_Cancel_Hold_Train',
+            skinCode: '06',
+            trainingName: '取消扣车({10}-{12} 站台)',
+            trainingRemark: '取消扣车功能',
+            trainingType: 'Stand',
+            productTypes: ['01', '02'], // 产品类型 01 现地 02 行调
+            stepVOList: [
+                { deviceType: '06', orderNum: 1, operateCode: '505', tip: '鼠标右键菜单选择【取消扣车】' },
+                { deviceType: '06', orderNum: 2, operateCode: '505', tip: '鼠标左键点击【确定】按钮' }
+            ]
+        },
+        {
+            maxDuration: 8,
+            minDuration: 5,
+            operateType: 'Stand_Set_Hold_Train_Batch',
+            skinCode: '06',
+            trainingName: '批量扣车({10}-{12} 站台)',
+            trainingRemark: '批量扣车功能',
+            trainingType: 'Stand',
+            productTypes: ['02'], // 产品类型 01 现地 02 行调
+            stepVOList: [
+                { deviceType: '06', orderNum: 1, operateCode: '515', tip: '鼠标右键菜单选择【批量扣车】' },
+                { deviceType: '06', orderNum: 2, operateCode: '515', tip: '鼠标左键点击【确定】按钮' }
+            ]
+        },
+        {
+            maxDuration: 8,
+            minDuration: 5,
+            operateType: 'Stand_Cancel_Hold_Train_Batch',
+            skinCode: '06',
+            trainingName: '取消批量扣车({10}-{12} 站台)',
+            trainingRemark: '取消批量扣车功能',
+            trainingType: 'Stand',
+            productTypes: ['02'], // 产品类型 01 现地 02 行调
+            stepVOList: [
+                { deviceType: '06', orderNum: 1, operateCode: '516', tip: '鼠标右键菜单选择【取消批量扣车】' },
+                { deviceType: '06', orderNum: 2, operateCode: '516', tip: '鼠标左键点击【确定】按钮' }
+            ]
+        },
+        {
+            maxDuration: 15,
+            minDuration: 8,
+            operateType: 'Stand_Early_Depart',
+            skinCode: '06',
+            trainingName: '提前发车({10}-{12}站台)',
+            trainingRemark: '提前发车功能',
+            trainingType: 'Stand',
+            productTypes: ['01', '02'],
+            stepVOList: [
+                { deviceType: '06', orderNum: 1, operateCode: '501', tip: '鼠标右键菜单选择【提前发车】' },
+                { deviceType: '06', orderNum: 2, operateCode: '501', tip: '鼠标左键点击【确定】按钮' }
+            ]
+        },
+        {
+            maxDuration: 15,
+            minDuration: 8,
+            operateType: 'Stand_Set_Jump_Stop',
+            skinCode: '06',
+            trainingName: '设置跳停({10}-{12}站台)',
+            trainingRemark: '设置跳停功能',
+            trainingType: 'Stand',
+            productTypes: ['02'],
+            stepVOList: [
+                { deviceType: '06', orderNum: 1, operateCode: '502', tip: '鼠标右键菜单选择【设置跳停】' },
+                { deviceType: '06', orderNum: 2, operateCode: '502', tip: '鼠标左键点击【确定】按钮' }
+            ]
+        },
+        {
+            maxDuration: 15,
+            minDuration: 8,
+            operateType: 'Stand_Set_Jump_Stop',
+            skinCode: '06',
+            trainingName: '设置跳停({10}-{12}站台)',
+            trainingRemark: '设置指定001号列车跳停功能',
+            trainingType: 'Stand',
+            productTypes: ['02'],
+            stepVOList: [
+                { deviceType: '06', orderNum: 1, operateCode: '502', tip: '鼠标右键菜单选择【设置跳停】' },
+                { deviceType: '06', orderNum: 2, operateCode: '5024', tip: '鼠标左键点击' },
+                { deviceType: '06', orderNum: 3, operateCode: '5022', tip: '请选择001号车', val: '001' },
+                { deviceType: '06', orderNum: 4, operateCode: '502', tip: '鼠标左键点击【确定】按钮' }
+            ]
+        },
+        {
+            maxDuration: 15,
+            minDuration: 8,
+            operateType: 'Stand_Cancel_Jump_Stop',
+            skinCode: '06',
+            trainingName: '取消跳停({10}-{12}站台)',
+            trainingRemark: '设置取消跳停功能',
+            trainingType: 'Stand',
+            productTypes: ['02'],
+            stepVOList: [
+                { deviceType: '06', orderNum: 1, operateCode: '503', tip: '鼠标右键菜单选择【取消跳停】' },
+                { deviceType: '06', orderNum: 2, operateCode: '503', tip: '鼠标左键点击【确定】按钮' }
+            ]
+        },
+        {
+            maxDuration: 15,
+            minDuration: 8,
+            operateType: 'Stand_Set_Park_Time',
+            skinCode: '06',
+            trainingName: '设置停站时间({10}-{12}站台)',
+            trainingRemark: '设置停站时间(自动, 一直有效)',
+            trainingType: 'Stand',
+            productTypes: ['02'],
+            stepVOList: [
+                { deviceType: '06', orderNum: 1, operateCode: '509', tip: '鼠标右键菜单选择【设置停站时间】' },
+                { deviceType: '06', orderNum: 2, operateCode: '5092', tip: '鼠标左键点击，选择【自动】', val: '01' },
+                { deviceType: '06', orderNum: 3, operateCode: '509', tip: '鼠标左键点击【确认】按钮' }
+            ]
+        },
+        {
+            maxDuration: 15,
+            minDuration: 8,
+            operateType: 'Stand_Set_Park_Time',
+            skinCode: '06',
+            trainingName: '设置停站时间({10}-{12}站台)',
+            trainingRemark: '设置停站时间(人工, 20秒, 一直有效)',
+            trainingType: 'Stand',
+            productTypes: ['02'],
+            stepVOList: [
+                { deviceType: '06', orderNum: 1, operateCode: '509', tip: '鼠标右键菜单选择【设置停站时间】' },
+                { deviceType: '06', orderNum: 2, operateCode: '5092', tip: '鼠标左键点击，选择【全人工】', val: '02' },
+                { deviceType: '06', orderNum: 3, operateCode: '5094', tip: '输入或鼠标点击，调整为【20】', val: '20' },
+                { deviceType: '06', orderNum: 4, operateCode: '509', tip: '鼠标左键点击【确认】按钮' }
+            ]
+        },
+        {
+            maxDuration: 15,
+            minDuration: 8,
+            operateType: 'Stand_Set_Park_Time',
+            skinCode: '06',
+            trainingName: '设置停站时间({10}-{12}站台)',
+            trainingRemark: '设置停站时间(人工, 20秒, 一次有效)',
+            trainingType: 'Stand',
+            productTypes: ['02'],
+            stepVOList: [
+                { deviceType: '06', orderNum: 1, operateCode: '509', tip: '鼠标右键菜单选择【设置停站时间】' },
+                { deviceType: '06', orderNum: 2, operateCode: '5092', tip: '鼠标左键点击，选择【全人工】', val: '02' },
+                { deviceType: '06', orderNum: 3, operateCode: '5094', tip: '输入或鼠标点击，调整为【20】', val: '20' },
+                { deviceType: '06', orderNum: 4, operateCode: '5093', tip: '鼠标左键点击，选择【一次有效】', val: 'false' },
+                { deviceType: '06', orderNum: 5, operateCode: '509', tip: '鼠标左键点击【确认】按钮' }
+            ]
+        },
+        {
+            maxDuration: 15,
+            minDuration: 8,
+            operateType: 'Stand_Set_Run_Time',
+            skinCode: '06',
+            trainingName: '设置运行等级({10}-{12} 站台)',
+            trainingRemark: '设置运行等级(设置区间 运行等级1，运行时间为115，一直有效)',
+            trainingType: 'Stand',
+            productTypes: ['02'],
+            stepVOList: [
+                { deviceType: '06', orderNum: 1, operateCode: '510', tip: '鼠标右键菜单选择【设置运行等级】' },
+                { deviceType: '06', orderNum: 2, operateCode: '5104', tip: '鼠标左键点击，选择【1】', val: '1' },
+                { deviceType: '06', orderNum: 3, operateCode: '5101', tip: '鼠标左键点击，选择【115】', val: '115' },
+                { deviceType: '06', orderNum: 4, operateCode: '5103', tip: '鼠标左键点击，选择【一直有效】', val: 'true' },
+                { deviceType: '06', orderNum: 5, operateCode: '510', tip: '鼠标左键点击【确认】按钮' }
+            ]
+        },
+        {
+            maxDuration: 15,
+            minDuration: 8,
+            operateType: 'Stand_Set_Run_Time',
+            skinCode: '06',
+            trainingName: '设置运行等级({10}-{12} 站台)',
+            trainingRemark: '设置运行等级(设置区间 运行等级自动，一直有效)',
+            trainingType: 'Stand',
+            productTypes: ['02'],
+            stepVOList: [
+                { deviceType: '06', orderNum: 1, operateCode: '510', tip: '鼠标右键菜单选择【设置运行等级】' },
+                { deviceType: '06', orderNum: 2, operateCode: '5104', tip: '鼠标左键点击，选择【自动】', val: '0' },
+                { deviceType: '06', orderNum: 3, operateCode: '5103', tip: '鼠标左键点击，选择【一直有效】', val: 'true' },
+                { deviceType: '06', orderNum: 4, operateCode: '510', tip: '鼠标左键点击【确认】按钮' }
+            ]
+        },
+        {
+            maxDuration: 15,
+            minDuration: 8,
+            operateType: 'Stand_Set_Hold_Train_Auto',
+            skinCode: '06',
+            trainingName: '区间列车数量限制({10}-{12}站台)',
+            trainingRemark: '区间列车数量限制',
+            trainingType: 'Stand',
+            productTypes: ['02'],
+            stepVOList: [
+                { deviceType: '06', orderNum: 1, operateCode: '517', tip: '鼠标右键菜单选择【区间列车数量限制】' },
+                { deviceType: '06', orderNum: 2, operateCode: '517', tip: '鼠标左键点击【确认】按钮' }
+            ]
+        },
+        {
+            maxDuration: 15,
+            minDuration: 8,
+            operateType: 'Stand_Cancel_Hold_Train_Auto',
+            skinCode: '06',
+            trainingName: '取消区间列车数量限制({10}-{12}站台)',
+            trainingRemark: '取消区间列车数量限制',
+            trainingType: 'Stand',
+            productTypes: ['02'],
+            stepVOList: [
+                { deviceType: '06', orderNum: 1, operateCode: '518', tip: '鼠标右键菜单选择【取消区间列车数量限制】' },
+                { deviceType: '06', orderNum: 2, operateCode: '518', tip: '鼠标左键点击【确认】按钮' }
+            ]
+        },
+        {
+            maxDuration: 8,
+            minDuration: 5,
+            operateType: 'Stand_View_Status',
+            skinCode: '06',
+            trainingName: '查看站台信息({10}-{12}站台)',
+            trainingRemark: '查看站台信息功能',
+            trainingType: 'Stand',
+            productTypes: ['01', '02'],
+            stepVOList: [
+                { deviceType: '06', orderNum: 1, operateCode: '507', tip: '鼠标右键菜单选择【查看站台信息】' },
+                { deviceType: '06', orderNum: 2, operateCode: '0012', tip: '鼠标左键点击【确定】按钮' }
+            ]
+        },
+        {
+            maxDuration: 15,
+            minDuration: 8,
+            operateType: 'Section_Fault_Unlock',
+            skinCode: '06',
+            trainingName: '区段故障解锁({8}{9})',
+            trainingRemark: '区段故障解锁',
+            trainingType: 'Section',
+            productTypes: ['01'],
+            stepVOList: [
+                { deviceType: '03', orderNum: 1, operateCode: '402', tip: '鼠标右键菜单选择【区段故障解锁】' },
+                { deviceType: '03', orderNum: 2, operateCode: '4024', tip: '鼠标左键点击【确定】按钮' },
+                { deviceType: '03', orderNum: 3, operateCode: '4028', tip: '鼠标左键选择({8}{9})区段', val: '{19}' },
+                { deviceType: '03', orderNum: 4, operateCode: '4025', tip: '鼠标左键点击【确定】按钮' },
+                { deviceType: '03', orderNum: 5, operateCode: '4023', tip: '鼠标左键点击【关闭】按钮' }
+            ]
+        },
+        {
+            maxDuration: 15,
+            minDuration: 8,
+            operateType: 'Section_Cut_Off',
+            skinCode: '06',
+            trainingName: '区段跟踪切除({8}{9})',
+            trainingRemark: '区段跟踪切除',
+            trainingType: 'Section',
+            productTypes: ['01', '02'],
+            stepVOList: [
+                { deviceType: '03', orderNum: 1, operateCode: '405', tip: '鼠标右键菜单选择【区段跟踪切除】' },
+                { deviceType: '03', orderNum: 2, operateCode: '405', tip: '鼠标左键点击【确定】按钮' }
+            ]
+        },
+        {
+            maxDuration: 15,
+            minDuration: 8,
+            operateType: 'Section_Active',
+            skinCode: '06',
+            trainingName: '区段跟踪激活({8}{9})',
+            trainingRemark: '区段跟踪激活功能',
+            trainingType: 'Section',
+            productTypes: ['01', '02'],
+            stepVOList: [
+                { deviceType: '03', orderNum: 1, operateCode: '406', tip: '鼠标右键菜单选择【区段跟踪激活】' },
+                { deviceType: '03', orderNum: 2, operateCode: '406', tip: '鼠标左键点击【确定】按钮' }
+            ]
+        },
+        {
+            maxDuration: 15,
+            minDuration: 8,
+            operateType: 'Section_Set_Limit_Speed',
+            skinCode: '06',
+            trainingName: '设置临时限速({8}{9})',
+            trainingRemark: '设置临时限速功能（限速值：5）',
+            trainingType: 'Section',
+            productTypes: ['02'],
+            stepVOList: [
+                { deviceType: '03', orderNum: 1, operateCode: '407', tip: '鼠标右键菜单选择【设置临时限速】' },
+                { deviceType: '03', orderNum: 2, operateCode: '4076', tip: '鼠标左键选择【限速值: 5】', val: '5' },
+                { deviceType: '03', orderNum: 3, operateCode: '4071', tip: '鼠标左键点击【下达】按钮' },
+                { deviceType: '03', orderNum: 4, operateCode: '4072', tip: '鼠标左键点击【确认】按钮' },
+                { deviceType: '03', orderNum: 5, operateCode: '4073', tip: '鼠标左键点击【确认1】按钮' },
+                { deviceType: '03', orderNum: 6, operateCode: '4074', tip: '鼠标左键点击【确认2】按钮' },
+                { deviceType: '03', orderNum: 7, operateCode: '001', tip: '鼠标左键点击【关闭】按钮' }
+            ]
+        },
+        {
+            maxDuration: 15,
+            minDuration: 8,
+            operateType: 'Section_Set_Limit_Speed',
+            skinCode: '06',
+            trainingName: '设置临时限速({8}{9})',
+            trainingRemark: '设置临时限速功能-取消临时限速（限速值：不限速）',
+            trainingType: 'Section',
+            productTypes: ['02'],
+            stepVOList: [
+                { deviceType: '03', orderNum: 1, operateCode: '407', tip: '鼠标右键菜单选择【设置临时限速】' },
+                { deviceType: '03', orderNum: 2, operateCode: '4076', tip: '鼠标左键选择【限速值: 不限速】', val: '0' },
+                { deviceType: '03', orderNum: 3, operateCode: '4071', tip: '鼠标左键点击【下达】按钮' },
+                { deviceType: '03', orderNum: 4, operateCode: '4072', tip: '鼠标左键点击【确认】按钮' },
+                { deviceType: '03', orderNum: 5, operateCode: '4073', tip: '鼠标左键点击【确认1】按钮' },
+                { deviceType: '03', orderNum: 6, operateCode: '4074', tip: '鼠标左键点击【确认2】按钮' },
+                { deviceType: '03', orderNum: 7, operateCode: '001', tip: '鼠标左键点击【关闭】按钮' }
+            ]
+        },
+        {
+            maxDuration: 15,
+            minDuration: 8,
+            operateType: 'Section_Block',
+            skinCode: '06',
+            trainingName: '区段封锁({8}{9})',
+            trainingRemark: '区段封锁功能',
+            trainingType: 'Section',
+            productTypes: ['01'],
+            stepVOList: [
+                { deviceType: '03', orderNum: 1, operateCode: '403', tip: '鼠标右键菜单选择【区段封锁】' },
+                { deviceType: '03', orderNum: 2, operateCode: '403', tip: '鼠标左键点击【确定】按钮' }
+            ]
+        },
+        {
+            maxDuration: 15,
+            minDuration: 8,
+            operateType: 'Section_Unblock',
+            skinCode: '06',
+            trainingName: '区段解封({8}{9})',
+            trainingRemark: '区段解封功能',
+            trainingType: 'Section',
+            productTypes: ['01'],
+            stepVOList: [
+                { deviceType: '03', orderNum: 1, operateCode: '404', tip: '鼠标右键菜单选择【区段解封】' },
+                { deviceType: '03', orderNum: 2, operateCode: '4043', tip: '鼠标左键点击【确定】按钮' },
+                { deviceType: '03', orderNum: 3, operateCode: '4046', tip: '鼠标左键选择({8}{9})区段', val: '{19}' },
+                { deviceType: '03', orderNum: 4, operateCode: '4044', tip: '鼠标左键点击【确定】按钮' },
+                { deviceType: '03', orderNum: 5, operateCode: '4042', tip: '鼠标左键点击【关闭】按钮' }
+            ]
+        },
+        {
+            maxDuration: 15,
+            minDuration: 8,
+            operateType: 'Section_Confirm_Axis_Valid',
+            skinCode: '06',
+            trainingName: '确认计轴有效({8}{9})',
+            trainingRemark: '确认计轴有效功能',
+            trainingType: 'Section',
+            productTypes: ['02'],
+            stepVOList: [
+                { deviceType: '03', orderNum: 1, operateCode: '412', tip: '鼠标右键菜单选择【确认计轴有效】' },
+                { deviceType: '03', orderNum: 2, operateCode: '4123', tip: '鼠标左键选择【确认】' },
+                { deviceType: '03', orderNum: 3, operateCode: '4121', tip: '鼠标左键选择{20}', val: '{22}' },
+                { deviceType: '03', orderNum: 4, operateCode: '4122', tip: '鼠标左键选择({8}{9})', val: '{19}' },
+                { deviceType: '03', orderNum: 5, operateCode: '4124', tip: '鼠标左键点击【确认】按钮' },
+                { deviceType: '03', orderNum: 6, operateCode: '000', tip: '鼠标左键点击【关闭】按钮' }
+            ]
+        },
+        {
+            maxDuration: 15,
+            minDuration: 8,
+            operateType: 'Switch_Normal_Position',
+            skinCode: '06',
+            trainingName: '定操({7})',
+            trainingRemark: '定操({7})',
+            trainingType: 'Switch',
+            productTypes: ['01', '02'],
+            stepVOList: [
+                { deviceType: '02', orderNum: 1, operateCode: '101', tip: '鼠标左键菜单选择【定操】' },
+                { deviceType: '02', orderNum: 2, operateCode: '101', tip: '鼠标左键点击【确定】按钮' }
+            ]
+        },
+        {
+            maxDuration: 15,
+            minDuration: 8,
+            operateType: 'Switch_Reverse_Position', // 0313 新增定位字典
+            skinCode: '06',
+            trainingName: '反操({7})',
+            trainingRemark: '反操({7})',
+            trainingType: 'Switch',
+            productTypes: ['01', '02'],
+            stepVOList: [
+                { deviceType: '02', orderNum: 1, operateCode: '102', tip: '鼠标右键菜单选择【反操】' },
+                { deviceType: '02', orderNum: 2, operateCode: '102', tip: '鼠标左键点击【确定】按钮' }
+            ]
+        },
+        {
+            maxDuration: 15,
+            minDuration: 8,
+            operateType: 'Switch_Cut_Off',
+            skinCode: '06',
+            trainingName: '区段切除({7})',
+            trainingRemark: '区段切除',
+            trainingType: 'Switch',
+            productTypes: ['02'],
+            stepVOList: [
+                { deviceType: '02', orderNum: 1, operateCode: '111', tip: '鼠标右键菜单选择【区段切除】' },
+                { deviceType: '02', orderNum: 2, operateCode: '111', tip: '鼠标左键点击【确定】按钮' }
+            ]
+        },
+        {
+            maxDuration: 15,
+            minDuration: 8,
+            operateType: 'Switch_Active',
+            skinCode: '06',
+            trainingName: '区段激活({7})',
+            trainingRemark: '区段激活功能',
+            trainingType: 'Switch',
+            productTypes: ['02'],
+            stepVOList: [
+                { deviceType: '02', orderNum: 1, operateCode: '112', tip: '鼠标右键菜单选择【区段激活】' },
+                { deviceType: '02', orderNum: 2, operateCode: '112', tip: '鼠标左键点击【确定】按钮' }
+            ]
+        },
+        {
+            maxDuration: 15,
+            minDuration: 8,
+            operateType: 'Switch_Confirm_Axis_Valid',
+            skinCode: '06',
+            trainingName: '确认计轴有效({8}{9})',
+            trainingRemark: '确认计轴有效功能',
+            trainingType: 'Switch',
+            productTypes: ['02'],
+            stepVOList: [
+                { deviceType: '03', orderNum: 1, operateCode: '412', tip: '鼠标右键菜单选择【确认计轴有效】' },
+                { deviceType: '03', orderNum: 2, operateCode: '4123', tip: '鼠标左键选择【确认】' },
+                { deviceType: '03', orderNum: 3, operateCode: '4121', tip: '鼠标左键选择{21}', val: '{23}' },
+                { deviceType: '03', orderNum: 4, operateCode: '4122', tip: '鼠标左键选择({25})', val: '{24}' },
+                { deviceType: '03', orderNum: 5, operateCode: '4124', tip: '鼠标左键点击【确认】按钮' },
+                { deviceType: '03', orderNum: 6, operateCode: '000', tip: '鼠标左键点击【关闭】按钮' }
+            ]
+        },
+        {
+            maxDuration: 15,
+            minDuration: 8,
+            operateType: 'Switch_Single_Lock',
+            skinCode: '06',
+            trainingName: '道岔单锁({7})',
+            trainingRemark: '道岔单锁功能',
+            trainingType: 'Switch',
+            productTypes: ['01'],
+            stepVOList: [
+                { deviceType: '02', orderNum: 1, operateCode: '103', tip: '鼠标右键菜单选择【道岔单锁】' },
+                { deviceType: '02', orderNum: 2, operateCode: '103', tip: '鼠标左键点击【确定】按钮' }
+            ]
+        },
+        {
+            maxDuration: 15,
+            minDuration: 8,
+            operateType: 'Switch_Single_Unlock',
+            skinCode: '06',
+            trainingName: '道岔单解({7})',
+            trainingRemark: '道岔单解功能',
+            trainingType: 'Switch',
+            productTypes: ['01'],
+            stepVOList: [
+                { deviceType: '03', orderNum: 1, operateCode: '104', tip: '鼠标右键菜单选择【道岔单解】' },
+                { deviceType: '03', orderNum: 2, operateCode: '1043', tip: '鼠标左键点击【确定】按钮' },
+                { deviceType: '03', orderNum: 3, operateCode: '1046', tip: '鼠标左键选择道岔({7})', val: '{17}' },
+                { deviceType: '03', orderNum: 4, operateCode: '1044', tip: '鼠标左键点击【确定】按钮' },
+                { deviceType: '03', orderNum: 5, operateCode: '1042', tip: '鼠标左键点击【关闭】按钮' }
+            ]
+        },
+        {
+            maxDuration: 15,
+            minDuration: 8,
+            operateType: 'Switch_Block',
+            skinCode: '06',
+            trainingName: '道岔封锁({7})',
+            trainingRemark: '道岔封锁功能',
+            trainingType: 'Switch',
+            productTypes: ['01'],
+            stepVOList: [
+                { deviceType: '02', orderNum: 1, operateCode: '105', tip: '鼠标右键菜单选择【道岔封锁】' },
+                { deviceType: '02', orderNum: 2, operateCode: '105', tip: '鼠标左键点击【确定】按钮' }
+            ]
+        },
+        {
+            maxDuration: 15,
+            minDuration: 8,
+            operateType: 'Switch_Unblock',
+            skinCode: '06',
+            trainingName: '道岔解封({7})',
+            trainingRemark: '道岔解封功能',
+            trainingType: 'Switch',
+            productTypes: ['01'],
+            stepVOList: [
+                { deviceType: '03', orderNum: 1, operateCode: '106', tip: '鼠标右键菜单选择【道岔解封】' },
+                { deviceType: '03', orderNum: 2, operateCode: '1063', tip: '鼠标左键点击【确定】按钮' },
+                { deviceType: '03', orderNum: 3, operateCode: '1066', tip: '鼠标左键选择道岔({7})', val: '{17}' },
+                { deviceType: '03', orderNum: 4, operateCode: '1064', tip: '鼠标左键点击【确定】按钮' },
+                { deviceType: '03', orderNum: 5, operateCode: '1062', tip: '鼠标左键点击【关闭】按钮' }
+            ]
+        },
+        {
+            maxDuration: 15,
+            minDuration: 8,
+            operateType: 'Switch_Set_Limit_Speed',
+            skinCode: '06',
+            trainingName: '设置临时限速({7})',
+            trainingRemark: '设置临时限速功能（限速值：10）',
+            trainingType: 'Switch',
+            productTypes: ['01', '02'],
+            stepVOList: [
+                { deviceType: '02', orderNum: 1, operateCode: '113', tip: '鼠标右键菜单选择【设置临时限速】' },
+                { deviceType: '02', orderNum: 2, operateCode: '1136', tip: '鼠标左键选择【限速值: 10】', val: '10' },
+                { deviceType: '02', orderNum: 3, operateCode: '1131', tip: '鼠标左键点击【下达】按钮' },
+                { deviceType: '02', orderNum: 4, operateCode: '1132', tip: '鼠标左键点击【确认】按钮' },
+                { deviceType: '02', orderNum: 5, operateCode: '1133', tip: '鼠标左键点击【确认1】按钮' },
+                { deviceType: '02', orderNum: 6, operateCode: '1134', tip: '鼠标左键点击【确认2】按钮' },
+                { deviceType: '02', orderNum: 7, operateCode: '001', tip: '鼠标左键点击【关闭】按钮' }
+            ]
+        },
+        {
+            maxDuration: 15,
+            minDuration: 8,
+            operateType: 'Switch_Set_Limit_Speed',
+            skinCode: '06',
+            trainingName: '设置临时限速({7})',
+            trainingRemark: '设置临时限速功能-取消临时限速（限速值：不限速）',
+            trainingType: 'Switch',
+            productTypes: ['01', '02'],
+            stepVOList: [
+                { deviceType: '02', orderNum: 1, operateCode: '113', tip: '鼠标右键菜单选择【设置临时限速】' },
+                { deviceType: '02', orderNum: 2, operateCode: '1136', tip: '鼠标左键选择【限速值: 不限速】', val: '0' },
+                { deviceType: '02', orderNum: 3, operateCode: '1131', tip: '鼠标左键点击【下达】按钮' },
+                { deviceType: '02', orderNum: 4, operateCode: '1132', tip: '鼠标左键点击【确认】按钮' },
+                { deviceType: '02', orderNum: 5, operateCode: '1133', tip: '鼠标左键点击【确认1】按钮' },
+                { deviceType: '02', orderNum: 6, operateCode: '1134', tip: '鼠标左键点击【确认2】按钮' },
+                { deviceType: '02', orderNum: 7, operateCode: '001', tip: '鼠标左键点击【关闭】按钮' }
+            ]
+        },
+        {
+            maxDuration: 15,
+            minDuration: 8,
+            operateType: 'Signal_Set_Route',
+            skinCode: '06',
+            trainingName: '排列进路({28})',
+            trainingRemark: '排列进路',
+            trainingType: 'Signal',
+            productTypes: ['01', '02'],
+            stepVOList: [
+                { deviceType: '04', orderNum: 1, operateCode: '301', tip: '鼠标右键菜单选择【排列进路】' },
+                { deviceType: '04', orderNum: 2, operateCode: '3011', tip: '鼠标左键选择进路名称【{28}】', val: '{4}' },
+                { deviceType: '04', orderNum: 3, operateCode: '301', tip: '鼠标左键点击【确定】按钮' }
+            ]
+        },
+        // this.tempData.forEach(route => {
+        //     if (route.turnBack) {
+        //         route.name = `${route.name}(Z)`;
+        //     }
+        // });
+        {
+            maxDuration: 15,
+            minDuration: 8,
+            operateType: 'Signal_Cancel_Route',
+            skinCode: '06',
+            trainingName: '取消进路({3})',
+            trainingRemark: '取消进路',
+            trainingType: 'Signal',
+            productTypes: ['01', '02'],
+            stepVOList: [
+                { deviceType: '04', orderNum: 1, operateCode: '303', tip: '鼠标右键菜单选择【取消进路】' },
+                { deviceType: '04', orderNum: 2, operateCode: '303', tip: '鼠标左键点击【确定】按钮' }
+            ]
+        },
+        {
+            maxDuration: 8,
+            minDuration: 5,
+            operateType: 'Signal_Reopen_Signal',
+            skinCode: '06',
+            trainingName: '信号重开({5})',
+            trainingRemark: '信号重开功能',
+            trainingType: 'Signal',
+            productTypes: ['01', '02'],
+            stepVOList: [
+                { deviceType: '04', orderNum: 1, operateCode: '304', tip: '鼠标右键菜单选择【信号重开】' },
+                { deviceType: '04', orderNum: 2, operateCode: '304', tip: '鼠标左键点击【确定】按钮' }
+            ]
+        },
+        {
+            maxDuration: 15,
+            minDuration: 8,
+            operateType: 'Signal_Open_Auto_Setting',
+            skinCode: '06',
+            trainingName: '进路交自动控({28})',
+            trainingRemark: '进路交自动控',
+            trainingType: 'Signal',
+            productTypes: ['01', '02'],
+            stepVOList: [
+                { deviceType: '04', orderNum: 1, operateCode: '315', tip: '鼠标右键菜单选择【进路交自动控】' },
+                { deviceType: '04', orderNum: 2, operateCode: '3151', tip: '鼠标左键选择【{28}】进路', val: '{4}' },
+                { deviceType: '04', orderNum: 3, operateCode: '315', tip: '鼠标左键点击【确定】按钮' }
+            ]
+        },
+        {
+            maxDuration: 15,
+            minDuration: 8,
+            operateType: 'Signal_Close_Auto_Setting',
+            skinCode: '06',
+            trainingName: '进路交人工控({28})',
+            trainingRemark: '进路交人工控',
+            trainingType: 'Signal',
+            productTypes: ['01', '02'],
+            stepVOList: [
+                { deviceType: '04', orderNum: 1, operateCode: '314', tip: '鼠标右键菜单选择【进路交人工控】' },
+                { deviceType: '04', orderNum: 2, operateCode: '3141', tip: '鼠标左键选择【{28}】进路', val: '{4}' },
+                { deviceType: '04', orderNum: 3, operateCode: '314', tip: '鼠标左键点击【确定】按钮' }
+            ]
+        },
+        {
+            maxDuration: 15,
+            minDuration: 8,
+            operateType: 'Signal_Set_CI_Auto',
+            skinCode: '06',
+            trainingName: '设置通过模式({5})',
+            trainingRemark: '设置通过模式',
+            trainingType: 'Signal',
+            productTypes: ['02'],
+            stepVOList: [
+                { deviceType: '04', orderNum: 1, operateCode: '309', tip: '鼠标右键菜单选择【设置通过模式】' },
+                { deviceType: '04', orderNum: 2, operateCode: '309', tip: '鼠标左键点击【确定】按钮' }
+            ]
+        },
+        {
+            maxDuration: 15,
+            minDuration: 8,
+            operateType: 'Signal_Set_CI_Auto',
+            skinCode: '06',
+            trainingName: 'Fleet进路办理({5})',
+            trainingRemark: 'Fleet进路办理',
+            trainingType: 'Signal',
+            productTypes: ['01'],
+            stepVOList: [
+                { deviceType: '04', orderNum: 1, operateCode: '309', tip: '鼠标右键菜单选择【Fleet进路办理】' },
+                { deviceType: '04', orderNum: 2, operateCode: '309', tip: '鼠标左键点击【确定】按钮' }
+            ]
+        },
+        {
+            maxDuration: 15,
+            minDuration: 8,
+            operateType: 'Signal_Cancel_CI_Auto',
+            skinCode: '06',
+            trainingName: '取消通过模式({5})',
+            trainingRemark: '取消通过模式',
+            trainingType: 'Signal',
+            productTypes: ['02'],
+            stepVOList: [
+                { deviceType: '04', orderNum: 1, operateCode: '310', tip: '鼠标右键菜单选择【取消通过模式】' },
+                { deviceType: '04', orderNum: 2, operateCode: '310', tip: '鼠标左键点击【确定】按钮' }
+            ]
+        },
+        {
+            maxDuration: 15,
+            minDuration: 8,
+            operateType: 'Signal_Cancel_CI_Auto',
+            skinCode: '06',
+            trainingName: 'Fleet进路取消({5})',
+            trainingRemark: 'Fleet进路取消',
+            trainingType: 'Signal',
+            productTypes: ['01'],
+            stepVOList: [
+                { deviceType: '04', orderNum: 1, operateCode: '310', tip: '鼠标右键菜单选择【Fleet进路取消】' },
+                { deviceType: '04', orderNum: 2, operateCode: '310', tip: '鼠标左键点击【确定】按钮' }
+            ]
+        },
+        {
+            maxDuration: 15,
+            minDuration: 8,
+            operateType: 'Signal_Cancel_Guide',
+            skinCode: '06',
+            trainingName: '人工解锁进路({5})',
+            trainingRemark: '人工解锁进路',
+            trainingType: 'Signal',
+            productTypes: ['01', '02'],
+            stepVOList: [
+                { deviceType: '04', orderNum: 1, operateCode: '318', tip: '鼠标右键菜单选择【人工解锁进路】' },
+                { deviceType: '04', orderNum: 2, operateCode: '318', tip: '鼠标左键点击【确定】按钮' }
+            ]
+        },
+        {
+            maxDuration: 15,
+            minDuration: 8,
+            operateType: 'Signal_Set_Guide',
+            skinCode: '06',
+            trainingName: '信号机引导办理({5})',
+            trainingRemark: '信号机引导办理',
+            trainingType: 'Signal',
+            productTypes: ['01'],
+            stepVOList: [
+                { deviceType: '04', orderNum: 1, operateCode: '308', tip: '鼠标右键菜单选择【信号机引导办理】' },
+                { deviceType: '04', orderNum: 2, operateCode: '308', tip: '鼠标左键点击【确定】按钮' }
+            ]
+        },
+        {
+            maxDuration: 15,
+            minDuration: 8,
+            operateType: 'Signal_Block',
+            skinCode: '06',
+            trainingName: '信号封锁({5})',
+            trainingRemark: '信号封锁',
+            trainingType: 'Signal',
+            productTypes: ['01'],
+            stepVOList: [
+                { deviceType: '04', orderNum: 1, operateCode: '306', tip: '鼠标右键菜单选择【信号封锁】' },
+                { deviceType: '04', orderNum: 2, operateCode: '306', tip: '鼠标左键点击【确定】按钮' }
+            ]
+        },
+        {
+            maxDuration: 15,
+            minDuration: 8,
+            operateType: 'Signal_Unblock',
+            skinCode: '06',
+            trainingName: '信号解封({5})',
+            trainingRemark: '信号解封功能',
+            trainingType: 'Signal',
+            productTypes: ['01'],
+            stepVOList: [
+                { deviceType: '03', orderNum: 1, operateCode: '307', tip: '鼠标右键菜单选择【信号解封】' },
+                { deviceType: '03', orderNum: 2, operateCode: '3073', tip: '鼠标左键点击【确定】按钮' },
+                { deviceType: '03', orderNum: 3, operateCode: '3076', tip: '鼠标左键选择信号机({5})', val: '{6}' },
+                { deviceType: '03', orderNum: 4, operateCode: '3074', tip: '鼠标左键点击【确定】按钮' },
+                { deviceType: '03', orderNum: 5, operateCode: '3072', tip: '鼠标左键点击【关闭】按钮' }
+            ]
+        },
+        {
+            maxDuration: 15,
+            minDuration: 8,
+            operateType: 'Signal_Find_Routes_Status',
+            skinCode: '06',
+            trainingName: '查询进路控制状态({5})',
+            trainingRemark: '查询进路控制状态',
+            trainingType: 'Signal',
+            productTypes: ['01', '02'],
+            stepVOList: [
+                { deviceType: '04', orderNum: 1, operateCode: '316', tip: '鼠标右键菜单选择【查询进路控制状态】' },
+                { deviceType: '04', orderNum: 2, operateCode: '316', tip: '鼠标左键点击【确定】按钮' }
+            ]
+        },
+
+        {
+            maxDuration: 20,
+            minDuration: 15,
+            operateType: 'CM_Apply_For_Center_Control',
+            skinCode: '06',
+            trainingName: '请求遥控({1})',
+            trainingRemark: '控制权限转换，站控转中控',
+            trainingType: 'ControlConvertMenu',
+            productTypes: ['02'], // 行调请求中控
+            stepVOList: [
+                { deviceType: 'button', orderNum: 1, operateCode: '204', tip: '鼠标右键菜单选择【请求遥控】'},
+                { deviceType: '05', orderNum: 2, operateCode: '2043', tip: '鼠标左键点击【应用】' }
+            ]
+        },
+        {
+            maxDuration: 15,
+            minDuration: 8,
+            operateType: 'CM_Apply_For_Station_Control',
+            skinCode: '06',
+            trainingName: '请求站控({1})',
+            trainingRemark: '控制权限转换，中控转站控',
+            trainingType: 'ControlConvertMenu',
+            productTypes: ['01'], // 现地请求站控
+            stepVOList: [
+                { deviceType: 'button', orderNum: 1, operateCode: '202', tip: '鼠标右键菜单选择【请求站控】'},
+                { deviceType: '05', orderNum: 2, operateCode: '2023', tip: '鼠标左键点击【应用】' }
+            ]
+        },
+        {
+            maxDuration: 15,
+            minDuration: 8,
+            operateType: 'Signal_Set_Auto_Turn_Back',
+            skinCode: '06',
+            trainingName: '设置自动折返({3})',
+            trainingRemark: '设置自动折返',
+            trainingType: 'Signal',
+            productTypes: ['02'],
+            stepVOList: [
+                { deviceType: '05', orderNum: 1, operateCode: '900', tip: '鼠标右键菜单选择【设置自动折返】'},
+                { deviceType: '05', orderNum: 2, operateCode: '900', tip: '鼠标左键点击【应用】' }
+            ]
+        },
+        {
+            maxDuration: 15,
+            minDuration: 8,
+            operateType: 'Signal_Cancel_Auto_Turn_Back',
+            skinCode: '06',
+            trainingName: ' 取消自动折返({3})',
+            trainingRemark: ' 取消自动折返',
+            trainingType: 'Signal',
+            productTypes: ['02'],
+            stepVOList: [
+                { deviceType: '05', orderNum: 1, operateCode: '901', tip: '鼠标右键菜单选择【取消自动折返】'},
+                { deviceType: '05', orderNum: 2, operateCode: '901', tip: '鼠标左键点击【应用】' }
+            ]
+        },
+        {
+            maxDuration: 20,
+            minDuration: 15,
+            operateType: 'Cancel_All_Limit_Speed',
+            skinCode: '06',
+            trainingName: ' 取消全线临时限速',
+            trainingRemark: ' 取消全线临时限速',
+            trainingType: 'LimitControl',
+            productTypes: ['02'],
+            stepVOList: [
+                { deviceType: '10', orderNum: 1, operateCode: '800', tip: '鼠标右键菜单选择【取消全线临时限速】'},
+                { deviceType: '10', orderNum: 2, operateCode: '8001', tip: '鼠标左键点击【打开会话】'},
+                { deviceType: '10', orderNum: 3, operateCode: '8003', tip: '鼠标左键点击【确认】'},
+                { deviceType: '10', orderNum: 4, operateCode: '8004', tip: '鼠标左键点击【确认】'},
+                { deviceType: '10', orderNum: 5, operateCode: '8005', tip: '鼠标左键点击【关闭】'},
+                { deviceType: '10', orderNum: 6, operateCode: '8006', tip: '鼠标左键点击【确认】' }
+            ]
+        },
+        {
+            maxDuration: 15,
+            minDuration: 8,
+            operateType: 'Station_Close_Auto_Setting',
+            skinCode: '06',
+            trainingName: ' 所有进路自排关({26})',
+            trainingRemark: ' 所有进路自排关',
+            trainingType: 'Station',
+            productTypes: ['02'],
+            stepVOList: [
+                { deviceType: '05', orderNum: 1, operateCode: '605', tip: '鼠标右键菜单选择【所有进路自排关】'},
+                { deviceType: '05', orderNum: 2, operateCode: '605', tip: '鼠标左键点击【确定】' }
+            ]
+        },
+        {
+            maxDuration: 15,
+            minDuration: 8,
+            operateType: 'Station_Open_Auto_Setting',
+            skinCode: '06',
+            trainingName: ' 所有进路自排开({26})',
+            trainingRemark: ' 所有进路自排开',
+            trainingType: 'Station',
+            productTypes: ['02'],
+            stepVOList: [
+                { deviceType: '05', orderNum: 1, operateCode: '606', tip: '鼠标右键菜单选择【所有进路自排开】'},
+                { deviceType: '05', orderNum: 2, operateCode: '606', tip: '鼠标左键点击【确定】' }
+            ]
+        },
+        {
+            maxDuration: 15,
+            minDuration: 8,
+            operateType: 'Station_Cancel_CI_Auto_Trigger',
+            skinCode: '06',
+            trainingName: ' 全站取消联锁自动触发({26})',
+            trainingRemark: ' 全站取消联锁自动触发',
+            trainingType: 'Station',
+            productTypes: ['01'],
+            stepVOList: [
+                { deviceType: '05', orderNum: 1, operateCode: '602', tip: '鼠标右键菜单选择【全站取消联锁自动触发】'},
+                { deviceType: '05', orderNum: 2, operateCode: '602', tip: '鼠标左键点击【确定】' }
+            ]
+        },
+        {
+            maxDuration: 15,
+            minDuration: 8,
+            operateType: 'Station_Set_CI_Auto_Trigger',
+            skinCode: '06',
+            trainingName: ' 全站设置联锁自动触发({26})',
+            trainingRemark: ' 全站设置联锁自动触发',
+            trainingType: 'Station',
+            productTypes: ['01'],
+            stepVOList: [
+                { deviceType: '05', orderNum: 1, operateCode: '601', tip: '鼠标右键菜单选择【全站设置联锁自动触发】'},
+                { deviceType: '05', orderNum: 2, operateCode: '601', tip: '鼠标左键点击【确定】' }
+            ]
+        }
+    ]
+};
diff --git a/src/jmapNew/theme/race_01/planConvert.js b/src/jmapNew/theme/race_01/planConvert.js
new file mode 100644
index 000000000..48b2e1f55
--- /dev/null
+++ b/src/jmapNew/theme/race_01/planConvert.js
@@ -0,0 +1,322 @@
+import { createMartPoint, createSeriesModel, createMarkLineModels, hexColor, convertSheetToList } from '@/utils/runPlan';
+
+export default {
+    /** 边缘高度*/
+    EdgeHeight: 600,
+
+    /** 间隔高度*/
+    CoordMultiple: 1,
+
+    /** 偏移时间*/
+    TranslationTime: 60 * 60 * 2,
+
+    /** excel解析配置*/
+    ExcelConfig: {
+        beginRow: 1,
+        beginCol: 0,
+        fieldNum: 10,
+        sepField: '车次',
+        columns: {
+            '车站名': { key: 'stationName', formatter: (val) => { return val; } },
+            '到点': { key: 'arriveTime', formatter: (val) => { return val; } },
+            '发点': { key: 'departureTime', formatter: (val) => { return val; } }
+        }
+    },
+
+    /** 解析exal数据转换为Json后台数据*/
+    importData(Sheet, JsonData) {
+        var dataList = convertSheetToList(Sheet, true);
+        var needList = Object.keys(this.ExcelConfig.columns);
+
+        if (dataList && dataList.length) {
+            for (var colIndex = this.ExcelConfig.beginCol; colIndex < dataList.length; colIndex += this.ExcelConfig.fieldNum + 1) {
+                var isContinue = true;
+                var tripObj = { code: '', arrivalList: [] };
+
+                for (var rowIndex = this.ExcelConfig.beginRow; isContinue; rowIndex += 1) {
+                    isContinue = false;
+
+                    var stationObj = {};
+                    for (var index = 0; index < this.ExcelConfig.fieldNum; index += 1) {
+                        if (dataList[colIndex + index]) {
+                            var title = dataList[colIndex + index][0];
+                            var value = dataList[colIndex + index][rowIndex];
+
+                            if (title && value) {
+                                // 数据列解析
+                                isContinue = true;
+                                var titleStr = `${title}`.trim();
+                                var valueStr = `${value}`.trim();
+
+                                if (titleStr == this.ExcelConfig.sepField) {
+                                    if (tripObj.code) {
+                                        const length = tripObj.arrivalList.length;
+                                        if (length == 1) {
+                                            tripObj.arrivalList[0]['flag'] = true;
+                                        }
+                                        JsonData.push(tripObj);
+                                        tripObj = { code: valueStr, arrivalList: [] };
+                                    } else {
+                                        tripObj.code = valueStr;
+                                    }
+                                }
+
+                                // 取需要的字段
+                                if (needList.findIndex(elem => { return elem == titleStr; }) >= 0) {
+                                    stationObj[this.ExcelConfig.columns[titleStr].key] = this.ExcelConfig.columns[titleStr].formatter(valueStr);
+                                }
+                            }
+                        }
+                    }
+
+                    // 添加字段值
+                    if (Object.keys(stationObj).length) {
+                        tripObj.arrivalList.push(stationObj);
+                    }
+                }
+
+                // 添加最后那条没有车次的记录
+                if (tripObj.code) {
+                    const length = tripObj.arrivalList.length;
+                    if (length) {
+                        tripObj.arrivalList[length - 1]['flag'] = true;
+                    }
+                    JsonData.push(tripObj);
+                }
+            }
+        }
+
+        return JsonData;
+    },
+
+    /** 将后台数据解析成图表*/
+    convertDataToModels(data, stations, kmRangeCoordMap, lineStyle) {
+        var models = [];
+
+        if (data && data.serviceNumberDataList && data.serviceNumberDataList.length) {
+            /** 按服务遍历数据*/
+            data.serviceNumberDataList.forEach((service) => {
+                /** 按车次遍历数据*/
+                var isBackup = true;
+                var opt = { name: '', markPointData: [], data: [] };
+                if (service.tripNumberDataList && service.tripNumberDataList.length) {
+                    service.tripNumberDataList.forEach((train, j) => {
+                        var pointdata = {};
+                        var idx = 0;
+                        var num = 0;
+                        var lastPoint = null;
+                        var nextPoint = null;
+
+                        /** 如果车次号为空，不显示名称*/
+                        if (train.tripNumber) {
+                            /** 创建标记点名称和坐标*/
+                            // pointdata.name = `${service.serviceNumber}${train.directionCode}${train.tripNumber}`;
+                            pointdata.name = `${service.serviceNumber}${train.tripNumber}`;
+                            pointdata.color = '#000' || lineStyle.color;
+                            pointdata.directionCode = train.directionCode;
+                            pointdata.coord = [train.stationTimeList[1].secondTime, this.getCoordYByElem(stations, kmRangeCoordMap, train.stationTimeList[1], train.right, false)];
+
+                            /** 给服务对象添加服务名称和标记点*/
+                            opt.markPointData.push(createMartPoint(pointdata));
+                            /** 创建服务号名称*/
+                            opt.name = `${service.serviceNumber}`;
+                        }
+
+                        /** 计算非折返点车次点坐标集合*/
+                        train.stationTimeList.forEach((elem, index) => {
+                            idx = index;
+                            if (index == 0 && train.stationTimeList[index].stationCode != train.stationTimeList[index + 1].stationCode ||
+								index == train.stationTimeList.length - 2 && train.stationTimeList[index].secondTime != train.stationTimeList[index + 1].secondTime ||
+								index > 0 && index < train.stationTimeList.length - 1) {
+                                // ${train.directionCode}
+                                const aa = `${train.tripNumber}`;
+                                opt.data.push([elem.secondTime, this.getCoordYByElem(stations, kmRangeCoordMap, elem, elem.right, false), elem.stationCode, aa]);
+                            }
+                        });
+
+                        /** 计算折返点车次坐标点集合*/
+                        if (!train.backup && train.reentry && service.tripNumberDataList[j + 1] && service.tripNumberDataList[j + 1].stationTimeList) {
+                            lastPoint = train.stationTimeList[idx - 1];
+                            nextPoint = service.tripNumberDataList[j + 1].stationTimeList[1];
+                            num = this.computedReentryNumber(train.tripNumber);
+                            // ${train.directionCode}
+                            const aa = `${train.tripNumber}`;
+                            opt.data.push([lastPoint.secondTime, this.getCoordYByElem(stations, kmRangeCoordMap, lastPoint, train.right, true, num), lastPoint.stationCode, aa]);
+                            opt.data.push([nextPoint.secondTime, this.getCoordYByElem(stations, kmRangeCoordMap, nextPoint, train.right, true, num), nextPoint.stationCode, aa]);
+                        }
+
+                        /** 如果是备用车，按车次添加线*/
+                        if (train.backup) {
+                            /** 创建一条完成的服务数据*/
+                            opt.name += j;
+                            var model = createSeriesModel(opt, Object.assign({ color: hexColor.toCreate() }, lineStyle));
+                            if (model) {
+                                models.push(model);
+                                opt = { name: '', markPointData: [], data: [] };
+                            }
+                        }
+
+                        isBackup = train.backup;
+                    });
+
+                    // 不是备用车，按服务添加线
+                    if (!isBackup) {
+                        /** 创建一条完成的服务数据*/
+                        var model = createSeriesModel(opt, Object.assign({ color: hexColor.toCreate() }, lineStyle));
+                        if (model) {
+                            models.push(model);
+                        }
+                    }
+                }
+            });
+            return models;
+        } else {
+            return [];
+        }
+    },
+
+    /** 更新数据并解析成图表*/
+    updateDataToModels(data, stations, kmRangeCoordMap, runPlanData, series, lineStyle) {
+        if (data && data.length) {
+            data.forEach(elem => {
+                /** 判断此条记录的服务号是否存在*/
+                if (!runPlanData[elem.serviceNumber]) {
+                    /** 创建一个新服务号标记*/
+                    runPlanData[elem.serviceNumber] = {};
+
+                    /** 不存在此服务号，则需要创建一条新的line*/
+                    series.push(createSeriesModel({
+                        zlevel: 1,
+                        name: `run${elem.serviceNumber}`,
+                        data: [],
+                        markPointData: []
+                    }, Object.assign({ color: hexColor.toCreate() }, lineStyle)));
+                }
+
+                /** 添加数据*/
+                series.forEach(serie => {
+                    /** 找到服务号所在图数据的位置*/
+                    if (serie.name == `run${elem.serviceNumber}`) {
+                        /** 添加车组号记录标记*/
+                        if (!runPlanData[elem.serviceNumber][elem.tripNumber]) {
+                            runPlanData[elem.serviceNumber][elem.tripNumber] = [];
+                        }
+
+                        runPlanData[elem.serviceNumber][elem.tripNumber].push(elem);
+                        runPlanData[elem.serviceNumber][elem.tripNumber].sort((a, b) => {
+                            return parseInt(a.secondTime) - parseInt(b.secondTime);
+                        });
+
+                        /** 如果此记录车组号的数据为第一条时，则打上标签*/
+                        if (runPlanData[elem.serviceNumber][elem.tripNumber].length <= 1) {
+                            const result = serie.markPoint.data.some(ele => ele.name == `(${elem.groupNumber})${elem.serviceNumber}${elem.tripNumber}`);
+                            if (!result) {
+                                serie.markPoint.data.push(createMartPoint({
+                                    directionCode: elem.directionCode,
+                                    coord: [parseInt(elem.secondTime), this.getCoordYByElem(stations, kmRangeCoordMap, elem, false)],
+                                    name: `(${elem.groupNumber})${elem.serviceNumber}${elem.tripNumber}`,
+                                    color: lineStyle.color || '#000'
+                                }));
+                            }
+                        }
+
+                        /** 计算折返点*/
+                        elem.right = elem.tripNumber[0] == '2';
+                        var nextPoint = [parseInt(elem.secondTime), this.getCoordYByElem(stations, kmRangeCoordMap, elem, false), elem.tripNumber, elem.right];
+                        if (serie.data.length > 0) {
+                            var lastPoint = serie.data[serie.data.length - 1];
+                            if (lastPoint[2] !== nextPoint[2]) {
+                                var num = this.computedReentryNumber(elem.tripNumber);
+                                serie.data.push([lastPoint[0], this.getYvalueByDirectionCode(lastPoint[1], lastPoint[3], num), lastPoint[3]]);
+                                serie.data.push([nextPoint[0], this.getYvalueByDirectionCode(nextPoint[1], lastPoint[3], num), lastPoint[3]]);
+                            }
+                        }
+
+                        /** 添加车组号数据到对应的服务图数据中*/
+                        serie.data.push(nextPoint);
+
+                        /** 保证原始数据排序*/
+                        serie.data.sort((a, b) => {
+                            return parseInt(a[0]) - parseInt(b[0]);
+                        });
+                    }
+                });
+            });
+        }
+
+        return series;
+    },
+
+    /** 初始化Y轴*/
+    initializeYaxis(stations) {
+        return createMarkLineModels(stations, (elem) => {
+            return this.EdgeHeight + elem.kmRange * this.CoordMultiple;
+        });
+    },
+
+    /** 将后台数据转换为试图序列模型*/
+    convertStationsToMap(stations) {
+        var map = {};
+        if (stations && stations.length) {
+            stations.forEach((elem) => {
+                map[`${elem.kmRange}`] = this.EdgeHeight + elem.kmRange * this.CoordMultiple;
+            });
+        }
+
+        return map;
+    },
+
+    /** 计算y轴最小值*/
+    computedYaxisMinValue(stations) {
+        return stations[0].kmRange * this.CoordMultiple;
+    },
+
+    /** 计算y轴最大值*/
+    computedYaxisMaxValue(stations) {
+        return stations[stations.length - 1].kmRange * this.CoordMultiple + this.EdgeHeight * 2;
+    },
+
+    /** 格式化y轴数据*/
+    computedFormatYAxis(stations, params) {
+        var yText = '0m';
+
+        stations.forEach(elem => {
+            if (elem.kmRange < parseInt(params.value) / this.CoordMultiple - this.EdgeHeight) {
+                yText = Math.floor(elem.kmRange) + 'm';
+            }
+        });
+
+        return yText;
+    },
+
+    /** 根据是否和上一个车次是否相交，计算下一个车次的折返的高度*/
+    computedReentryNumber(code) {
+        // return parseInt(code || 1) % 2 ? 1 : 2;
+        return 1;
+    },
+
+    /** 根据方向计算y折返偏移量*/
+    getYvalueByDirectionCode(defaultVlue, right, num) {
+        if (!right) {
+            defaultVlue -= this.EdgeHeight / 2 * num;
+        } else if (right) {
+            defaultVlue += this.EdgeHeight / 2 * num;
+        }
+
+        return defaultVlue;
+    },
+
+    /** 根据elem计算y值*/
+    getCoordYByElem(stations, kmRangeCoordMap, elem, right, isSpecial, num) {
+        var defaultVlue = 0;
+        var station = stations.find(it => { return it.code == elem.stationCode; });
+        if (station) {
+            defaultVlue = kmRangeCoordMap[`${station.kmRange}`];
+            if (isSpecial) {
+                defaultVlue = this.getYvalueByDirectionCode(defaultVlue, right, num);
+            }
+        }
+
+        return defaultVlue;
+    }
+};
diff --git a/src/jmapNew/theme/xian_01/menus/menuDialog/viewName.vue b/src/jmapNew/theme/xian_01/menus/menuDialog/viewName.vue
index 255a184e8..38c635745 100644
--- a/src/jmapNew/theme/xian_01/menus/menuDialog/viewName.vue
+++ b/src/jmapNew/theme/xian_01/menus/menuDialog/viewName.vue
@@ -75,7 +75,7 @@
 
 <script>
 import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
-import deviceType from '@/jmap/constant/deviceType';
+import deviceType from '@/jmapNew/constant/deviceType';
 import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo';
 
 export default {
diff --git a/src/jmapNew/theme/xian_01/menus/menuSection.vue b/src/jmapNew/theme/xian_01/menus/menuSection.vue
index d423fca7f..93a6d184f 100644
--- a/src/jmapNew/theme/xian_01/menus/menuSection.vue
+++ b/src/jmapNew/theme/xian_01/menus/menuSection.vue
@@ -7,6 +7,7 @@
     <notice-info ref="noticeInfo" pop-class="xian-01__systerm" />
     <train-add-plan ref="trainAddPlan" pop-class="xian-01__systerm" />
     <set-fault ref="setFault" pop-class="xian-01__systerm" />
+    <load-spare-train ref="loadSpareTrain" pop-class="xian-01__systerm" />
   </div>
 </template>
 
@@ -23,6 +24,7 @@ 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';
 
 export default {
@@ -34,7 +36,8 @@ export default {
         SpeedCmdControl,
         NoticeInfo,
         TrainAddPlan,
-        SetFault
+        SetFault,
+        LoadSpareTrain
     },
     props: {
         selected: {
@@ -128,6 +131,11 @@ export default {
                     label: '触发故障管理',
                     handler: this.triggerFaultManagement,
                     cmdType: CMD.Fault.CMD_TRIGGER_FAULT
+                },
+                {
+                    label: '设置备用车',
+                    handler: this.loadSpare,
+                    cmdType: CMD.Section.CMD_TRAIN_LOAD_SPARE_TRAIN
                 }
             ]
         };
@@ -213,6 +221,13 @@ export default {
                 }
             });
         },
+        loadSpare() {
+            commitOperate(menuOperate.Section.loadSpareTrain, {sectionCode:this.selected.code}).then(({valid, operate})=>{
+                if (valid) {
+                    this.$refs.loadSpareTrain.doShow(operate, this.selected);
+                }
+            });
+        },
         // 故障解锁
         fault() {
             commitOperate(menuOperate.Section.fault, { sectionCode: this.selected.code }, 0).then(({valid, operate})=>{
diff --git a/src/jmapNew/theme/xian_01/menus/menuSwitch.vue b/src/jmapNew/theme/xian_01/menus/menuSwitch.vue
index 166f6c2fb..82435b89d 100644
--- a/src/jmapNew/theme/xian_01/menus/menuSwitch.vue
+++ b/src/jmapNew/theme/xian_01/menus/menuSwitch.vue
@@ -213,11 +213,11 @@ export default {
             }
             // 故障模式菜单列表
             if (this.operatemode === OperateMode.FAULT) {
-                if (!this.$store.state.scriptRecord.bgSet) {
-                    this.menu = [...this.menuForce, ...this.menuDirective];
-                } else {
-                    this.menu = this.menuForce;
-                }
+                // if (!this.$store.state.scriptRecord.bgSet) {
+                this.menu = [...this.menuForce, ...this.menuDirective];
+                // } else {
+                //     this.menu = this.menuForce;
+                // }
             }
         },
         doShow(point) {
diff --git a/src/jmapNew/theme/xian_01/planConvert.js b/src/jmapNew/theme/xian_01/planConvert.js
index 32d2fd84b..1cf586631 100644
--- a/src/jmapNew/theme/xian_01/planConvert.js
+++ b/src/jmapNew/theme/xian_01/planConvert.js
@@ -138,7 +138,8 @@ export default {
                             if (index == 0 && train.stationTimeList[index].stationCode != train.stationTimeList[index + 1].stationCode ||
 								index == train.stationTimeList.length - 2 && train.stationTimeList[index].secondTime != train.stationTimeList[index + 1].secondTime ||
 								index > 0 && index < train.stationTimeList.length - 1) {
-                                const aa = `${train.directionCode}${train.tripNumber}`;
+                                // ${train.directionCode}
+                                const aa = `${train.tripNumber}`;
                                 opt.data.push([elem.secondTime, this.getCoordYByElem(stations, kmRangeCoordMap, elem, elem.directionCode, false), elem.stationCode, aa]);
                             }
                         });
@@ -148,7 +149,8 @@ export default {
                             lastPoint = train.stationTimeList[idx - 1];
                             nextPoint = service.tripNumberDataList[j + 1].stationTimeList[1];
                             num = this.computedReentryNumber(train.tripNumber);
-                            const aa = `${train.directionCode}${train.tripNumber}`;
+                            // ${train.directionCode}
+                            const aa = `${train.tripNumber}`;
                             opt.data.push([lastPoint.secondTime, this.getCoordYByElem(stations, kmRangeCoordMap, lastPoint, train.directionCode, true, num), lastPoint.stationCode, aa]);
                             opt.data.push([nextPoint.secondTime, this.getCoordYByElem(stations, kmRangeCoordMap, nextPoint, train.directionCode, true, num), nextPoint.stationCode, aa]);
                         }
diff --git a/src/jmapNew/theme/xian_02/menus/menuSection.vue b/src/jmapNew/theme/xian_02/menus/menuSection.vue
index 1fda1839a..ee4f3245e 100644
--- a/src/jmapNew/theme/xian_02/menus/menuSection.vue
+++ b/src/jmapNew/theme/xian_02/menus/menuSection.vue
@@ -7,6 +7,7 @@
     <notice-info ref="noticeInfo" pop-class="xian-02__system" />
     <set-fault ref="setFault" pop-class="xian-02__system" />
     <train-add-plan ref="trainAddPlan" pop-class="xian-02__system" />
+    <load-spare-train ref="loadSpareTrain" pop-class="xian-02__system" />
   </div>
 </template>
 
@@ -23,6 +24,7 @@ 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 LoadSpareTrain from '@/jmapNew/theme/components/menus/dialog/loadSpareTrain';
 import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 
 export default {
@@ -34,7 +36,8 @@ export default {
         SpeedLimitControl,
         NoticeInfo,
         TrainAddPlan,
-        SetFault
+        SetFault,
+        LoadSpareTrain
     },
     props: {
         selected: {
@@ -132,6 +135,11 @@ export default {
                     label: '触发故障管理',
                     handler: this.triggerFaultManagement,
                     cmdType: CMD.Fault.CMD_TRIGGER_FAULT
+                },
+                {
+                    label: '设置备用车',
+                    handler: this.loadSpare,
+                    cmdType: CMD.Section.CMD_TRAIN_LOAD_SPARE_TRAIN
                 }
             ]
         };
@@ -251,6 +259,13 @@ export default {
                 }
             });
         },
+        loadSpare() {
+            commitOperate(menuOperate.Section.loadSpareTrain, {sectionCode:this.selected.code}).then(({valid, operate})=>{
+                if (valid) {
+                    this.$refs.loadSpareTrain.doShow(operate, this.selected);
+                }
+            });
+        },
         // 区段封锁
         lock() {
             commitOperate(menuOperate.Section.lock, {sectionCode:this.selected.code}, 0).then(({valid, operate})=>{
diff --git a/src/jmapNew/theme/xian_02/planConvert.js b/src/jmapNew/theme/xian_02/planConvert.js
index 64b8c7bdb..2bce84025 100644
--- a/src/jmapNew/theme/xian_02/planConvert.js
+++ b/src/jmapNew/theme/xian_02/planConvert.js
@@ -191,7 +191,8 @@ export default {
                             if (index == 0 && train.stationTimeList[index].stationCode != train.stationTimeList[index + 1].stationCode ||
 								index == train.stationTimeList.length - 2 && train.stationTimeList[index].secondTime != train.stationTimeList[index + 1].secondTime ||
 								index > 0 && index < train.stationTimeList.length - 1) {
-                                const aa = `${train.directionCode}${train.tripNumber}`;
+                                // ${train.directionCode}
+                                const aa = `${train.tripNumber}`;
                                 opt.data.push([elem.secondTime, this.getCoordYByElem(stations, kmRangeCoordMap, elem, elem.directionCode, false), elem.stationCode, aa]);
                             }
                         });
@@ -201,7 +202,8 @@ export default {
                             lastPoint = train.stationTimeList[idx - 1];
                             nextPoint = service.tripNumberDataList[j + 1].stationTimeList[1];
                             num = this.computedReentryNumber(train.tripNumber);
-                            const aa = `${train.directionCode}${train.tripNumber}`;
+                            // ${train.directionCode}
+                            const aa = `${train.tripNumber}`;
                             opt.data.push([lastPoint.secondTime, this.getCoordYByElem(stations, kmRangeCoordMap, lastPoint, train.directionCode, true, num), lastPoint.stationCode, aa]);
                             opt.data.push([nextPoint.secondTime, this.getCoordYByElem(stations, kmRangeCoordMap, nextPoint, train.directionCode, true, num), nextPoint.stationCode, aa]);
                         }
diff --git a/src/jmapNew/utils/parser.js b/src/jmapNew/utils/parser.js
index c329a76fa..c7fd5cf8f 100644
--- a/src/jmapNew/utils/parser.js
+++ b/src/jmapNew/utils/parser.js
@@ -238,6 +238,17 @@ export function parser(data, skinCode, showConfig) {
         zrUtil.each(data.directionRodList || [], elem=> {
             mapDevice[elem.code] = createDevice(deviceType.DirectionRod, elem, propConvert, showConfig);
         }, this);
+        zrUtil.each(data.signalApproachSectionList || [], elem => {
+            zrUtil.each(elem.sectionPathList || [], item => {
+                zrUtil.each(item.sectionList || [], section => {
+                    if (mapDevice[section] && mapDevice[section].parentCode) {
+                        (mapDevice[mapDevice[section].parentCode] || {}).approach = true;
+                    } else if (mapDevice[section]) {
+                        mapDevice[section].approach = true;
+                    }
+                });
+            });
+        });
     }
 
     return mapDevice;
diff --git a/src/layout/components/Qcode.vue b/src/layout/components/Qcode.vue
index 77cb8c852..5dd227168 100644
--- a/src/layout/components/Qcode.vue
+++ b/src/layout/components/Qcode.vue
@@ -1,7 +1,6 @@
 <template>
   <el-dialog v-dialogDrag title="选择仿真" :visible.sync="dialogShow" width="30%" center>
     <el-input v-model="input" placeholder="请输入仿真号" />
-    <el-checkbox v-if="!isShow" v-model="isNewMap">是否新版地图房间</el-checkbox>
     <span slot="footer" class="dialog-footer">
       <el-button @click="dialogShow = false">{{ $t('global.cancel') }}</el-button>
       <el-button v-loading="loading" :disabled="!input.length" type="primary" @click="comit">{{ $t('global.confirm') }}</el-button>
@@ -11,7 +10,6 @@
 
 <script>
 import { jointSimulationByPermission } from '@/api/jointSimulation';
-import { getPermissionJoint } from '@/api/chat';
 
 export default {
     name: 'Dashboard',
@@ -19,8 +17,7 @@ export default {
         return {
             input: '',
             dialogShow: false,
-            loading: false,
-            isNewMap: true
+            loading: false
         };
     },
     computed: {
@@ -38,11 +35,7 @@ export default {
         async comit() {
             try {
                 this.loading = true;
-                if (this.isNewMap || this.isShow) {
-                    await jointSimulationByPermission(`${this.input}`);
-                } else {
-                    await getPermissionJoint(`${this.input}`);
-                }
+                await jointSimulationByPermission(`${this.input}`);
                 this.dialogShow = false;
             } catch (error) {
                 const errorMessage = this.isShow ? this.$t('tip.failedToAddNewRoom') : this.$t('error.scanningError');
diff --git a/src/layout/components/userInfo.vue b/src/layout/components/userInfo.vue
index 15d2c07b1..010b3cce6 100644
--- a/src/layout/components/userInfo.vue
+++ b/src/layout/components/userInfo.vue
@@ -236,6 +236,14 @@
         </div>
       </div>
     </div>
+    <div class="form_box">
+      <div class="title">单位:</div>
+      <div class="content_box_info">
+        <div v-show="companyShow" class="show_box">
+          <span>{{ handleCompany(userInfo.companyId) }}</span>
+        </div>
+      </div>
+    </div>
     <div v-if="!wmOpenId" class="form_box">
       <div class="title">绑定微信:</div>
       <div class="content_box_info">
@@ -278,6 +286,7 @@ 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 {
     components: { QrcodeVue },
@@ -296,14 +305,16 @@ export default {
                 nickname: '',
                 mobile: '',
                 email: '',
-                passWord: ''
+                passWord: '',
+                companyId: ''
             },
             editInfo: {
                 name: '',
                 nickname: '',
                 mobile: '',
                 email: '',
-                passWord: ''
+                passWord: '',
+                companyId: ''
             },
             nationCode: '86',
             nameShow: true,
@@ -311,6 +322,7 @@ export default {
             mobileShow: true,
             emailShow: true,
             passwordShow: true,
+            companyShow: true,
             mobileCode: null,
             emailCode: null,
             passWordCode: null,
@@ -340,7 +352,8 @@ export default {
             nationCodeInit: '86', // 默认国际地区
             loginClient: 'LianKeTang',
             project:'',
-            wmOpenId: ''
+            wmOpenId: '',
+            companyList: []
         };
     },
     computed: {
@@ -372,7 +385,8 @@ export default {
                         nickname: user.nickname,
                         mobile: user.mobile,
                         email: user.email,
-                        passWord: ''
+                        passWord: '',
+                        companyId: user.companyId
                     };
                     this.wmOpenId = user.wmOpenId || '';
                     this.oldPassWord = user.password;
@@ -384,6 +398,11 @@ export default {
                 .catch(error => {
                     console.log(error, '请求个人信息失败');
                 });
+            getCompanyList().then(resp => {
+                this.companyList = resp.data;
+            }).catch((error) => {
+                console.log(error, '获取公司列表信息失败');
+            });
         },
         doClose() {
             this.visible = false;
@@ -394,6 +413,10 @@ export default {
             this.editInfo.name = this.userInfo.name;
             this.nameShow = !this.nameShow;
         },
+        switcherCompany() {
+            this.editInfo.companyId = this.userInfo.companyId;
+            this.companyShow = !this.companyShow;
+        },
         async saveName() {
             if (this.editInfo.name) {
                 try {
@@ -406,7 +429,16 @@ export default {
                 }
             }
         },
-
+        async saveCompany() {
+            try {
+                await getUserinfoName(this.info.id, this.editInfo.name);
+                this.userInfo.name = this.editInfo.name;
+                this.nameShow = !this.nameShow;
+                this.$store.commit('SET_NAME', this.editInfo.name);
+            } catch (error) {
+                console.log(error, '错误');
+            }
+        },
         switcherNickname() {
             this.editInfo.nickname = this.userInfo.nickname;
             this.nickNameShow = !this.nickNameShow;
@@ -426,7 +458,15 @@ 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;
diff --git a/src/permission.js b/src/permission.js
index f385ac5fa..756f714ac 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -4,7 +4,6 @@ import router from './router/index_APP_TARGET';
 import {loginInfo} from '@/scripts/ProjectConfig';
 import NProgress from 'nprogress';
 import 'nprogress/nprogress.css';
-// import { admin } from './router/index_APP_TARGET';
 import { getToken, removeToken, getSessionStorage } from '@/utils/auth';
 import localStore from 'storejs';
 
@@ -14,22 +13,15 @@ import localStore from 'storejs';
 //     return roles.some(role => permissionRoles.indexOf(role) >= 0);
 // }
 
-const whiteList = ['/login', '/design/login', '/gzzbxy/relay', '/AUStool']; // 不重定向白名单
+const whiteList = ['/login', '/design/login', '/gzzbxy/relay', '/authorization', '/AUSline', '/AUStool']; // 不重定向白名单
 
-// const designPageRegex = [/^\/design/, /^\/scriptDisplay/, /^\/publish/, /^\/orderauthor/, /^\/system/, /^\/iscs/, /^\/display\/record/, /^\/display\/manage/, /^\/apply/, /^\/plan/, /^\/display\/plan/, /^\/displayNew\/record/, /^\/displayNew\/manage/, /^\/displayNew\/plan/, /^\/practiceDisplayNew/, /^\/bigSplitScreen/];
-
-// function isDesignPage(toRoutePath) {
-//     return designPageRegex.some(item => item.test(toRoutePath) );
-// }
 for (const val in loginInfo) {
     if (loginInfo[val].loginPath && !whiteList.includes(loginInfo[val].loginPath)) {
         whiteList.push(loginInfo[val].loginPath);
     }
 }
-// const loginPage = whiteList[0];
-// const loginDesignPage = whiteList[1];
 
-// 获取路径数据
+// 登录路径判断获取
 function getRouteInfo(to) {
     let loginPath = '';
     const toRoutePath = to.redirectedFrom || to.path;
@@ -71,14 +63,12 @@ function handleRoute(to, next, loginPath) {
         });
     } else {
         // 除没有动态改变权限的需求可直接next() 删下方权限判断
-        // if (hasPermission(store.getters.roles, to.meta.roles)) {
         if (to.path === '/404' && to.redirectedFrom === '/') {
             const project = getSessionStorage('project');
             next(localStore.get('trainingPlatformRoute' + store.getters.id + project) || '/trainingPlatform');
         } else {
             next();
         }
-        // }
     }
 }
 
diff --git a/src/router/index_Common.js b/src/router/index_Common.js
index f51fea47c..6114aa638 100644
--- a/src/router/index_Common.js
+++ b/src/router/index_Common.js
@@ -7,6 +7,9 @@ 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');
 
 const Jlmap3dedit = () => import('@/views/jlmap3d/edit/jlmap3dedit');
 const Jlmap3dAssetManager = () => import('@/views/jlmap3d/jl3dassetmanager/assetmanager');
@@ -14,20 +17,15 @@ const Jlmap3d = () => import('@/views/jlmap3d/drive/jl3ddrive');
 const Jlmap3dSandbox = () => import('@/views/jlmap3d/simulation/jl3dsimulation');
 const Jlmap3dPassFlow = () => import('@/views/jlmap3d/passflow/jl3dpassflow');
 const Jlmap3dModel = () => import('@/views/jlmap3d/device/jl3ddevice');
-const Jlmap3dTrain = () => import('@/views/jlmap3d/devicetrain/jl3ddevicetrain');
 const Jlmap3dMaintainer = () => import('@/views/jlmap3d/maintainer/jl3dmaintainer');
 const Jlmap3dMaintainerVr = () => import('@/views/jlmap3d/maintainer/jl3dmaintainervr');
 const Jl3dTrainRescueVr = () => import('@/views/jlmap3d/maintainer/jl3dTrainRescueVr');
 const Jlmap3dOtherVR = () => import('@/views/jlmap3d/maintainer/jl3dothervr');
 // const Jl3dMaintainer = () => import('@/views/jlmap3d/maintainer/jl3dmaintainer');
 
-const Display = () => import('@/views/oldMap/display/index');
 const DisplayNew = () => import('@/views/newMap/displayNew/index');
-const DesignDisplay = () => import('@/views/oldMap/display/designIndex');
 const DesignDisplayNew = () => import('@/views/newMap/displayNew/scriptDisplay/scriptPreview/index');
 
-const TrainRoom = () => import('@/views/trainRoom/index');
-const JointTraining = () => import('@/views/oldMap/jointTraining/index');
 const JointTrainingNew = () => import('@/views/newMap/jointTrainingNew/index');
 
 const Errpr404 = () => import('@/views/error-page/404');
@@ -60,14 +58,11 @@ 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/oldMap');
 const LessonEdit = () => import('@/views/lesson/lessoncategory/index');
 const LessonHome = () => import('@/views/lesson/home');
 const LessonDetail = () => import('@/views/lesson/details');
 
 const ScriptmanageHome = () => import('@/views/scriptManage/home');
-const ScriptDisplay = () => import('@/views/oldMap/scriptManage/display/index');
-const PracticeDisplayNew = () => import('@/views/competitionManage/practiceList/display/index');
 
 const IbpHome = () => import('@/views/ibp/home');
 const IbpDraw = () => import('@/views/ibp/ibpDraw/index');
@@ -85,19 +80,16 @@ const ExamCourseDetail = () => import('@/views/exam/detail/courseDetail');
 const DemonstrationDetail = () => import('@/views/demonstration/detail/index');
 
 const PlanMonitorEditTool = () => import('@/views/planMonitor/editTool/index');
-const PlanMonitorEditUserTool = () => import('@/views/planMonitor/editTool/userindex');
-const PlanMonitorEditAUSTool = () => import('@/views/planMonitor/editToolAUS/index');
+const PlanMonitorEditAUSTool = () => import('@/views/planMonitor/editToolAUS/tool/index');
+const PlanMonitorEditAUSLine = () => import('@/views/planMonitor/editToolAUS/line/index');
 const PlanMonitorDetail = () => import('@/views/planMonitor/detail');
 
 const DesignPlatformHome = () => import('@/views/designPlatform/home');
 const DesignPlatform = () => import('@/views/designPlatform/index');
-const MapPreview = () => import('@/views/designPlatform/mapPreview');
 const MapPreviewNew = () => import('@/views/designPlatform/mapPreviewNew');
 const BigScreen = () => import('@/views/designPlatform/bigScreen');
 const BigSplitScreen = () => import('@/views/designPlatform/bigSplitScreen');
 
-// const DesignPlatformUser = () => import('@/views/designUser/index');
-
 const Package = () => import('@/views/package/index');
 
 const PublishMap = () => import('@/views/publish/publishMap/index');
@@ -126,28 +118,17 @@ const UserRulesDetail = () => import('@/views/orderauthor/rules/detail');
 const DeviceManage = () => import('@/views/system/deviceManage/index');
 const MapSort = () => import('@/views/publish/publishMap/mapSort');
 const StudentManage = () => import('@/views/studentManage');
-const RaceManage = () => import('@/views/competitionManage/competition/index');
 const BankManage = () => import('@/views/competitionManage/bankList/index');
 
 const Scene = () => import('@/views/drts/scene/index');
 
-// const PracticeManage = () => import('@/views/competitionManage/practiceList/index');
 const QuestionCreatePage = () => import('@/views/competitionManage/bankList/question-create-page');
 const QuestionUpdatePage = () => import('@/views/competitionManage/bankList/question-update-page');
-const GeneratePaper = () => import('@/views/competitionManage/generatePaper');
 
-const CompetitionDetail = () => import('@/views/jsxt/competition/examDetail');
-const CompetitionManage = () => import('@/views/jsxt/competition/index');
-const CompetitionHome = () => import('@/views/jsxt/competition/home');
-const Refereedetail = () => import('@/views/jsxt/competition/theory/quiz/index');
-const RefereeResult = () => import('@/views/jsxt/competition/theory/result');
-const JsxtExamResult = () => import('@/views/jsxt/competition/result');
-const JsxtApply = () => import('@/views/jsxt/apply/index');
-// const theoryManage = () => import('@/views/jsxt/competition/theory/index');
-const RefereeList = () => import('@/views/jsxt/refereeList/index');
-const RefereeDisplay = () => import('@/views/jsxt/refereeList/display');
 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');
 
 import { GenerateRouteProjectList } from '@/scripts/ProjectConfig';
 // import { getSessionStorage } from '@/utils/auth';
@@ -209,6 +190,11 @@ export const constantRoutes = [
         component: Login,
         hidden: true
     },
+    {
+        path: '/authorization',
+        component: Authorization,
+        hidden: true
+    },
     {
         path: '/design/jlmap3d/edit',
         component: Jlmap3dedit,
@@ -218,8 +204,13 @@ export const constantRoutes = [
         path: '/design/jlmap3d/assetmanager',
         component: Jlmap3dAssetManager,
         hidden: true
-	},
-	{ // 运行图编辑
+    },
+    { // 线信息
+        path: '/AUSline',
+        component: PlanMonitorEditAUSLine,
+        hidden: true
+    },
+    { // 运行图编辑
         path: '/AUStool',
         component: PlanMonitorEditAUSTool,
         hidden: true
@@ -240,11 +231,6 @@ export const constantRoutes = [
         component: Jlmap3dModel,
         hidden: true
     },
-    {
-        path: '/gzzbxy/relay/:deviceid', // 贵阳 继电器
-        component: Jlmap3dTrain,
-        hidden: true
-    },
     {
         path: '/jlmap3d/maintainer',
         component: Jlmap3dMaintainer,
@@ -269,12 +255,6 @@ export const constantRoutes = [
         hidden: true
 
     },
-
-    { // 竞赛系统报名
-        path: '/jsxtApply',
-        component: JsxtApply,
-        hidden: true
-    },
     {
         path: '/404',
         component: Errpr404,
@@ -297,11 +277,6 @@ GenerateRouteProjectList.forEach(item => {
 });
 // 公共路由不需要过滤 直接可以访问
 export const publicAsyncRoute = [
-    { // 全屏战场图
-        path: '/display/:mode',
-        component: Display,
-        hidden: true
-    },
     {
         path: '/ibpShow',
         component: IbpShow,
@@ -312,31 +287,16 @@ export const publicAsyncRoute = [
         component: DisplayNew,
         hidden: true
     },
-    {
-        path: '/design/display/:mode',
-        component: DesignDisplay,
-        hidden: true
-    },
     {
         path: '/design/displayNew/:mode',
         component: DesignDisplayNew,
         hidden: true
     },
-    { // 剧本编辑 战场图
-        path: '/scriptDisplay/:mode',
-        component: ScriptDisplay,
-        hidden: true
-    },
     { // 剧本编辑 战场图
         path: '/scriptDisplayNew/:mode',
         component: DisplayNew,
         hidden: true
     },
-    { // 实操试题编辑 战场图
-        path: '/practiceDisplayNew/:mode',
-        component: PracticeDisplayNew,
-        hidden: true
-    },
     {
         path: '/displayBigScreen/:mapId',
         component: BigScreen,
@@ -347,21 +307,6 @@ export const publicAsyncRoute = [
         component: BigSplitScreen,
         hidden: true
     },
-    { // 综合演练室
-        path: '/trainroom',
-        component: TrainRoom,
-        hidden: true
-    },
-    {
-        path: '/jointTraining',
-        component: JointTraining,
-        hidden: true
-    },
-    {
-        path: '/refereeJsxtDisplay',
-        component: RefereeDisplay,
-        hidden: true
-    },
     {
         path: '/jointTrainingNew',
         component: JointTrainingNew,
@@ -372,11 +317,6 @@ export const publicAsyncRoute = [
         component: Jlmap3d,
         hidden: true
     },
-    { // 运行图编辑
-        path: '/plan/usertool',
-        component: PlanMonitorEditUserTool,
-        hidden: true
-	},
     { // 运行图编辑
         path: '/plan/tool',
         component: PlanMonitorEditTool,
@@ -493,11 +433,6 @@ export const asyncRouter = [
                         component: Trainingmanage,
                         hidden: true
                     },
-                    {// 老地图实训管理
-                        path: 'lesson/TrainingmanageOld',
-                        component: TrainingmanageOld,
-                        hidden: true
-                    },
                     { // 创建课程
                         path: 'lesson/edit/:type',
                         component: LessonEdit,
@@ -515,12 +450,6 @@ export const asyncRouter = [
                             }
                         ]
                     },
-                    { // 地图预览
-                        path: 'mapPreview/:mapId',
-                        component: MapPreview,
-                        hidden: true
-
-                    },
                     { // 新版地图预览
                         path: 'mapPreviewNew/:mapId',
                         component: MapPreviewNew,
@@ -806,6 +735,14 @@ export const asyncRouter = [
                     i18n: 'router.companyManage'
                 }
             },
+            { // 出题规则管理
+                path: 'questionsRuleManage',
+                hidden: true,
+                component: QuestionsRuleManage,
+                meta: {
+                    i18n: 'router.questionsRuleManage'
+                }
+            },
             {
                 // 缓存管理
                 path: 'cache',
@@ -889,6 +826,28 @@ export const asyncRouter = [
                 meta: {
                     i18n: 'router.releaseApplication'
                 }
+            },
+            {// 授权码申请
+                path: 'authorApply',
+                component: AuthorApply,
+                meta: {
+                    i18n: 'router.authorApply'
+                }
+            },
+            {// 授权码列表
+                path: 'AuthorList',
+                component: AuthorList,
+                meta: {
+                    i18n: 'router.AuthorList'
+                }
+            },
+            {
+                path: 'preTheoryImport',
+                component: PreTheoryImport,
+                hidden: true,
+                meta: {
+                    i18n: 'router.preTheoryData'
+                }
             }
             // {
             //     path: 'deviceManage',
@@ -1003,14 +962,6 @@ export const asyncRouter = [
             roles: [admin]
         },
         children: [
-            {
-                path: 'manage',
-                component: RaceManage,
-                meta: {
-                    i18n: 'router.raceManage',
-                    icon: 'design'
-                }
-            },
             {
                 path: 'bank',
                 component: BankManage,
@@ -1019,14 +970,6 @@ export const asyncRouter = [
                     icon: 'design'
                 }
             },
-            // {
-            //     path: 'practice',
-            //     component: PracticeManage,
-            //     meta: {
-            //         i18n: 'router.practiceManage',
-            //         icon: 'design'
-            //     }
-            // },
             {
                 path: 'scene',
                 component: Scene,
@@ -1044,11 +987,6 @@ export const asyncRouter = [
                 path: 'questionUpdate/:questionId',
                 component: QuestionUpdatePage,
                 hidden: true
-            },
-            {
-                path: 'generate',
-                component: GeneratePaper,
-                hidden: true
             }
         ]
     }
@@ -1139,81 +1077,6 @@ export const projectRoute = {
         }
     ]
 };
-// 竞赛系统
-export const JSXT = [
-    {
-        path: '/jsxt',
-        redirect: '/jsxt/home',
-        component: Layout,
-        meta: {
-            roles: [user, admin, userTrainingPlatform]
-        },
-        hidden: true,
-        children: [
-            {
-                path: '',
-                redirect: '/jsxt/home',
-                component: CompetitionManage,
-                meta: {
-                },
-                children: [
-                    {
-                        path: 'home',
-                        component: CompetitionHome,
-                        hidden: true
-                    },
-                    // {
-                    //     path: 'theory/:id',
-                    //     component: theoryManage,
-                    //     hidden: true
-                    // },
-                    {
-                        path: 'examDetail',
-                        component: CompetitionDetail,
-                        hidden: true
-                    },
-                    { // 考试结果
-                        path: 'result',
-                        component: JsxtExamResult,
-                        hidden: true
-                    }
-                ]
-            }
-        ]
-    },
-    {
-        path: '/jsxt/theory/detail',
-        component: Refereedetail,
-        hidden: true
-    },
-    {
-        path: '/jsxt/theory/result', // 考试结果页面
-        component: RefereeResult,
-        hidden: true
-    },
-    // 裁判系统
-    {
-        path: '/refereeJsxt',
-        redirect: '/refereeJsxt/home',
-        component: Layout,
-        meta: {
-            i18n: 'router.homeJsxt',
-            roles: [user, admin]
-        },
-        hidden: true,
-        children: [
-            {
-                path: 'home',
-                component: RefereeList,
-                meta: {
-                    i18n: 'router.refereeJManage',
-                    icon: 'design',
-                    hidden: true
-                }
-            }
-        ]
-    }
-];
 const createRouter = () => new Router({
     base: '/cbtc/',
     mode: 'history', // require service support
diff --git a/src/router/index_HEB.js b/src/router/index_HEB.js
index a4c818396..ccbe0c245 100644
--- a/src/router/index_HEB.js
+++ b/src/router/index_HEB.js
@@ -14,13 +14,8 @@ const Jlmap3d = () => import('@/views/jlmap3d/drive/jl3ddrive');
 const Jlmap3dSandbox = () => import('@/views/jlmap3d/simulation/jl3dsimulation');
 const Jlmap3dModel = () => import('@/views/jlmap3d/device/jl3ddevice');
 const Jlmap3dPassFlow = () => import('@/views/jlmap3d/passflow/jl3dpassflow');
-const Jlmap3dTrain = () => import('@/views/jlmap3d/devicetrain/jl3ddevicetrain');
-const Display = () => import('@/views/oldMap/display/index');
 const DisplayNew = () => import('@/views/newMap/displayNew/index');
-const DesignDisplay = () => import('@/views/oldMap/display/designIndex');
 
-const TrainRoom = () => import('@/views/trainRoom/index');
-const JointTraining = () => import('@/views/oldMap/jointTraining/index');
 const JointTrainingNew = () => import('@/views/newMap/jointTrainingNew/index');
 
 const Errpr404 = () => import('@/views/error-page/404');
@@ -53,7 +48,6 @@ const BigScreen = () => import('@/views/designPlatform/bigScreen');
 const BigSplitScreen = () => import('@/views/designPlatform/bigSplitScreen');
 
 const ScriptmanageHome = () => import('@/views/scriptManage/home');
-const ScriptDisplay = () => import('@/views/oldMap/scriptManage/display/index');
 
 const IbpHome = () => import('@/views/ibp/home');
 const IbpDraw = () => import('@/views/ibp/ibpDraw/index');
@@ -75,7 +69,6 @@ const PlanMonitorDetail = () => import('@/views/planMonitor/detail');
 
 const DesignPlatformHome = () => import('@/views/designPlatform/home');
 const DesignPlatform = () => import('@/views/designPlatform/index');
-const MapPreview = () => import('@/views/designPlatform/mapPreview');
 const MapPreviewNew = () => import('@/views/designPlatform/mapPreviewNew');
 
 const Package = () => import('@/views/package/index');
@@ -190,11 +183,6 @@ export const constantRoutes = [
         component: Jlmap3dPassFlow,
         hidden: true
     },
-    {
-        path: '/jlmap3d/devicetrain',
-        component: Jlmap3dTrain,
-        hidden: true
-    },
     {
         path: '/404',
         component: Errpr404,
@@ -204,42 +192,16 @@ export const constantRoutes = [
 ];
 // 公共路由不需要过滤 直接可以访问
 export const publicAsyncRoute = [
-    { // 全屏战场图
-        path: '/display/:mode',
-        component: Display,
-        hidden: true
-    },
     {
         path: '/displayNew/:mode',
         component: DisplayNew,
         hidden: true
     },
-    {
-        path: '/design/display/:mode',
-        component: DesignDisplay,
-        hidden: true
-    },
-    { // 剧本编辑 战场图
-        path: '/scriptDisplay/:mode',
-        component: ScriptDisplay,
-        hidden: true
-    },
     { // 剧本编辑 战场图
         path: '/scriptDisplayNew/:mode',
         component: DisplayNew,
         hidden: true
     },
-
-    { // 综合演练室
-        path: '/trainroom',
-        component: TrainRoom,
-        hidden: true
-    },
-    {
-        path: '/jointTraining',
-        component: JointTraining,
-        hidden: true
-    },
     {
         path: '/jointTrainingNew',
         component: JointTrainingNew,
@@ -392,11 +354,6 @@ export const asyncRouter = [
                             }
                         ]
                     },
-                    { // 地图预览
-                        path: 'mapPreview/:mapId',
-                        component: MapPreview,
-                        hidden: true
-                    },
                     { // 新版地图预览
                         path: 'mapPreviewNew/:mapId',
                         component: MapPreviewNew,
diff --git a/src/scripts/ConstConfig.js b/src/scripts/ConstConfig.js
index 5d3f54a54..97e7798bc 100644
--- a/src/scripts/ConstConfig.js
+++ b/src/scripts/ConstConfig.js
@@ -95,9 +95,9 @@ export default {
             {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: 'ELECTRIC_DISPATCHER', enLabel: 'Electric dispatcher'},
             {label: '行调', value: 'DISPATCHER', enLabel: 'Dispatcher '},
-            {label: '上级部门', value: 'PARENT_DEPARTMENT', enLabel: 'Parent_department'}
+            {label: '上级部门', value: 'PARENT_DEPARTMENT', enLabel: 'Parent department'}
 
         ],
         SimulationType: [
@@ -185,7 +185,10 @@ export default {
 
         QuestionTypeList: [
             { label: '选择题', value: 'select' },
-            { label: '判断题', value: 'judge' }
+            { label: '判断题', value: 'judge' },
+            { label: '多选题', value: 'multi'},
+            { label: '填空题', value: 'fill'},
+            { label: '问答题', value: 'answer'}
         ],
         // 新版的产品类型枚举
         prdType:[
@@ -238,7 +241,8 @@ export default {
             {label: 'PLC网关', value: 'PLC_GATEWAY'},
             {label: '端头控制盒', value: 'PSL'},
             {label: 'PSC控制柜', value: 'PSC'},
-            {label: '虚拟电子沙盘', value: 'SANDBOX'}
+            {label: '虚拟电子沙盘', value: 'SANDBOX'},
+            {label: '联锁工作站', value: 'ILW'}
         ]
     }
 };
diff --git a/src/scripts/ConstDic.js b/src/scripts/ConstDic.js
index 2157159e1..f234c7cf1 100644
--- a/src/scripts/ConstDic.js
+++ b/src/scripts/ConstDic.js
@@ -118,6 +118,7 @@ export const DeviceMenu = {
     AxleReset: '12',
     Enabled: '13',
     StationTurnBack: '14',
+    Power:'15',
 
     Map: '100',
     PrdCategory: '101',
@@ -128,10 +129,7 @@ export const DeviceMenu = {
     SetDriver: '106',
     Script: '107',
     IscsSystem: '108',
-	IscsInterface: '109',
-
-	planJustArrival: '200',
-	planJustDeparture: '201'
+    IscsInterface: '109'
 };
 
 /**
@@ -2282,7 +2280,6 @@ export const UrlConfig = {
         scriptHome: '/design/script/home',
         display: '/design/display',
         displayNew: '/design/displayNew',
-        mapPreview: '/design/mapPreview',
         mapPreviewNew: '/design/mapPreviewNew',
         ibpHome: '/design/ibp/home'
     },
diff --git a/src/scripts/ProjectConfig.js b/src/scripts/ProjectConfig.js
index 3ffaf9b17..b2ee27436 100644
--- a/src/scripts/ProjectConfig.js
+++ b/src/scripts/ProjectConfig.js
@@ -12,6 +12,7 @@ import FaviconTky from '@/assets/icon/favicon_tky.png';
 import FaviconBxkc from '@/assets/icon/favicon_bxkc.png';
 import FaviconCrsc from '@/assets/icon/favicon_crsc.png';
 import FaviconNty from '@/assets/icon/favicon_nty.png';
+import FaviconBjd from '@/assets/icon/favicon_bjd.png';
 import Link_Bxkc from '@/assets/icon/link_bxkc.png';
 import Link_Crsc from '@/assets/icon/link_crsc.png';
 import Link_Hls from '@/assets/icon/link_hls.png';
@@ -29,6 +30,19 @@ export const loginInfo = {
         navigationMarginLeft: '60px',
         systemType: '013'
     },
+    bjd: {
+        title: '城市轨道交通列车运行智慧辅助系统',
+        loginPath: '/login?project=bjd',
+        logoWidth: '400px',
+        bottomIcon: FaviconBjd,
+        bottomColumn: '',
+        loginTitle: '空串',
+        linkIcon: FaviconBjd,
+        loginParam: 'BJD',
+        navigationLogoWidth: '160px',
+        navigationMarginLeft: '175px',
+        systemType: '011'
+    },
     nty: {
         title: '南京铁道职业技术学院城市轨道交通实训平台',
         loginPath:'/login?project=nty',
@@ -72,6 +86,18 @@ export const loginInfo = {
         navigationMarginLeft: '60px',
         systemType: '020'
     },
+    designbjd: {
+        title: '城市轨道交通列车运行智慧辅助系统',
+        loginPath: '/design/login?project=bjd',
+        logoWidth: '400px',
+        bottomIcon: FaviconBjd,
+        bottomColumn: '',
+        linkIcon: '',
+        loginParam: 'BJD',
+        navigationLogoWidth: '160px',
+        navigationMarginLeft: '175px',
+        systemType: '011'
+    },
     designxty: {
         title: '西安铁路职业技术学院城市轨道交通设计平台',
         loginPath:'/design/login?project=xty',
@@ -352,7 +378,9 @@ export const ProjectIcon = {
     drts: Favicon,
     designdrts: Favicon,
     nty: FaviconNty,
-    designnty: FaviconNty
+    designnty: FaviconNty,
+    bjd: FaviconBjd,
+    designbjd: FaviconBjd
 };
 
 export const ProjectCode = {
@@ -375,7 +403,7 @@ export const CaseHideProjectList = ['heb', 'designheb']; // 案例展示隐藏
 export const VersionBaseNoShow = ['heb', 'designheb', 'hls', 'designhls', 'drts', 'hyd', 'designhyd']; // 登录页右下角版本开发基于不展示
 export const MainBodyNoShow = ['heb', 'designheb', 'jyd', 'designjyd', 'tky', 'designtky', 'bxkc', 'designbxkc', 'crsc', 'designcrsc', 'hls', 'designhls', 'hyd', 'designhyd']; // 登录页右下角主体不展示
 export const GenerateRouteProjectList = ['jsxt', 'refereeJsxt'];// 需要在公共路由中生成登录页面的项目
-export const ProjectLoginStyleList = ['jsxt', 'refereeJsxt', 'gzb', 'designgzb', 'xty', 'designxty', 'xadt', 'designxadt', 'tky', 'designtky', 'jyd', 'designjyd', 'bxkc', 'designbxkc', 'crsc', 'designcrsc', 'hls', 'designhls', 'drts', 'hyd', 'designhyd', 'nty', 'designnty']; // 登录页样式
+export const ProjectLoginStyleList = ['jsxt', 'refereeJsxt', 'gzb', 'designgzb', 'xty', 'designxty', 'xadt', 'designxadt', 'tky', 'designtky', 'jyd', 'designjyd', 'bxkc', 'designbxkc', 'crsc', 'designcrsc', 'hls', 'designhls', 'drts', 'hyd', 'designhyd', 'nty', 'designnty', 'bjd', 'designbjd']; // 登录页样式
 export const NoQrcodeList = ['heb', 'designheb'];
 export const goOtherPlatformMenu = { // 导航栏快速切换平台
     login: '/design/login',
diff --git a/src/scripts/cmdPlugin/CommandEnum.js b/src/scripts/cmdPlugin/CommandEnum.js
index 588e35baa..332779ef3 100644
--- a/src/scripts/cmdPlugin/CommandEnum.js
+++ b/src/scripts/cmdPlugin/CommandEnum.js
@@ -145,7 +145,9 @@ export default {
         /** 详情 */
         CMD_SECTION_DETAILS: {value: 'Section_Details', label: '属性'},
         /** 新建计划列车 */
-        CMD_Train_Init_Plan: {value: 'Train_Init_Plan', label: '新建计划列车'}
+        CMD_Train_Init_Plan: {value: 'Train_Init_Plan', label: '新建计划列车'},
+        /** 加载备用车 */
+        CMD_TRAIN_LOAD_SPARE_TRAIN: {value: 'Train_Load_Spare_Train', label: '加载备用车'}
     },
 
     // 站台
@@ -181,7 +183,9 @@ export default {
         /** 查看站台状态 */
         CMD_STAND_VIEW_STATUS:{value:'Stand_View_Status', label: '查看站台状态'},
         /** 站台总取消 */
-        CMD_STAND_TOTAL_CANCLE:{value:'Stand_Total_Cancle', label: '站台总取消'}
+        CMD_STAND_TOTAL_CANCLE:{value:'Stand_Total_Cancle', label: '站台总取消'},
+        /** 手动开启屏蔽门 */
+        CMD_STAND_OPEN_PSD:{value:'Stand_Open_Psd', label: '手动开启屏蔽门'}
     },
 
     Station: {
diff --git a/src/scripts/cmdPlugin/CommandHandler.js b/src/scripts/cmdPlugin/CommandHandler.js
index 1f63049da..7627c62dc 100644
--- a/src/scripts/cmdPlugin/CommandHandler.js
+++ b/src/scripts/cmdPlugin/CommandHandler.js
@@ -25,6 +25,13 @@ class CommandHandle {
                     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: []
                 }
             }
         };
diff --git a/src/scripts/cmdPlugin/Config.js b/src/scripts/cmdPlugin/Config.js
index 5e2394321..f12e408d1 100644
--- a/src/scripts/cmdPlugin/Config.js
+++ b/src/scripts/cmdPlugin/Config.js
@@ -36,16 +36,22 @@ export const deviceFaultType = {
         {label: '主灯丝熔断故障', value: 'MAIN_FILAMENT_BROKEN'}
     ],
     Switch: [
-        {label: '失表', value: 'SPLIT'}
+        {label: '失表', value: 'SPLIT'},
+        {label: '定位失表', value: 'NORMAL_SPLIT'},
+        {label: '反位失表', value: 'REVERSE_SPLIT'}
     ],
     StationStand: [
-        {label: '屏蔽门故障打开', value: 'FAULT_PSD_OPEN'}
+        {label: '屏蔽门无法关闭', value: 'PSD_CANNOT_BE_CLOSED'},
+        {label: '屏蔽门无法开启', value: 'PSD_CANNOT_BE_OPENED'}
     ],
     ZcControl:[
         {label: 'zc故障', value: 'FAULT'}
     ],
     Train: [
         {label: '通信异常', value: 'COMMUNICATION_ABNORMAL'}
+    ],
+    Power:[
+        {label: '供电故障', value: 'FAULT'}
     ]
 };
 /** 设备类型 */
@@ -56,5 +62,6 @@ export const deviceType = {
     Station: '车站',
     StationStand: '站台',
     Train: '列车',
-    ZcControl:'ZC'
+    ZcControl:'ZC',
+    Power:'供电线'
 };
diff --git a/src/scripts/cmdPlugin/Handler.js b/src/scripts/cmdPlugin/Handler.js
index c60ae96b7..8ccb9b347 100644
--- a/src/scripts/cmdPlugin/Handler.js
+++ b/src/scripts/cmdPlugin/Handler.js
@@ -99,18 +99,12 @@ class Handler {
             if (operation.cmdType && valid) {
                 const command = this.getCommand(operation);
                 if (command) {
-                    // 判断当前是否是剧本 添加动作指令操作
-                    // if (store.state.scriptRecord.isScriptCommand && store.state.scriptRecord.bgSet ) {
-                    //     store.dispatch('scriptRecord/updateScriptCommand', {operationId:command.id, cmdType:operation.cmdType, param:command.get()});
-                    //     resolve(rtn);
-                    // } else {
                     CommandHandler.execute(command.id, command.get()).then(response => {
                         rtn.response = response;
                         resolve(rtn);
                     }).catch(error => {
                         reject(error);
                     });
-                    // }
                 } else {
                     rtn.response = '获取指令失败，暂无指令或参数传值不正确，请检查指令字典';
                     reject(rtn);
@@ -147,7 +141,7 @@ class Handler {
     }
 
     getTrainingStart() {
-        return store.state.training.started;
+        return store.state.training.trainingStart;
     }
 
     getOperateBreakStatus () {
diff --git a/src/scripts/cmdPlugin/MenuContextHandler.js b/src/scripts/cmdPlugin/MenuContextHandler.js
index 7a4ea8fd4..832e83584 100644
--- a/src/scripts/cmdPlugin/MenuContextHandler.js
+++ b/src/scripts/cmdPlugin/MenuContextHandler.js
@@ -42,15 +42,15 @@ class MenuContextHandler {
             data.conditionList.forEach(val=>{
                 switch (val.expression) {
                 case 'eq': {
-                    result = result || (selected[val.name].toString() == val.value);
+                    result = result || ((selected[val.name] || 0).toString() == val.value);
                     break;
                 }
                 case 'neq': {
-                    result = result || (selected[val.name].toString() != val.value);
+                    result = result || ((selected[val.name] || 0).toString() != val.value);
                     break;
                 }
                 default: {
-                    result = result || (selected[val.name].toString() == val.value);
+                    result = result || ((selected[val.name] || 0).toString() == val.value);
                     break;
                 }
                 }
@@ -64,8 +64,7 @@ class MenuContextHandler {
         const selected = this.getCurrentStateObject();
         let menu = [];
         const control = this.getStationControl(selected);
-        // (!store.state.scriptRecord.bgSet || store.state.scriptRecord.isScriptCommand)
-        if (control) {
+        if (control && !store.state.scriptRecord.audioPlay) {
             if (this.getPrdType() != '' && this.getPrdType() != null) {
                 const type = State2SimulationMap[this.getPrdType()];
                 const status = State2ControlMap[control.controlMode]; // 判断当前模式
diff --git a/src/scripts/cmdPlugin/OperationHandler.js b/src/scripts/cmdPlugin/OperationHandler.js
index 5bd7011eb..a063c08e8 100644
--- a/src/scripts/cmdPlugin/OperationHandler.js
+++ b/src/scripts/cmdPlugin/OperationHandler.js
@@ -1464,6 +1464,12 @@ export const OperationEvent = {
                 operation: '414',
                 domId: '_Tips-Section-Confirm-Limit-Menu'
             }
+        },
+        loadSpareTrain: {
+            menu: {
+                operation: '415',
+                domId: '_Tips-Section-Load-Spare-Train'
+            }
         }
     },
 
@@ -1760,6 +1766,13 @@ export const OperationEvent = {
                 operation: '518',
                 domId: '_Tips-Stand-cancelDetainTrainAuto-Menu'
             }
+        },
+        // 手动开启屏蔽门
+        openPsdByHand:{
+            menu: {
+                operation: '519',
+                domId: '_Tips-Stand-openPsdByHand-Menu'
+            }
         }
     },
 
diff --git a/src/scripts/cmdPlugin/ValidateHandler.js b/src/scripts/cmdPlugin/ValidateHandler.js
index 3f8b771a9..02be8563d 100644
--- a/src/scripts/cmdPlugin/ValidateHandler.js
+++ b/src/scripts/cmdPlugin/ValidateHandler.js
@@ -31,7 +31,6 @@ class ValidateHandler {
         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 &&
diff --git a/src/store/index_Common.js b/src/store/index_Common.js
index dc1b2f8b5..e5553b3e4 100644
--- a/src/store/index_Common.js
+++ b/src/store/index_Common.js
@@ -17,6 +17,7 @@ import ibp from './modules/ibp';
 import order from './modules/order';
 import iscs from './modules/iscs';
 import rpTools from './modules/rpTools';
+import race from './modules/race';
 
 import getters from './getters';
 
@@ -39,8 +40,9 @@ const store = new Vuex.Store({
         scriptRecord,
         ibp,
         order,
-		iscs,
-		rpTools
+        iscs,
+        rpTools,
+        race
     },
     getters
 });
diff --git a/src/store/index_HEB.js b/src/store/index_HEB.js
index 295be5d36..dbaf695f1 100644
--- a/src/store/index_HEB.js
+++ b/src/store/index_HEB.js
@@ -16,6 +16,7 @@ import scriptRecord from './modules/scriptRecord';
 import ibp from './modules/ibp';
 import order from './modules/order';
 import iscs from './modules/iscs';
+import race from './modules/race';
 
 import getters from './getters';
 
@@ -38,7 +39,8 @@ const store = new Vuex.Store({
         scriptRecord,
         ibp,
         order,
-        iscs
+        iscs,
+        race
     },
     getters
 });
diff --git a/src/store/modules/config.js b/src/store/modules/config.js
index 39c3ba599..ff8bbc856 100644
--- a/src/store/modules/config.js
+++ b/src/store/modules/config.js
@@ -11,8 +11,7 @@ const config = {
         canvasSizeCount: 0, 									// 地图canvas 大小变更标识
         canvasId: '', 											// 地图canvas容器dom id
         canvasOffset: {}, 										// canvas dom 偏移
-        canvasOffsetCount: 0, 									// 地图canvas 偏移变更标识
-        switchMap: 'old' 										// 新旧版本地图开关
+        canvasOffsetCount: 0 									// 地图canvas 偏移变更标识
     },
 
     getters: {
@@ -43,9 +42,6 @@ const config = {
         setCanvasOffset: (state, offset) => {
             state.canvasOffset = offset;
         },
-        changeSwitchMap: (state, swtichMap) => {
-            state.switchMap = swtichMap;
-        },
         setMaskOpen: (state, flag) => {
             state.maskOpen = flag;
         }
@@ -78,9 +74,6 @@ const config = {
                 state.canvasOffsetCount += 1;
             }
         },
-        changeSwitchMap: ({ commit, state}, switchMap) => {
-            commit('changeSwitchMap', switchMap);
-        },
         setMaskOpen: ({ commit }, flag) => {
             commit('setMaskOpen', flag);
         }
diff --git a/src/store/modules/exam.js b/src/store/modules/exam.js
index 989b6197c..7663d4895 100644
--- a/src/store/modules/exam.js
+++ b/src/store/modules/exam.js
@@ -9,7 +9,7 @@ const exam = {
         usedTime: 0, 		// 考试当前所用时间
         totalTime: 0, 		// 考试总时间
         timeInterval: null, // 计时器
-        suspend: false, 	// 暂停
+        // suspend: false, 	// 暂停
         ruleList: [],		// 考试规则列表
         courseDetail: {},	// 课程详情
         courseList: []		// 课程列表
@@ -23,18 +23,18 @@ const exam = {
         },
         totalTime: (state) => {
             return state.totalTime;
-        },
-        suspend: (state) => {
-            return state.suspend;
         }
+        // suspend: (state) => {
+        //     return state.suspend;
+        // }
     },
     mutations: {
         setStarted: (state, started) => {
             state.started = started;
         },
-        setSuspend: (state, suspend) => {
-            state.suspend = suspend;
-        },
+        // setSuspend: (state, suspend) => {
+        //     state.suspend = suspend;
+        // },
         setUsedTime: (state, usedTime) => {
             state.usedTime = usedTime;
         },
@@ -74,15 +74,9 @@ const exam = {
     actions: {
         start({ commit }) {
             commit('setStarted', true);
-            // commit('setSuspend', false);
-            // commit('setUsedTime', 0);
-            // commit('countUsedTime');
         },
         over({ commit }) {
             commit('setStarted', false);
-            // commit('setSuspend', true);
-            // commit('setUsedTime', 0);
-            // commit('stopCountTime');
         },
         isOver() {
             const trainingList = store.getters['trainingList/trainingList'];
@@ -94,9 +88,9 @@ const exam = {
                 return true;
             }
         },
-        setSuspend({ commit }, suspend) {
-            commit('setSuspend', suspend);
-        },
+        // setSuspend({ commit }, suspend) {
+        //     commit('setSuspend', suspend);
+        // },
         setUsedTime({ commit }, usedTime) {
             commit('setUsedTime', usedTime || 0);
         },
diff --git a/src/store/modules/ibp.js b/src/store/modules/ibp.js
index d626b5d05..9c0c50d56 100644
--- a/src/store/modules/ibp.js
+++ b/src/store/modules/ibp.js
@@ -8,34 +8,31 @@ const ibp = {
 
     state: {
         ibp: null, 				// 数据
-        ibpDevice: {},			// 解析后的地图数据
-        ibpList: {}, 			// 数据列表
-        ibpIdList: {},			// 数据列表(以id为标识)
         updateDeviceData: {}, // 修改的数据
         rightClickCount: 0, // 右键点击设备
         ibpBgDevice: {} // ibp背景设备
     },
 
     getters: {
-        ibpList: (state) => {
-            return state.ibpList;
-        },
+        // ibpList: (state) => {
+        //     return state.ibpList;
+        // },
         ibp: (state) => {
             return state.ibp;
         },
-        version: (state) => {
-            if (state.ibp) {
-                return state.ibp.version;
-            } else {
-                return null;
-            }
-        },
+        // version: (state) => {
+        //     if (state.ibp) {
+        //         return state.ibp.version;
+        //     } else {
+        //         return null;
+        //     }
+        // },
         updateDeviceData: (state) => {
             return state.updateDeviceData;
-        },
-        ibpBgDevice: (state) => {
-            return state.ibpBgDevice;
         }
+        // ibpBgDevice: (state) => {
+        //     return state.ibpBgDevice;
+        // }
     },
 
     mutations: {
diff --git a/src/store/modules/iscs.js b/src/store/modules/iscs.js
index 23ddb0316..b26e74f82 100644
--- a/src/store/modules/iscs.js
+++ b/src/store/modules/iscs.js
@@ -7,29 +7,34 @@ const iscs = {
 
     state: {
         iscs: null, 				// 数据
-        iscsDevice: {},			// 解析后的地图数据
-        iscsList: {}, 			// 数据列表
-        iscsIdList: {},			// 数据列表(以id为标识)
         updateDeviceData: {}, // 修改的数据
         rightClickCount: 0, // 右键点击设备
         selected: '', // 左键选中设备
-        selectedCount: 0 // 左键选中
+        selectedCount: 0, // 左键选中
+        incidentList: [], // 事件列表
+        alarmList: [] // 报警列表
     },
 
     getters: {
-        iscsList: (state) => {
-            return state.iscsList;
+        incidentList: (state) => {
+            return state.incidentList;
         },
+        alarmList: (state) => {
+            return state.alarmList;
+        },
+        // iscsList: (state) => {
+        //     return state.iscsList;
+        // },
         iscs: (state) => {
             return state.iscs;
         },
-        version: (state) => {
-            if (state.iscs) {
-                return state.iscs.version;
-            } else {
-                return null;
-            }
-        },
+        // version: (state) => {
+        //     if (state.iscs) {
+        //         return state.iscs.version;
+        //     } else {
+        //         return null;
+        //     }
+        // },
         updateDeviceData: (state) => {
             return state.updateDeviceData;
         },
@@ -39,107 +44,107 @@ const iscs = {
             } else {
                 return [];
             }
-        },
-        vidiconList: (state) => {
-            if (state.iscs) {
-                return state.iscs.vidiconList;
-            } else {
-                return [];
-            }
-        },
-        vidiconCloudList: (state) => {
-            if (state.iscs.vidiconCloudList) {
-                return state.iscs.vidiconCloudList;
-            } else {
-                return [];
-            }
-        },
-        frozenPumpList:(state)=>{
-            if (state.iscs.frozenPumpList) {
-                return state.iscs.frozenPumpList;
-            } else {
-                return [];
-            }
-        },
-        airConditionerList:(state)=>{
-            if (state.iscs.airConditionerList) {
-                return state.iscs.airConditionerList;
-            } else {
-                return [];
-            }
-        },
-        tunnelFanList:(state)=>{
-            if (state.iscs.tunnelFanList) {
-                return state.iscs.tunnelFanList;
-            } else {
-                return [];
-            }
-        },
-        orbitalVentilatorList:(state)=>{
-            if (state.iscs.orbitalVentilatorList) {
-                return state.iscs.orbitalVentilatorList;
-            } else {
-                return [];
-            }
-        },
-        smookProofFdList:(state)=>{
-            if (state.iscs.smookProofFdList) {
-                return state.iscs.smookProofFdList;
-            } else {
-                return [];
-            }
-        },
-        chillerList:(state)=>{
-            if (state.iscs.chillerList) {
-                return state.iscs.chillerList;
-            } else {
-                return [];
-            }
-        },
-        coolTowerList:(state)=>{
-            if (state.iscs.coolTowerList) {
-                return state.iscs.coolTowerList;
-            } else {
-                return [];
-            }
-        },
-        fireDamperList:(state)=>{
-            if (state.iscs.fireDamperList) {
-                return state.iscs.fireDamperList;
-            } else {
-                return [];
-            }
-        },
-        jetFanList:(state)=>{
-            if (state.iscs.jetFanList) {
-                return state.iscs.jetFanList;
-            } else {
-                return [];
-            }
-        },
-        ventilatorList:(state)=>{
-            if (state.iscs.ventilatorList) {
-                return state.iscs.ventilatorList;
-            } else {
-                return [];
-            }
-        },
-        arcStatusList:(state)=>{
-            if (state.iscs.arcStatusList) {
-                return state.iscs.arcStatusList;
-            } else {
-                return [];
-            }
-        },
-        selected: (state) => {
-            return state.selected;
-        },
-        selectedCount: (state) => {
-            return state.selectedCount;
-        },
-        getDeviceByCode: (state) => (code) => {
-            return state.iscsDevice[code];
         }
+        // vidiconList: (state) => {
+        //     if (state.iscs) {
+        //         return state.iscs.vidiconList;
+        //     } else {
+        //         return [];
+        //     }
+        // },
+        // vidiconCloudList: (state) => {
+        //     if (state.iscs.vidiconCloudList) {
+        //         return state.iscs.vidiconCloudList;
+        //     } else {
+        //         return [];
+        //     }
+        // },
+        // frozenPumpList:(state)=>{
+        //     if (state.iscs.frozenPumpList) {
+        //         return state.iscs.frozenPumpList;
+        //     } else {
+        //         return [];
+        //     }
+        // },
+        // airConditionerList:(state)=>{
+        //     if (state.iscs.airConditionerList) {
+        //         return state.iscs.airConditionerList;
+        //     } else {
+        //         return [];
+        //     }
+        // },
+        // tunnelFanList:(state)=>{
+        //     if (state.iscs.tunnelFanList) {
+        //         return state.iscs.tunnelFanList;
+        //     } else {
+        //         return [];
+        //     }
+        // },
+        // orbitalVentilatorList:(state)=>{
+        //     if (state.iscs.orbitalVentilatorList) {
+        //         return state.iscs.orbitalVentilatorList;
+        //     } else {
+        //         return [];
+        //     }
+        // },
+        // smookProofFdList:(state)=>{
+        //     if (state.iscs.smookProofFdList) {
+        //         return state.iscs.smookProofFdList;
+        //     } else {
+        //         return [];
+        //     }
+        // },
+        // chillerList:(state)=>{
+        //     if (state.iscs.chillerList) {
+        //         return state.iscs.chillerList;
+        //     } else {
+        //         return [];
+        //     }
+        // },
+        // coolTowerList:(state)=>{
+        //     if (state.iscs.coolTowerList) {
+        //         return state.iscs.coolTowerList;
+        //     } else {
+        //         return [];
+        //     }
+        // },
+        // fireDamperList:(state)=>{
+        //     if (state.iscs.fireDamperList) {
+        //         return state.iscs.fireDamperList;
+        //     } else {
+        //         return [];
+        //     }
+        // },
+        // jetFanList:(state)=>{
+        //     if (state.iscs.jetFanList) {
+        //         return state.iscs.jetFanList;
+        //     } else {
+        //         return [];
+        //     }
+        // },
+        // ventilatorList:(state)=>{
+        //     if (state.iscs.ventilatorList) {
+        //         return state.iscs.ventilatorList;
+        //     } else {
+        //         return [];
+        //     }
+        // },
+        // arcStatusList:(state)=>{
+        //     if (state.iscs.arcStatusList) {
+        //         return state.iscs.arcStatusList;
+        //     } else {
+        //         return [];
+        //     }
+        // },
+        // selected: (state) => {
+        //     return state.selected;
+        // },
+        // selectedCount: (state) => {
+        //     return state.selectedCount;
+        // },
+        // getDeviceByCode: (state) => (code) => {
+        //     return state.iscsDevice[code];
+        // }
     },
 
     mutations: {
@@ -159,6 +164,15 @@ const iscs = {
         setSelectedDevice: (state, device) => {
             state.selected = device;
             state.selectedCount++;
+        },
+        setAddAlarmList: (state, device) => {
+            state.alarmList.unshift(device);
+        },
+        setDelIncidentList: (state) => {
+            state.alarmList = [];
+        },
+        setAddIncidentList: (state, device) => {
+            state.incidentList.unshift(device);
         }
     },
 
@@ -187,6 +201,15 @@ const iscs = {
         },
         setSelectedDevice: ( { commit }, device) => {
             commit('setSelectedDevice', device);
+        },
+        setAddAlarmList: ( { commit }, device) => {
+            commit('setAddAlarmList', device);
+        },
+        setAddIncidentList: ( { commit }, device) => {
+            commit('setAddIncidentList', device);
+        },
+        setDelIncidentList: ( { commit }) => {
+            commit('setDelIncidentList');
         }
     }
 };
diff --git a/src/store/modules/map.js b/src/store/modules/map.js
index 80caf8496..1da1932c6 100644
--- a/src/store/modules/map.js
+++ b/src/store/modules/map.js
@@ -1,5 +1,4 @@
-import deviceType from '@/jmap/constant/deviceType';
-// import { parser, updateMapData } from '@/jmap/utils/parser';
+import deviceType from '@/jmapNew/constant/deviceType';
 import { parser, updateMapData } from '@/jmapNew/utils/parser';
 import Vue from 'vue';
 import { deepAssign } from '@/utils/index';
@@ -237,15 +236,15 @@ const map = {
         holdStatus: false, // 是否有扣车状态
         jumpStandList: [], // 跳停站台列表
         jumpStatus: false, // 是否有跳停状态
-        selectDeviceFlag: false, // 设备管理激活判断
+        // selectDeviceFlag: false, // 设备管理激活判断
         keyboardEnterCount: 0, // 键盘enter键触发
         controlTransfer:[] // 控制权转移消息
     },
 
     getters: {
-        mapList: (state) => {
-            return state.mapList;
-        },
+        // mapList: (state) => {
+        //     return state.mapList;
+        // },
         trainWindowSectionCode: (state) => {
             return state.trainWindowSectionCode;
         },
@@ -258,13 +257,13 @@ const map = {
         routeData: (state) => {
             return state.routeData;
         },
-        routeStartSignalData: (state) => {
-            if (state.map) {
-                return state.map.routeStartSignalData || {};
-            } else {
-                return {};
-            }
-        },
+        // routeStartSignalData: (state) => {
+        //     if (state.map) {
+        //         return state.map.routeStartSignalData || {};
+        //     } else {
+        //         return {};
+        //     }
+        // },
         overlapData: (state) => {
             return state.overlapData;
         },
@@ -274,12 +273,12 @@ const map = {
         autoReentryList: (state) => {
             return state.autoReentryList;
         },
-        signalApproachSectionData: (state) => {
-            return state.signalApproachSectionData;
-        },
-        signalApproachSectionList: (state) => {
-            return state.signalApproachSectionList;
-        },
+        // signalApproachSectionData: (state) => {
+        //     return state.signalApproachSectionData;
+        // },
+        // signalApproachSectionList: (state) => {
+        //     return state.signalApproachSectionList;
+        // },
         seclectDeviceList: (state) => {
             return state.seclectDeviceList;
         },
@@ -318,20 +317,20 @@ const map = {
                 return null;
             }
         },
-        version: (state) => {
-            if (state.map) {
-                return state.version;
-            } else {
-                return null;
-            }
-        },
-        linkList: (state) => {
-            if (state.map) {
-                return state.map.linkList;
-            } else {
-                return [];
-            }
-        },
+        // version: (state) => {
+        //     if (state.map) {
+        //         return state.version;
+        //     } else {
+        //         return null;
+        //     }
+        // },
+        // linkList: (state) => {
+        //     if (state.map) {
+        //         return state.map.linkList;
+        //     } else {
+        //         return [];
+        //     }
+        // },
         switchList: (state) => {
             if (state.map) {
                 return state.map.switchList;
@@ -346,13 +345,13 @@ const map = {
                 return [];
             }
         },
-        buttonList: (state) => {
-            if (state.map) {
-                return state.map.buttonList;
-            } else {
-                return [];
-            }
-        },
+        // buttonList: (state) => {
+        //     if (state.map) {
+        //         return state.map.buttonList;
+        //     } else {
+        //         return [];
+        //     }
+        // },
         signalList: (state) => {
             if (state.map) {
                 return state.map.signalList;
@@ -549,15 +548,15 @@ const map = {
                 return [];
             }
         },
-        trainDetails: (state) => {
-            return state.trainDetails;
-        },
+        // trainDetails: (state) => {
+        //     return state.trainDetails;
+        // },
         flankProtectList: (state) => {
             return state.flankProtectList;
         },
-        mapDevice: (state) => {
-            return state.mapDevice;
-        },
+        // mapDevice: (state) => {
+        //     return state.mapDevice;
+        // },
         getDeviceByCode: (state) => (code) => {
             return state.mapDevice[code];
         },
@@ -596,21 +595,21 @@ const map = {
             return device;
         },
 
-        // 查询所属车站关联的控制模式
-        getStationControlByStationCode: (state) => (code) => {
-            let device = null;
-            if (code &&
-                state.map &&
-                state.map.stationControlList && state.map.stationControlList.length) {
-                state.map.stationControlList.forEach(elem => {
-                    if (elem.stationCode == code) {
-                        device = state.mapDevice[elem.code];
-                    }
-                });
-            }
+        // // 查询所属车站关联的控制模式
+        // getStationControlByStationCode: (state) => (code) => {
+        //     let device = null;
+        //     if (code &&
+        //         state.map &&
+        //         state.map.stationControlList && state.map.stationControlList.length) {
+        //         state.map.stationControlList.forEach(elem => {
+        //             if (elem.stationCode == code) {
+        //                 device = state.mapDevice[elem.code];
+        //             }
+        //         });
+        //     }
 
-            return device;
-        },
+        //     return device;
+        // },
 
         // 查询所属车站的控制模式
         getDeviceStationCodeByStationCode: (state) => (code) => {
@@ -654,6 +653,7 @@ const map = {
     },
 
     mutations: {
+        // 设置地图数据
         setMapData: (state, map) => {
             if (map && map.skinVO) {
                 state.map = map;
@@ -673,12 +673,15 @@ const map = {
                 state.mapDevice[elem.code] = deepAssign(state.mapDevice[elem.code] || {}, elem);
             });
         },
+        // 设置地图所属线路
         setMapConfig: (state, config) => {
             state.mapConfig = config;
         },
+        // 获取包围框选中元素列表
         setSeclectDeviceList: (state, list) => {
             state.seclectDeviceList = list;
         },
+        // 设置缩放位置
         setDataZoom: (state, dataZoom) => {
             state.dataZoom = dataZoom;
         },
@@ -784,6 +787,7 @@ const map = {
         setMousemove: (state) => {
             state.mousemove++;
         },
+        // 设置进路数据
         setRouteData: (state, routeDataList) => {
             state.routeData = {};
             state.routeStartSignalData = {};
@@ -795,7 +799,7 @@ const map = {
                     state.routeStartSignalData[data.startSignalCode] = [data];
                 }
             });
-            state.map.automaticRouteButtonList && state.map.automaticRouteButtonList.forEach(item => {
+            state.map && state.map.automaticRouteButtonList && state.map.automaticRouteButtonList.forEach(item => {
                 state.routeData[item.automaticRouteCode].automaticRouteCode = item.code;
             });
             state.routeList = routeDataList;
@@ -812,7 +816,7 @@ const map = {
             autoReentryList.forEach(data => {
                 state.autoReentryData[data.code] = data;
             });
-            state.map.cycleButtonList && state.map.cycleButtonList.forEach(item => {
+            state.map && state.map.cycleButtonList && state.map.cycleButtonList.forEach(item => {
                 state.autoReentryData[item.cycleCode].cycleButtonCode = item.code;
             });
             state.autoReentryList = autoReentryList;
@@ -830,11 +834,6 @@ const map = {
         updateAutoReentryState: (state, status) => {
             state.autoReentryData[status.code] = deepAssign(state.autoReentryData[status.code], status);
         },
-        // updateTrainState:(state, status) =>{
-        //     if (state.map.trainList) {
-        //         state.map.trainList[parseInt(status.code) - 1] = deepAssign(state.map.trainList[parseInt(status.code) - 1] || {}, status);
-        //     }
-        // },
         updateStationStand: (state, status) => {
             const holdIndex = state.holdStandList.indexOf(status.code);
             const jumpIndex = state.jumpStandList.indexOf(status.code);
@@ -870,6 +869,7 @@ const map = {
                 }
             });
         },
+        // 更新激活的列车信息
         updateActiveTrainList: (state, data)=>{
             let isExist = false;
             state.activeTrainList.forEach(elem => {
@@ -899,31 +899,12 @@ const map = {
     },
 
     actions: {
-        mapClear: ({ commit }) => {
+        setMapData:({ commit }, mapData) => {
+            commit('setMapData', mapData);
+        },
+        mapClear:({ commit }) => {
             commit('mapClear');
         },
-        // 获取包围框选中元素列表
-        setSeclectDeviceList: ({ commit }, list) => {
-            commit('setSeclectDeviceList', list);
-        },
-
-        // 设置缩放位置
-        updateZoom: ({ commit }, dataZoom) => {
-            commit('setDataZoom', dataZoom);
-        },
-
-        setMapData: ({ commit }, map) => { // 设置地图数据
-            commit('setMapData', map);
-        },
-        updateMapDevice: ({ commit }, list) => {
-            commit('updateMapDevice', list);
-        },
-        setMapConfig: ({ commit }, config) => { // 设置地图所属线路
-            commit('setMapConfig', config);
-        },
-        setRouteData: ({ commit }, routeData) => { // 设置进路数据
-            commit('setRouteData', routeData);
-        },
         setOverlapData: ({ commit }, overlapData) => {
             commit('setOverlapData', overlapData);
             commit('mapRender', overlapData);
@@ -940,9 +921,6 @@ const map = {
         updateAutoReentryState: ({ commit }, status) => {
             commit('updateAutoReentryState', status);
         },
-        // updateTrainState:({ commit }, status) => {
-        //     commit('updateTrainState', status);
-        // },
         updateStationStand: ({ commit }, status) => {
             commit('updateStationStand', status);
         },
@@ -970,11 +948,6 @@ const map = {
             }
         },
 
-        // 更新激活的列车信息
-        updateActiveTrainList:({ commit }, train) => {
-            commit('updateActiveTrainList', train);
-        },
-
         setMapDataIdList: ({ state }, data) => {
             state.mapIdList[`mapDate_${data.mapId}`] = data.mapData;
         },
diff --git a/src/store/modules/order.js b/src/store/modules/order.js
index b85a0ddf6..640e400ab 100644
--- a/src/store/modules/order.js
+++ b/src/store/modules/order.js
@@ -7,9 +7,9 @@ const order = {
         orderList: [] // 选中的商品列表,
     },
     getters: {
-        orderList: (state)=>{
-            return state.orderList;
-        }
+        // orderList: (state)=>{
+        //     return state.orderList;
+        // }
     },
     mutations: {
         setOrderList: (state, orderList) => {
diff --git a/src/store/modules/race.js b/src/store/modules/race.js
new file mode 100644
index 000000000..9282cb5dd
--- /dev/null
+++ b/src/store/modules/race.js
@@ -0,0 +1,29 @@
+/**
+ * 竞赛状态数据
+ */
+const race = {
+    namespaced: true,
+    state: {
+        preTheoryData: [] // 导入的理论预保存数据
+    },
+    getters: {
+        preTheoryData: (state)=> {
+            return state.preTheoryData;
+        }
+    },
+    mutations: {
+    },
+    actions: {
+        /**
+		 * 设置导入的理论预保存数据
+		 */
+        setPreTheoryData: ({ state, commit }, preTheoryData) => {
+            // commit('setPreTheoryData', preTheoryData);
+            return new Promise(resolve => {
+                state.preTheoryData = preTheoryData;
+                resolve();
+            });
+        }
+    }
+};
+export default race;
diff --git a/src/store/modules/rpTools.js b/src/store/modules/rpTools.js
index 5bc5d1af8..63267e92b 100644
--- a/src/store/modules/rpTools.js
+++ b/src/store/modules/rpTools.js
@@ -3,23 +3,26 @@ const runPlan = {
 
     state: {
         stations: [],			// 车站列表
-        planData: {},			// 运行图原始数据
+        planData: [],			// 运行图原始数据
         editData: {},			// 运行图编辑数据
         planSizeCount: 0,		// 运行图canvas 大小变更标识
         planLoadedCount: 0,		// 运行图数据更新
         planUpdateCount: 0,		// 运行图更新标识
         selected: {},			// 选择的对象
-		refreshCount: 0,		// 刷新页面重新加载
-		width: 800, 			// 运行图canvas 容器 宽度
-        height: 600, 			// 运行图canvas 容器 高度
+        refreshCount: 0,		// 刷新页面重新加载
+        width: 800, 			// 运行图canvas 容器 宽度
+        height: 600 			// 运行图canvas 容器 高度
     },
     getters: {
         stations: (state) => {
             return state.stations || [];
+        },
+        planData: (state) => {
+            return state.planData || [];
         }
     },
     mutations: {
-		setWidth: (state, width) => {
+        setWidth: (state, width) => {
             state.width = width;
             state.planSizeCount += 1;
         },
@@ -48,6 +51,10 @@ const runPlan = {
         }
     },
     actions: {
+        /** 更新数据*/
+        updateRunPlanData: ({ commit }, data) => {
+            commit('updateRunPlanData', data);
+        },
         /** 设置运行图大小*/
         resize({ commit }, opt) {
             if (opt.width) {
@@ -57,32 +64,6 @@ const runPlan = {
                 commit('setHeight', opt.height);
             }
         },
-        /** 设置stations数据 */
-        setStations: ({ commit }, mapModel) => {
-            return new Promise((resolve) => {
-                commit('setStations', mapModel);
-                resolve(mapModel);
-            });
-        },
-        /** 设置运行图数据 */
-        setPlanData: ({ commit }, data) => {
-            commit('setPlanData', data);
-        },
-        /** 选择车次*/
-        setSelected: ({ commit }, selected) => {
-            commit('setSelected', selected);
-        },
-        /** 更新数据*/
-        updateRunPlanData: ({ commit }, data) => {
-            commit('updateRunPlanData', data);
-        },
-        /** 清空数据*/
-        clear: ({ commit }) => {
-            return new Promise((resolve) => {
-                commit('clear');
-                resolve();
-            });
-        },
         /** 刷新页面*/
         refresh: ({commit}) => {
             commit('refresh');
diff --git a/src/store/modules/runplan.js b/src/store/modules/runplan.js
index dac6639d2..32fd26060 100644
--- a/src/store/modules/runplan.js
+++ b/src/store/modules/runplan.js
@@ -77,7 +77,8 @@ const runPlan = {
                     const trainList = service.tripNumberDataList;
                     state.initialPlanData[service.serviceNumber] = { oldIndex: i, serviceNumber: service.serviceNumber, backup: service.backup, trainMap: {} };
                     trainList.forEach((train, j) => {
-                        state.initialPlanData[service.serviceNumber].trainMap[`${train.directionCode}${train.tripNumber}`] = { oldIndex: j, tripNumber: train.tripNumber, directionCode: train.directionCode, reentry: train.reentry, stationTimeList: train.stationTimeList };
+                        // ${train.directionCode}
+                        state.initialPlanData[service.serviceNumber].trainMap[`${train.tripNumber}`] = { oldIndex: j, tripNumber: train.tripNumber, directionCode: train.directionCode, reentry: train.reentry, stationTimeList: train.stationTimeList };
                     });
                 });
             }
@@ -91,7 +92,8 @@ const runPlan = {
                     const trainList = service.tripNumberDataList;
                     state.editData[service.serviceNumber] = { oldIndex: i, serviceNumber: service.serviceNumber, backup: service.backup, trainMap: {} };
                     trainList.forEach((train, j) => {
-                        state.editData[service.serviceNumber].trainMap[`${train.directionCode}${train.tripNumber}`] = { oldIndex: j, tripNumber: train.tripNumber, directionCode: train.directionCode, reentry: train.reentry, stationTimeList: train.stationTimeList };
+                        // ${train.directionCode}
+                        state.editData[service.serviceNumber].trainMap[`${train.tripNumber}`] = { oldIndex: j, tripNumber: train.tripNumber, directionCode: train.directionCode, reentry: train.reentry, stationTimeList: train.stationTimeList };
                     });
                 });
             }
@@ -106,7 +108,8 @@ const runPlan = {
                     const trainList = service.tripNumberDataList;
                     state.draftEditData[service.serviceNumber] = { oldIndex: i, serviceNumber: service.serviceNumber, backup: service.backup, trainMap: {} };
                     trainList.forEach((train, j) => {
-                        state.draftEditData[service.serviceNumber].trainMap[`${train.directionCode}${train.tripNumber}`] = { oldIndex: j, tripNumber: train.tripNumber, directionCode: train.directionCode, reentry: train.reentry, stationTimeList: train.stationTimeList };
+                        // ${train.directionCode}
+                        state.draftEditData[service.serviceNumber].trainMap[`${train.tripNumber}`] = { oldIndex: j, tripNumber: train.tripNumber, directionCode: train.directionCode, reentry: train.reentry, stationTimeList: train.stationTimeList };
                     });
                 });
             }
diff --git a/src/store/modules/scriptRecord.js b/src/store/modules/scriptRecord.js
index e9fa3e90d..2d2cb9c77 100644
--- a/src/store/modules/scriptRecord.js
+++ b/src/store/modules/scriptRecord.js
@@ -6,15 +6,12 @@ const scriptRecord = {
     state: {
         mapLocation: {}, // 地图定位,
         simulationPause: true, // 剧本 暂停判断
-        scriptId: '',
         bgSet: false,
-        isScriptCommand:false,	// 当前是否为添加剧本动作指令状态
-        scriptCommand:{}, // 剧本动作添加的指令
         updateRoleStatus:0, // 剧本更新角色标志
         updateRoleId:'', // 剧本更新角色id
         updateCoversitionStatus:0, // 剧本仿真更新会话信息
         userRole:null, // 剧本更新的角色
-        operationalItemVOs:{} //   剧本场景的运营统计数据缓存
+        audioPlay:false // 语音是否自动播放
     },
     getters: {
         mapLocation: (state)=>{
@@ -23,18 +20,9 @@ const scriptRecord = {
         simulationPause: (state)=>{
             return state.simulationPause;
         },
-        scriptId: (state)=>{
-            return state.scriptId;
-        },
         bgSet: (state)=>{
             return state.bgSet;
         },
-        isScriptCommand:(state)=>{
-            return state.isScriptCommand;
-        },
-        scriptCommand:(state)=>{
-            return state.scriptCommand;
-        },
         updateRoleStatus:(state)=>{
             return state.updateRoleStatus;
         }
@@ -46,18 +34,9 @@ const scriptRecord = {
         setSimulationPause: (state, simulationPause) => {
             state.simulationPause = simulationPause;
         },
-        setscriptId: (state, scriptId) => {
-            state.scriptId = scriptId;
-        },
         setBgSet: (state, bgSet) => {
             state.bgSet = bgSet;
         },
-        setIsScriptCommand:(state, isScriptCommand) => {
-            state.isScriptCommand = isScriptCommand;
-        },
-        setScriptCommand:(state, scriptCommand) => {
-            state.scriptCommand = scriptCommand;
-        },
         updateRole:(state, userRole) => {
             if (userRole) {
                 const userRoleParam = userRole.split(':');
@@ -74,8 +53,8 @@ const scriptRecord = {
         updateCoversitionInfo:(state) => {
             state.updateCoversitionStatus += 1;
         },
-        updateOperationalItemVOs:(state, operationalItemVOs) => {
-            state.operationalItemVOs = operationalItemVOs;
+        setAudioPlay:(state, audioPlay) => {
+            state.audioPlay = audioPlay;
         }
     },
     actions: {
@@ -88,26 +67,17 @@ const scriptRecord = {
         updateSimulationPause: ({ commit }, simulationPause) => {
             commit('setSimulationPause', simulationPause);
         },
-        updateScriptId: ({ commit }, scriptId) => {
-            commit('setscriptId', scriptId);
-        },
         updateBgSet: ({ commit }, bgSet) => {
             commit('setBgSet', bgSet);
         },
-        updateIsScriptCommand:({ commit }, isScriptCommand) => {
-            commit('setIsScriptCommand', isScriptCommand);
-        },
-        updateScriptCommand:({ commit }, scriptCommand) => {
-            commit('setScriptCommand', scriptCommand);
-        },
         updateRole:({ commit }, userRole) => {
             commit('updateRole', userRole);
         },
         updateCoversitionInfo:({ commit }) => {
             commit('updateCoversitionInfo');
         },
-        updateOperationalItemVOs:({ commit }, operationalItemVOs) => {
-            commit('updateOperationalItemVOs', operationalItemVOs);
+        updateAudioPlay:({ commit }, audioPlay) => {
+            commit('setAudioPlay', audioPlay);
         }
     }
 };
diff --git a/src/store/modules/settings.js b/src/store/modules/settings.js
index d3fea1a27..5c49ad70f 100644
--- a/src/store/modules/settings.js
+++ b/src/store/modules/settings.js
@@ -3,29 +3,29 @@ import defaultSettings from '@/settings';
 const { showSettings, fixedHeader, sidebarLogo } = defaultSettings;
 
 const state = {
-	showSettings: showSettings,
-	fixedHeader: fixedHeader,
-	sidebarLogo: sidebarLogo
+    showSettings: showSettings,
+    fixedHeader: fixedHeader,
+    sidebarLogo: sidebarLogo
 };
 
 const mutations = {
-	CHANGE_SETTING: (state, { key, value }) => {
-		if (state.hasOwnProperty(key)) {
-			state[key] = value;
-		}
-	}
+    CHANGE_SETTING: (state, { key, value }) => {
+        if (state.hasOwnProperty(key)) {
+            state[key] = value;
+        }
+    }
 };
 
 const actions = {
-	changeSetting({ commit }, data) {
-		commit('CHANGE_SETTING', data);
-	}
+    changeSetting({ commit }, data) {
+        commit('CHANGE_SETTING', data);
+    }
 };
 
 export default {
-	namespaced: true,
-	state,
-	mutations,
-	actions
+    namespaced: true,
+    state,
+    mutations,
+    actions
 };
 
diff --git a/src/store/modules/socket.js b/src/store/modules/socket.js
index f40fc82c7..b659b9c13 100644
--- a/src/store/modules/socket.js
+++ b/src/store/modules/socket.js
@@ -138,6 +138,9 @@ function handle(state, data) {
     case 'Simulation_Competition_Practice_Finish':
         state.competitionPracticeFinish++;
         break;
+    case 'Simulation_Alarm':
+        state.simulationAlarmInfo = msg;
+        break;
     }
 
 }
@@ -240,7 +243,6 @@ const socket = {
         simulationStart: '',	// 仿真-开始消息
         simulationOver:0, // 退出仿真推送消息
         simulationReset: 0, // 仿真-异常消息
-        // coversitionList:{}, // 历史仿真-用户消息列表
         inviteSimulationConversition: {}, // 仿真会话邀请消息
         acceptConversionInvite:{}, // 仿真会话成员接收邀请
         createConversition:{}, // 仿真创建会话
@@ -264,7 +266,6 @@ const socket = {
 
         roomIsSubscribe:false, // 房间是否订阅
         assistantIsSubscribe:false, // 综合演练仿真聊天是否订阅
-        isInRoom:false, // 是否己经进入房间
 
         tipOperateCount: 0, // 任务结束提示消息
         realDeviceInfo: 0, // 真实设备信息
@@ -274,7 +275,8 @@ const socket = {
         roomInvite: {},
         simulationTimeSync: '', // 仿真时间
         simulationIbpStatus: null,
-        competitionPracticeFinish:0 //  竞赛场景结束标识
+        competitionPracticeFinish:0, //  竞赛场景结束标识
+        simulationAlarmInfo:  []// 仿真报警信息
     },
     getters: {
     },
@@ -330,9 +332,6 @@ const socket = {
         },
         setAssistantSubscribe:(state, assistantIsSubscribe)=>{
             state.assistantIsSubscribe = assistantIsSubscribe;
-        },
-        setInRoom:(state, isInRoom)=>{
-            state.isInRoom = isInRoom;
         }
     },
 
@@ -394,9 +393,6 @@ const socket = {
         },
         setAssistantSubscribe:({ commit }, msg) => {
             commit('setAssistantSubscribe', msg);
-        },
-        setInRoom:({ commit }, msg) => {
-            commit('setInRoom', msg);
         }
     }
 };
diff --git a/src/store/modules/training.js b/src/store/modules/training.js
index 3863cb8fa..6695eb570 100644
--- a/src/store/modules/training.js
+++ b/src/store/modules/training.js
@@ -1,7 +1,7 @@
 import Vue from 'vue';
 import { TrainingMode } from '@/scripts/ConstDic';
 import OperateHandler from '@/scripts/plugin/OperateHandler';
-import deviceType from '../../jmap/constant/deviceType';
+import deviceType from '../../jmapNew/constant/deviceType';
 import LangStorage from '@/utils/lang';
 import Handler from '@/scripts/cmdPlugin/Handler';
 import { deepAssign } from '@/utils/index';
@@ -35,7 +35,6 @@ const training = {
         prdType: '', 				// 产品类型
         roles: '', 					// 角色权限类型
         roleDeviceCode:'', // 当前角色对应的deviceCode
-        group: '',					// 设置全局 group
         centerStationCode:'', // 当前居中的集中站code
         memberList: [], 			// 综合仿真成员列表
         memberData: {}, 			// 综合仿真成员列表
@@ -44,7 +43,8 @@ const training = {
         scriptQuitCount: 0, // 主动退出剧本
         scriptOperationType: '', // 剧本操作类型
         triggerFaultCount: 0, // 触发故障计数器
-        triggerFaultDevice: '' // 触发故障目标设备
+        triggerFaultDevice: '', // 触发故障目标设备
+        trainingStart: false // 实训开始状态
     },
 
     getters: {
@@ -54,9 +54,6 @@ const training = {
         order: (state) => {
             return state.order;
         },
-        offsetStationCode: (state) => {
-            return state.offsetStationCode;
-        },
         basicInfo: (state) => {
             return state.basicInfo;
         },
@@ -75,24 +72,9 @@ const training = {
         usedTime: (state) => {
             return state.usedTime;
         },
-        tipEvent: (state) => {
-            return state.tipEvent;
-        },
-        initTime: (state) => {
-            return state.initTime;
-        },
-        prdType: (state) => {
-            return state.prdType;
-        },
-        roles: (state) => {
-            return state.roles;
-        },
         memberList: (state) => {
             return state.memberList;
         },
-        simulationUserList: (state) => {
-            return state.simulationUserList;
-        },
         // 视图中的列车列表
         viewTrainList: (state) => () =>{
             const trainList = [];
@@ -104,21 +86,6 @@ const training = {
             });
 
             return trainList;
-        },
-        commonMenuStep: (state) => {
-            return state.commonMenuStep;
-        },
-        scriptQuitCount: (state) => {
-            return state.scriptQuitCount;
-        },
-        scriptOperationType: (state) => {
-            return state.scriptOperationType;
-        },
-        triggerFaultCount: (state) => {
-            return state.triggerFaultCount;
-        },
-        triggerFaultDevice: (state) => {
-            return state.triggerFaultDevice;
         }
     },
 
@@ -225,9 +192,6 @@ const training = {
         setRoles: (state, roles) => {
             state.roles = roles;
         },
-        setGroup: (state, group) => {
-            state.group = group;
-        },
         notifyGetCommandDefinition: (state, lineCode) => {
             Handler.notify(lineCode);
         },
@@ -316,6 +280,9 @@ const training = {
         setTriggerFaultCount: (state, device) => {
             state.triggerFaultCount++;
             state.triggerFaultDevice = device;
+        },
+        setTrainingStart: (state, flag) => {
+            state.trainingStart = flag;
         }
     },
 
@@ -351,7 +318,6 @@ const training = {
          */
         reset: ({ commit }) => {
             commit('over');
-            commit('resetOrder');
             // commit('stopCountTime');
 
             // 清空计时器以及得分
@@ -375,13 +341,20 @@ const training = {
             commit('resetScore');
             commit('start');
         },
-
+        // setTrainingStart:({ commit }) ={
+        // 	commit('setTrainingStart');
+        // },
+        setTrainingStart: ({ commit }, flag) => {
+            commit('setTrainingStart', flag);
+            if (!flag) {
+                commit('resetOrder');
+            }
+        },
         /**
          * 结束
          */
         over: ({ commit }) => {
             commit('over');
-            commit('resetOrder');
             // commit('stopCountTime');
         },
 
@@ -405,7 +378,7 @@ const training = {
 		 * 主动判断是否结束
 		 */
         judgeFinish: ({ dispatch, commit, state }, rtn) => {
-            if (state.started) {
+            if (state.trainingStart) {
                 if (state.order >= state.steps.length) {
                     if (rtn && rtn.valid) {
                         commit('next');
@@ -507,7 +480,7 @@ const training = {
                 try {
                     // 处理operation
                     Handler.handle(operate).then(rtn => {
-                        if (state.started) {
+                        if (state.trainingStart) {
                             // 教学和联系模式需要给出过程步骤提示
                             if (TrainingMode.TEACH === state.mode || TrainingMode.PRACTICE === state.mode) {
                                 if (rtn && rtn.valid) {
@@ -676,13 +649,6 @@ const training = {
             commit('tipEventIncrement');
         },
 
-        /**
-		 * 设置WebSocket链接状态
-		 */
-        setConnected: ({ commit }, isConnected) => {
-            commit('setConnected', isConnected);
-        },
-
         /**
 		 * 设置系统时间
 		 */
@@ -704,13 +670,6 @@ const training = {
             commit('setRoles', roles);
         },
 
-        /**
-		 * 设置仿真组
-		 */
-        setGroup: ({ commit }, group) => {
-            commit('setGroup', group);
-        },
-
         /** 设置当前居中的集中站code */
         setCenterStationCode:({ commit }, centerStationCode) => {
             commit('setCenterStationCode', centerStationCode);
diff --git a/src/store/modules/trainingList.js b/src/store/modules/trainingList.js
index ce4ba205c..c60755e11 100644
--- a/src/store/modules/trainingList.js
+++ b/src/store/modules/trainingList.js
@@ -8,23 +8,23 @@ const trainingList = {
     getters: {
         trainingList: (state) => {
             return state.trainingList;
-        },
-        prevTraining: (state) => () => {
-            if (state.trainingList && state.trainingList.length > 0) {
-                state.index = state.index - 1;
-                if (state.index >= 0) {
-                    return state.trainingList[state.index];
-                }
-            }
-        },
-        nextTraining: (state) => () => {
-            if (state.trainingList && state.trainingList.length > 0) {
-                state.index = state.index + 1;
-                if (state.index < state.trainingList.length) {
-                    return state.trainingList[state.index];
-                }
-            }
         }
+        // prevTraining: (state) => () => {
+        //     if (state.trainingList && state.trainingList.length > 0) {
+        //         state.index = state.index - 1;
+        //         if (state.index >= 0) {
+        //             return state.trainingList[state.index];
+        //         }
+        //     }
+        // },
+        // nextTraining: (state) => () => {
+        //     if (state.trainingList && state.trainingList.length > 0) {
+        //         state.index = state.index + 1;
+        //         if (state.index < state.trainingList.length) {
+        //             return state.trainingList[state.index];
+        //         }
+        //     }
+        // }
     },
     mutations: {
         setIndex: (state, index) => {
@@ -39,20 +39,6 @@ const trainingList = {
         }
     },
     actions: {
-        setIndex({ commit }, index) {
-            commit('setIndex', index);
-        },
-        setIndexByTrainingObj({ commit, state }, trainingId) {
-            let index = 0;
-            if (state.trainingList && state.trainingList.length) {
-                state.trainingList.forEach((elem, i) => {
-                    if (elem.id === trainingId) {
-                        index = i;
-                    }
-                });
-            }
-            commit('setIndex', index);
-        },
         setTrainingList({ commit }, trainingList) {
             commit('setTrainingList', trainingList);
         },
diff --git a/src/utils/baseUrl.js b/src/utils/baseUrl.js
index 524befeac..408bf264a 100644
--- a/src/utils/baseUrl.js
+++ b/src/utils/baseUrl.js
@@ -3,10 +3,10 @@ export function getBaseUrl() {
     if (process.env.NODE_ENV === 'development') {
         // BASE_API = 'https://joylink.club/jlcloud';
         BASE_API = 'https://test.joylink.club/jlcloud';
-        // BASE_API = 'http://192.168.3.5:9000'; // 袁琪
-        // BASE_API = 'http://192.168.3.6:9000'; // 旭强
+        // BASE_API = 'http://192.168.8.107:9000'; // 袁琪
+        // BASE_API = 'http://192.168.8.144:9000'; // 旭强
         // BASE_API = 'http://192.168.3.175:9000'; // 张赛
-        // BASE_API = 'http://192.168.3.82:9000'; // 杜康
+        // BASE_API = 'http://192.168.8.110:9000'; // 杜康
         // BASE_API = 'http://b29z135112.zicp.vip';
         // BASE_API = 'http://2925963m2a.zicp.vip'; // 杜康
         // BASE_API = 'http://2i38984j47.qicp.vip'; // 张赛
diff --git a/src/utils/date.js b/src/utils/date.js
index ad7cbd3d6..f81c3632b 100644
--- a/src/utils/date.js
+++ b/src/utils/date.js
@@ -16,8 +16,8 @@ export function now() {
     return year + '-' + month + '-' + day + ' ' + hour + ':' + minute + ':' + second;
 }
 
-export function timeFormat(usedTime) {
-    let hour = 0; let minute = 0; let second = 0; let sumTime = usedTime;
+export function timeFormat(usedTime=0) {
+	let hour = 0; let minute = 0; let second = 0; let sumTime = usedTime;
     if (sumTime) {
         if (sumTime >= 3600) {
             hour = Math.floor(sumTime / 3600) % 24;
@@ -37,8 +37,8 @@ export function timeFormat(usedTime) {
 
 // 时分秒转为时间戳
 
-export function toTimeStamp(time) {
-    let s = 0;
+export function toTimeStamp(time='') {
+	let s = 0;
     const hour = time.split(':')[0];
     const min = time.split(':')[1];
     const sec = time.split(':')[2];
diff --git a/src/utils/loaddata.js b/src/utils/loaddata.js
index 1f60d4daa..31242e9c8 100644
--- a/src/utils/loaddata.js
+++ b/src/utils/loaddata.js
@@ -1,6 +1,6 @@
 import store from '@/store/index_APP_TARGET';
-import { getPublishMapVersionById, getPublishMapDetailById} from '@/api/jmap/map';
-import { getNewMapDataByGroup, getNewMapDataByMapId } from '@/api/simulation';
+import { getPublishMapVersionById, getPublishMapDetailById, getNewMapDataByMapId} from '@/api/jmap/map';
+import { getNewMapDataByGroup } from '@/api/simulation';
 
 // 获取地图版本数据，和store里面的map版本做比较，如果不同
 // 获取发布的地图数据
@@ -39,7 +39,7 @@ export function loadMapDataById(mapId) {
 export function loadNewMapDataByMapId(mapId) {
     return new Promise((resolve, reject) => {
         getNewMapDataByMapId(mapId).then(resp => {
-            covertData(resp, resolve);
+            covertData(resp, 'mapId', resolve);
         }).catch(error => {
             reject(error);
         });
@@ -49,23 +49,31 @@ export function loadNewMapDataByMapId(mapId) {
 export function loadNewMapDataByGroup(group) {
     return new Promise((resolve, reject) => {
         getNewMapDataByGroup(group).then(resp => {
-            covertData(resp, resolve);
+            covertData(resp, 'Group', resolve);
         }).catch(error => {
             reject(error);
         });
     });
 }
 
-export function covertData(resp, resolve) {
+export function covertData(resp, type, resolve) {
     resp.data.graphDataNew && resp.data.graphDataNew.trainList && resp.data.graphDataNew.trainList.forEach(item => {
         item.code = item.groupNumber;
     });
     const mapData = resp.data.graphDataNew;
-    store.dispatch('map/setMapData', mapData).then(() => {
-        store.dispatch('map/clearJlmapTrainView').then(() => {
+    mapData.signalApproachSectionList = resp.data.logicDataNew.signalApproachSectionList;
+    if (type == 'Group') {
+        store.dispatch('map/setMapData', mapData).then(() => {
+            store.dispatch('map/clearJlmapTrainView').then(() => {
+                resolve();
+            });
+        });
+    } else if (type == 'mapId') {
+        store.dispatch('map/setMapData', mapData).then(() => {
             resolve();
         });
-    });
+    }
+
     const routeData = resp.data.logicDataNew.routeList; // 设置进路数据
     const overlapData = resp.data.logicDataNew.overlapList;
     const autoReentryData = resp.data.logicDataNew.autoReentryList; // 自动折返数据
@@ -73,12 +81,12 @@ export function covertData(resp, resolve) {
     overlapData.forEach(item => {
         item._type = 'OverAp';
     });
-    store.dispatch('map/setRouteData', routeData);
+    store.commit('map/setRouteData', routeData);
     store.dispatch('map/setOverlapData', overlapData);
     store.dispatch('map/setAutoReentryData', autoReentryData);
     store.dispatch('map/setSignalApproachSectionData', signalApproachSectionData);
     const mapConfig = resp.data.configVO;
-    store.dispatch('map/setMapConfig', mapConfig);
+    store.commit('map/setMapConfig', mapConfig);
     store.dispatch('map/setMapVersion', resp.data.version);
 }
 
diff --git a/src/utils/mapList.js b/src/utils/mapList.js
index 2053f1cba..bff8520f9 100644
--- a/src/utils/mapList.js
+++ b/src/utils/mapList.js
@@ -2,13 +2,13 @@ import { getSessionStorage } from '@/utils/auth';
 import { listPublishMap, getMapListByProjectCode } from '@/api/jmap/map';
 import { ProjectCode } from '@/scripts/ProjectConfig';
 
-export async function getMapListByProject(drawWay) {
+export async function getMapListByProject() {
     const project = getSessionStorage('project');
     let mapList = [];
     if (project.endsWith('xty') || project.endsWith('gzb')) {
         mapList = await getMapListByProjectCode(ProjectCode[project]);
     } else {
-        mapList = await listPublishMap({ 'drawWay': drawWay });
+        mapList = await listPublishMap({ 'drawWay': true });
     }
     return mapList;
 }
diff --git a/src/utils/request.js b/src/utils/request.js
index 0b109b4b7..08b9ab4e1 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -8,6 +8,7 @@ import { getBaseUrl } from '@/utils/baseUrl';
 import { EventBus } from '@/scripts/event-bus';
 import ConstConfig from '@/scripts/ConstConfig';
 import Vue from 'vue';
+import router from '../router/index_APP_TARGET';
 
 const BASE_API = getBaseUrl();
 
@@ -43,6 +44,10 @@ service.interceptors.response.use(
         /** code为非200是抛错 可结合自己业务进行修改*/
         const res = response.data;
         if (res.code != 200) {
+            // 90005 无授权 90001 授权过期
+            if (res.code == 90005 || res.code == 90001) {
+                router.push({ path: `/authorization` });
+            }
             // 50008:非法的token; 50012:其他客户端登录了;  50014:Token 过期了;
             if (res.code == 40004 || res.code == 40005 || res.code == 40003) {
                 // eslint-disable-next-line no-undef
diff --git a/src/views/authorization/apply.vue b/src/views/authorization/apply.vue
new file mode 100644
index 000000000..a4f35f370
--- /dev/null
+++ b/src/views/authorization/apply.vue
@@ -0,0 +1,178 @@
+<template>
+  <div class="card-box">
+    <div class="joylink-card forms">
+      <div style="height: 100%; padding-top: 40px; overflow-y: auto; position: relative;">
+        <el-form ref="form" :model="messageModel" :rules="rules" label-width="200px">
+          <el-form-item label="结束日期:" prop="overTime">
+            <el-date-picker
+              v-model="messageModel.overTime"
+              type="datetime"
+              placeholder="选择日期"
+              style="width: 450px"
+            />
+          </el-form-item>
+          <el-form-item label="名称:" prop="name">
+            <el-input v-model="messageModel.name" style="width: 450px" />
+          </el-form-item>
+          <el-form-item label="秘钥:" prop="secretKey">
+            <el-input v-model="messageModel.secretKey" style="width: 450px" />
+          </el-form-item>
+        </el-form>
+        <!-- <div v-if="license" style="padding-left: 100px;margin-top: 20px;">
+          <span style="font-size: 20px;">授权码:</span>
+          <span style="font-size: 26px;">{{ license }}</span>
+        </div> -->
+      </div>
+    </div>
+    <div class="draft">
+      <el-button type="primary" @click="pushNotification">申请授权码</el-button>
+    </div>
+  </div>
+</template>
+
+<script>
+import { postLicense } from '@/api/pushMessage';
+
+export default {
+    name: 'News',
+    data() {
+        return {
+            typeList: [],
+            // license: '',
+            messageModel: {
+                name: '',
+                overTime: '', // 结束日期
+                secretKey: '' // 秘钥
+            },
+            rules: {
+                name: [
+                    { required: true, message: '请输入名称', trigger: 'blur'}
+                ],
+                overTime: [
+                    { required: true, message: '请选择日期', trigger: 'change'}
+                ],
+                secretKey: [
+                    { required: true, message: '请输入随机字符串', trigger: 'blur'}
+                ]
+            }
+        };
+    },
+    mounted() {
+    },
+    methods: {
+        filterTime(time) {
+            const date = new Date(time);
+            const dateTime = this.dateFormat('YYYY-mm-dd HH:MM:SS', date);
+            return dateTime;
+        },
+        pushNotification() {
+            this.$refs['form'].validate((valid) => {
+                if (valid) {
+                    const param = {
+                        name: this.messageModel.name,
+                        overTime: this.filterTime(this.messageModel.overTime), // 结束日期
+                        secretKey: this.messageModel.secretKey // 秘钥
+                    };
+                    postLicense(param).then(resp => {
+                        this.$message.success('申请成功!');
+                        this.$refs.form.resetFields();
+                        // this.license = 'few1246r234fds2132f';
+                    }).catch(() => {
+                        this.$messageBox('申请失败!');
+                    });
+                } else {
+                    return false;
+                }
+            });
+        },
+        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>
+    @import "src/styles/mixin.scss";
+
+    .card-box {
+        padding-top: 20px;
+        height: 100%;
+        margin: 0 auto;
+    }
+
+    .steps {
+        width: 980px;
+        margin: 0 auto;
+
+        /deep/ {
+            .el-step__icon.is-icon {
+                width: 95px;
+            }
+        }
+    }
+
+    .online_box {
+        position: absolute;
+        left: 20px;
+        top: 18px;
+    }
+
+    .forms {
+        width: 800px;
+        margin: 0 auto;
+        margin-top: 10px;
+        height: calc(100% - 150px);
+
+        /deep/ {
+            .el-select {
+                float: left;
+                width: calc(600px);
+            }
+
+            .el-textarea {
+                float: left;
+                width: calc(600px);
+            }
+
+            .el-form-item__content>.el-input {
+                float: left;
+                width: calc(600px);
+            }
+
+            .el-input-number {
+                float: left;
+                width: calc(250px);
+            }
+			.el-textarea .el-input__count {
+				color: #909399;
+				position: absolute;
+				font-size: 12px;
+				bottom: -10px;
+				right: 7px;
+				background: transparent;
+			}
+        }
+    }
+
+    .draft {
+        width: 300px;
+        text-align: center;
+        margin: 20px auto;
+    }
+</style>
+
diff --git a/src/views/authorization/index.vue b/src/views/authorization/index.vue
new file mode 100644
index 000000000..987ac11f9
--- /dev/null
+++ b/src/views/authorization/index.vue
@@ -0,0 +1,65 @@
+<template>
+  <div class="content-box">
+    <div class="card_box">
+      <div>
+        <el-input v-model="license" type="textarea" rows="5" placeholder="请输入授权码" style="width: 300px; margin-bottom: 30px;" />
+      </div>
+      <div>
+        <el-button @click="verifyLicense">授权确认</el-button>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import { postLicenseValidate, postLicenseLocal } from '@/api/pushMessage';
+export default {
+    name: '',
+    data() {
+        return {
+            license: ''
+        };
+    },
+    methods: {
+        async verifyLicense() {
+            console.log(this.license);
+            try {
+                const params = {
+                    secretKey: 'joylink',
+                    license: this.license
+                };
+                const res = await postLicenseValidate(params);
+                if (res.code == 200 && res.data) {
+                    const resLocal = await postLicenseLocal(params);
+                    if (resLocal.code == 200) {
+                        this.$router.push({ path: `/login` });
+                    } else {
+                        this.$messageBox('license无效！');
+                    }
+                } else {
+                    this.$messageBox('license无效！');
+                }
+            } catch (error) {
+                console.log(error);
+            }
+        }
+    }
+};
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+.content-box{
+	position: relative;
+	height: 100%;
+}
+.card_box{
+	overflow: hidden;
+	width: 100%;
+	position: absolute;
+	top: 30%;
+	display: flex;
+	align-items: center;
+	flex-direction: column;
+	justify-content: center;
+}
+</style>
diff --git a/src/views/authorization/list.vue b/src/views/authorization/list.vue
new file mode 100644
index 000000000..690958003
--- /dev/null
+++ b/src/views/authorization/list.vue
@@ -0,0 +1,121 @@
+<template>
+  <div>
+    <QueryListPage ref="queryListPage" :pager-config="pagerConfig" :query-form="queryForm" :query-list="queryList" />
+    <input id="competition-manage-url11" v-model="url" style="opacity: 0;">
+  </div>
+</template>
+
+<script>
+import { getPagingQueryList, putLicenseValid } from '@/api/pushMessage';
+
+export default {
+    name: 'CacheControl',
+    components: {
+    },
+    data() {
+        return {
+            url: '',
+            validList: [
+                {label: '有效', value: true},
+                {label: '无效', value: false}
+            ],
+            pagerConfig: {
+                pageSize: 'pageSize',
+                pageIndex: 'pageNum'
+            },
+            queryForm: {
+                labelWidth: '80px',
+                reset: true,
+                queryObject: {
+                    name: {
+                        type: 'text',
+                        label: '名称'
+                    }
+                }
+
+            },
+            queryList: {
+                query: this.queryFunction,
+                selectCheckShow: false,
+                indexShow: true,
+                columns: [
+                    {
+                        title: '名称',
+                        prop: 'name'
+                    },
+                    {
+                        title: '结束时间',
+                        prop: 'overTime'
+                    },
+                    {
+                        title: '授权码',
+                        prop: 'license'
+                    },
+                    {
+                        title: '秘钥',
+                        prop: 'secretKey'
+                    },
+                    {
+                        title: '有效',
+                        prop: 'available',
+                        type: 'tag',
+                        columnValue: (row) => { return this.$convertField(row.available, this.validList, ['value', 'label']); },
+                        tagType: (row) => { return row.available ? '' : 'danger'; }
+                    },
+                    {
+                        type: 'button',
+                        title: this.$t('global.operate'),
+                        width: '250',
+                        buttons: [
+                            {
+                                name: '复制授权码',
+                                handleClick: this.copyLicense,
+                                type: ''
+                            },
+                            {
+                                name: '设置失效',
+                                handleClick: this.handleValid,
+                                type: 'danger'
+                            }
+                        ]
+                    }
+                ]
+            },
+            currentModel: {}
+        };
+    },
+    created() {
+    },
+    methods: {
+        // 设置失效
+        handleValid(index, row) {
+            this.$confirm('您确定设置此秘钥失效么？', this.$t('global.tips'), {
+                confirmButtonText: this.$t('global.confirm'),
+                cancelButtonText: this.$t('global.cancel'),
+                type: 'warning'
+            }).then(() => {
+                putLicenseValid(row.id).then(response => {
+                    this.$message.success(this.$t('tip.successfullyDelete'));
+                    this.reloadTable();
+                }).catch(() => {
+                    this.$messageBox(this.$t('tip.failDelete'));
+                });
+            });
+        },
+        copyLicense(index, row) {
+            this.url = `${row.license}`;
+            const inputText = document.getElementById('competition-manage-url11');
+            inputText.value = row.license;
+            inputText.select(); // 选择对象
+            document.execCommand('Copy'); // 执行浏览器复制命令
+            this.$message.success('授权码已经复制到粘贴板');
+        },
+        queryFunction(params) {
+            return getPagingQueryList(params);
+        },
+        reloadTable() {
+            this.queryList.reload();
+        }
+    }
+};
+</script>
diff --git a/src/views/competitionManage/bankList/dialog-detail.vue b/src/views/competitionManage/bankList/dialog-detail.vue
index 22ef3c89a..70ac3b648 100644
--- a/src/views/competitionManage/bankList/dialog-detail.vue
+++ b/src/views/competitionManage/bankList/dialog-detail.vue
@@ -22,6 +22,34 @@
         </template>
       </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">
+        答 案:
+        <template v-for="(el,i) in options">
+          <span v-if="el.correct" :key="i">{{ $asc2chart(i+65) }} </span>
+        </template>
+      </div>
+    </template>
+    <template v-else-if="checkType(form, 'fill')">
+      <div class="answer">
+        答 案:
+        <template v-for="(el,i) in options">
+          <span v-if="el.correct" :key="i">{{ el.content }} </span>
+        </template>
+      </div>
+    </template>
+    <template v-else-if="checkType(form, 'answer')">
+      <div class="answer">
+        答 案:
+        <template v-for="(el,i) in options">
+          <span v-if="el.correct" :key="i">{{ el.content }} </span>
+        </template>
+      </div>
+    </template>
     <span slot="footer" class="dialog-footer">
       <el-button @click="show = false">关闭</el-button>
     </span>
diff --git a/src/views/competitionManage/bankList/dialog-modify-rich.vue b/src/views/competitionManage/bankList/dialog-modify-rich.vue
index e41791c43..0536570a1 100644
--- a/src/views/competitionManage/bankList/dialog-modify-rich.vue
+++ b/src/views/competitionManage/bankList/dialog-modify-rich.vue
@@ -38,7 +38,7 @@ export default {
         doInput() {
             const node = this.node;
             node.model[node.prop] = this.content;
-            this.$emit('update', node.model);
+            // this.$emit('update');
             this.doClose();
         }
     }
diff --git a/src/views/competitionManage/bankList/index.vue b/src/views/competitionManage/bankList/index.vue
index aa13ca0ba..d2f9d11c5 100644
--- a/src/views/competitionManage/bankList/index.vue
+++ b/src/views/competitionManage/bankList/index.vue
@@ -10,8 +10,8 @@ import { UrlConfig } from '@/scripts/ConstDic';
 import { listQuestionPage, deleteQuestion } from '@/api/questionBank.js';
 import DialogDetail from './dialog-detail';
 import { convertSheetToList } from '@/utils/runPlan';
+import { getCompanyList } from '@/api/company';
 import XLSX from 'xlsx';
-import { importQuestionBand } from '@/api/race';
 
 export default {
     components: {
@@ -19,6 +19,7 @@ export default {
     },
     data() {
         return {
+            companyList: [],
             pagerConfig: {
                 pageSize: 'pageSize',
                 pageIndex: 'pageNum'
@@ -26,6 +27,7 @@ export default {
             queryForm: {
                 reset: true,
                 labelWidth: '80px',
+                leftSpan: 16,
                 queryObject: {
                     type: {
                         type: 'select',
@@ -37,6 +39,13 @@ export default {
                     topic: {
                         type: 'text',
                         label: '题 目'
+                    },
+                    companyId: {
+                        type: 'select',
+                        label: '单位',
+                        config: {
+                            data: []
+                        }
                     }
                 }
             },
@@ -63,7 +72,7 @@ export default {
                         title: '答 案',
                         prop: 'answer',
                         type: 'tagMore',
-                        width: '100',
+                        width: '200',
                         columnValue: (row) => { return this.answerTags(row); },
                         tagType: (row) => {
                             return '';
@@ -77,7 +86,7 @@ export default {
                     {
                         type: 'button',
                         title: '操 作',
-                        width: '420',
+                        width: '320',
                         buttons: [
                             {
                                 name: '编辑',
@@ -98,7 +107,9 @@ export default {
                 ],
                 actions: [
                     { text: '添 加', handler: this.doCreate },
-                    { text: '导 入', fileType: 'file', handler: this.importQuestionBank }
+                    { text: '导 入', fileType: 'file', handler: this.importQuestionBank },
+                    { text: '出题规则管理', handler: this.questionsRuleManage},
+                    { text: '模板导出', handler: this.exportTemplate}
                 ]
             }
         };
@@ -108,6 +119,14 @@ export default {
             return this.$store.state.user.id;
         }
     },
+    mounted() {
+        this.companyList = [];
+        getCompanyList().then(resp => {
+            resp.data.forEach(item => {
+                this.queryForm.queryObject.companyId.config.data.push({ value: item.id, label: item.name });
+            });
+        });
+    },
     methods: {
         doCreate() {
             this.$router.push({path: `${UrlConfig.bank.questionCreate}`});
@@ -149,6 +168,17 @@ export default {
                         answer.push(el.content);
                     }
                     break;
+                case 'multi':
+                    if (el.correct) {
+                        answer.push(this.$asc2chart(i + 65));
+                    }
+                    break;
+                case 'fill':
+                    answer.push(el.content);
+                    break;
+                case 'answer':
+                    answer.push(el.content);
+                    break;
                 }
             });
             return answer;
@@ -161,88 +191,109 @@ export default {
             const questionTypeMap = {
                 '单选': 'select',
                 '多选': 'multi',
-                '判断': 'judge'
+                '判断': 'judge',
+                '填空': 'fill',
+                '问答': 'answer'
             };
             if (file) {
-                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'
-                                });
-                            }
-                            const questionList = [];
-                            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;
-                                        }
+                try {
+                    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'
                                     });
-                                    if (questionTypeIndex || questionTypeIndex === 0) {
-                                        dataList[questionTypeIndex].forEach((item, index) => {
-                                            if (item && item !== '题型') {
-                                                const param = {
-                                                    type: questionTypeMap[item],
-                                                    topic: dataList[topicIndex][index],
-                                                    optionList: []
-                                                };
-                                                param.optionList.push({ content:dataList[option1Index][index] || '正确', correct: dataList[answerIndex][index].includes('A') || dataList[answerIndex][index] == '√' });
-                                                param.optionList.push({ content:dataList[option2Index][index] || '错误', correct: dataList[answerIndex][index].includes('B') || dataList[answerIndex][index] == '×' });
-                                                if (dataList[option3Index][index]) {
-                                                    param.optionList.push({content:dataList[option3Index][index], correct: dataList[answerIndex][index].includes('C')});
-                                                }
-                                                if (dataList[option4Index][index]) {
-                                                    param.optionList.push({content:dataList[option4Index][index], correct: dataList[answerIndex][index].includes('D')});
-                                                }
-                                                questionList.push(param);
+                                } else {
+                                    wb = XLSX.read(data, {
+                                        type: 'binary'
+                                    });
+                                }
+                                const questionList = [];
+                                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;
                                             }
                                         });
+                                        if (questionTypeIndex || questionTypeIndex === 0) {
+                                            dataList[questionTypeIndex].forEach((item, index) => {
+                                                if (item && item !== '题型') {
+                                                    const param = {
+                                                        type: questionTypeMap[item],
+                                                        topic: dataList[topicIndex][index],
+                                                        optionList: []
+                                                    };
+                                                    if (param.type === 'fill') {
+                                                        const answer = dataList[answerIndex][index];
+                                                        const answerList = answer.split('&&');
+                                                        answerList && answerList.forEach(item => {
+                                                            param.optionList.push({content: item, correct: true});
+                                                        });
+                                                    } else if (param.type === 'answer') {
+                                                        param.optionList.push({content: dataList[answerIndex][index]});
+                                                    } else {
+                                                        param.optionList.push({ content:dataList[option1Index][index] || '正确', correct: dataList[answerIndex][index].includes('A') || dataList[answerIndex][index] == '√' });
+                                                        param.optionList.push({ content:dataList[option2Index][index] || '错误', correct: dataList[answerIndex][index].includes('B') || dataList[answerIndex][index] == '×' });
+                                                        if (dataList[option3Index][index]) {
+                                                            param.optionList.push({content:dataList[option3Index][index], correct: dataList[answerIndex][index].includes('C')});
+                                                        }
+                                                        if (dataList[option4Index][index]) {
+                                                            param.optionList.push({content:dataList[option4Index][index], correct: dataList[answerIndex][index].includes('D')});
+                                                        }
+                                                    }
+                                                    questionList.push(param);
+                                                }
+                                            });
+                                        }
                                     }
+                                    that.$store.dispatch('race/setPreTheoryData', questionList).then(() => {
+                                        that.$router.push({ path: `/system/preTheoryImport`});
+                                    }).catch((e) => {
+                                        that.$message.error('导入题库失败！');
+                                    });
+                                    // importQuestionBand(questionList, 'DRTS').then(resp => {
+                                    //     this.$message.success('导入题库成功!');
+                                    // }).catch(()=>{
+                                    //     this.$message.error('导入题库失败！');
+                                    // });
                                 }
-                                importQuestionBand(questionList, 'DRTS').then(resp => {
-                                    this.$message.success('导入题库成功!');
-                                }).catch(()=>{
-                                    this.$message.error('导入题库失败！');
-                                });
+                            };
+                            if (that.rABS) {
+                                reader.readAsArrayBuffer(file);
+                            } else {
+                                reader.readAsBinaryString(file);
                             }
-                        };
-                        if (that.rABS) {
-                            reader.readAsArrayBuffer(file);
-                        } else {
-                            reader.readAsBinaryString(file);
                         }
-                    }
-                }, 200);
+                    }, 200);
+                } catch (e) {
+                    this.$message.error('请根据下载模板导入题目！');
+                }
             }
         },
         importQuestionBank() {
@@ -250,6 +301,56 @@ export default {
             if (!obj.files) return;
             const f = obj.files[0];
             this.handleImport(f);
+        },
+        questionsRuleManage() {
+            this.$router.push({ path: `/system/questionsRuleManage`});
+        },
+        exportTemplate() {
+            const wb = XLSX.utils.book_new();
+            const data1 = [{A: '序号', B: '题型', C:'题目', D:'选项', E: '', F: '', G: '', H: '答案'}];
+            const data2 = [{A: '', B: '', C:'', D:'A', E: 'B', F: 'C', G: 'D', H: ''}];
+            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: '选项B', F: '选项C', G: '选项D', H: 'A'}];
+            const data6 = [{A: '4', B: '多选', C:'题目四', D:'选项A', E: '选项B', F: '选项C', G: '选项D', H: 'ABCD'}];
+            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 ws = XLSX.utils.json_to_sheet(data, {skipHeader:true});
+            ws['!merges'] = [
+                {
+                    s: {c: 3, r: 0},
+                    e: {c: 6, 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: 7, r: 0},
+                    e: {c: 7, 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');
         }
     }
 };
diff --git a/src/views/competitionManage/bankList/item-answer.vue b/src/views/competitionManage/bankList/item-answer.vue
index 9f44910e3..d23557c0e 100644
--- a/src/views/competitionManage/bankList/item-answer.vue
+++ b/src/views/competitionManage/bankList/item-answer.vue
@@ -11,18 +11,41 @@
         <el-radio :label="1"> × </el-radio>
       </el-radio-group>
     </template>
-
+    <template v-if="type=='multi'">
+      <el-checkbox-group v-model="activeList" @change="onChange">
+        <el-checkbox v-for="(el,i) in optionList" :key="i" :label="i"> 选项-{{ $asc2chart(65+i) }} </el-checkbox>
+      </el-checkbox-group>
+    </template>
+    <template v-if="type==='fill'">
+      <div v-for="(el, i) in answerList" :key="i" style="margin-bottom: 5px;">
+        <div style="display: inline-block;margin-right: 10px;height: 40px; line-height: 40px;">{{ `第${i + 1}空` }}</div>
+        <el-input
+          v-model="answerList[i]"
+          style="display: inline-block;width: calc(100% - 100px);"
+          type="textarea"
+          :autosize="{ minRows: 1, maxRows: 4}"
+          placeholder="请输入答案"
+          @change="onChange"
+        />
+        <el-button v-if="i>0" class="item__button" type="danger" size="mini" icon="el-icon-delete" circle @click="doRemove(i)" />
+      </div>
+      <el-button class="item__button" type="primary" size="mini" icon="el-icon-plus" @click="doAppend" />
+    </template>
+    <template v-if="type==='answer'">
+      <el-input
+        v-model="answer"
+        type="textarea"
+        :autosize="{ minRows: 2, maxRows: 4}"
+        placeholder="请输入答案"
+        @change="onChange"
+      />
+    </template>
   </div>
 </template>
 
 <script>
-
 export default {
     props: {
-        value: {
-            type: Number,
-            default: 0
-        },
         optionList: {
             type: Array,
             required: true
@@ -34,18 +57,52 @@ export default {
     },
     data() {
         return {
-            active: 0
+            active: 0,
+            activeList: [],
+            answer: '',
+            answerList: ['']
         };
     },
     watch: {
-        value(val) {
-            this.active = val;
+        optionList: {
+            deep:true,
+            handler:function(newV, oldV) {
+                if (this.type === 'judge' || this.type === 'select') {
+                    this.active = this.optionList.findIndex(ele => ele.correct);
+                } else if (this.type === 'multi') {
+                    this.activeList = [];
+                    this.optionList.forEach((el, i) => {
+                        if (el.correct) {
+                            this.activeList.push(i);
+                        }
+                    });
+                } else if (this.type === 'fill') {
+                    this.answerList = [];
+                    this.optionList.forEach(el => {
+                        this.answerList.push(el.content);
+                    });
+                } else if (this.type === 'answer') {
+                    this.answer = (this.optionList[0] || {content: ''}).content;
+                }
+            }
         }
     },
     methods: {
         onChange(e) {
-            this.$emit('input', e);
-            this.$emit('change', e);
+            if (this.type === 'fill') {
+                this.$emit('change', this.answerList);
+            } else {
+                this.$emit('change', e);
+            }
+        },
+        doAppend() {
+            this.answerList.push('');
+        },
+        doModify(el) {
+            this.$emit('modify', {model: el, prop: 'value'});
+        },
+        doRemove(index) {
+            this.answerList.splice(index, 1);
         }
     }
 };
diff --git a/src/views/competitionManage/bankList/item-options.vue b/src/views/competitionManage/bankList/item-options.vue
index 24b4d6117..6be8de212 100644
--- a/src/views/competitionManage/bankList/item-options.vue
+++ b/src/views/competitionManage/bankList/item-options.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="option">
-    <template v-if="type=='select'">
+    <template v-if="type=='select' || type=='multi'">
       <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)" />
diff --git a/src/views/competitionManage/bankList/preImport.vue b/src/views/competitionManage/bankList/preImport.vue
new file mode 100644
index 000000000..774d0650b
--- /dev/null
+++ b/src/views/competitionManage/bankList/preImport.vue
@@ -0,0 +1,183 @@
+<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;">
+        <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 style="display: inline-block;">
+        <el-button
+          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">
+        <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>
+        </template>
+      </el-table-column>
+    </el-table>
+    <el-pagination
+      :current-page.sync="currentPage"
+      :page-size="pageSize"
+      layout="total, sizes, prev, pager, next, jumper"
+      :page-sizes="[10, 20, 30, 50]"
+      :total="totalNum"
+      @size-change="handleSizeChange"
+      @current-change="handleCurrentChange"
+    />
+  </div>
+</template>
+
+<script>
+import { UrlConfig } from '@/scripts/ConstDic';
+import { importQuestionBand } from '@/api/race';
+import { getCompanyList } from '@/api/company';
+
+export default {
+    data() {
+        return {
+            currentPage: 1,
+            tableData: [],
+            pageSize: 10,
+            companyId: '',
+            companyList: []
+        };
+    },
+    computed: {
+        userId() {
+            return this.$store.state.user.id;
+        },
+        totalNum() {
+            return this.$store.state.race.preTheoryData.length;
+        }
+    },
+    mounted() {
+        this.handlePreDataPaging();
+        getCompanyList().then(resp => {
+            this.companyList = resp.data;
+        });
+    },
+    methods: {
+        edit(index, row) {
+            const number = (this.currentPage - 1) * this.pageSize + index;
+            this.$router.push({path: `${UrlConfig.bank.questionUpdate}/${number}`, query:{ draft: true }});
+        },
+        handlePreDataPaging() {
+            const preData = this.$store.state.race.preTheoryData;
+            const list = [];
+            preData.forEach((item, index) => {
+                if (index >= this.pageSize * (this.currentPage - 1) && index < this.pageSize * this.currentPage) {
+                    list.push(item);
+                }
+            });
+            this.tableData = list;
+        },
+        doDelete(index, row) {
+            this.$confirm('删除试题，是否继续？', '提 示', {
+                confirmButtonText: '确 定',
+                cancelButtonText: '取 消',
+                type: 'warning'
+            }).then(() => {
+                this.$store.state.race.preTheoryData.splice(index, 1);
+                this.handlePreDataPaging();
+            }).catch( () => { });
+        },
+        answerTags(row) {
+            const answer = [];
+            row.optionList.forEach((el, i) => {
+                switch (row.type) {
+                case 'select':
+                    if (el.correct) {
+                        answer.push(this.$asc2chart(i + 65));
+                    }
+                    break;
+                case 'judge':
+                    if (el.correct) {
+                        answer.push(el.content);
+                    }
+                    break;
+                case 'multi':
+                    if (el.correct) {
+                        answer.push(this.$asc2chart(i + 65));
+                    }
+                    break;
+                case 'fill':
+                    answer.push(el.content);
+                    break;
+                case 'answer':
+                    answer.push(el.content);
+                    break;
+                }
+            });
+            return answer;
+        },
+        reloadTable() {
+            this.queryList.reload();
+        },
+        handleSizeChange(val) {
+            this.pageSize = val;
+            this.handlePreDataPaging();
+        },
+        handleCurrentChange(val) {
+            this.currentPage = val;
+            this.handlePreDataPaging();
+        },
+        doSave() {
+            importQuestionBand(this.$store.state.race.preTheoryData, this.companyId).then(resp => {
+                this.$store.dispatch('race/setPreTheoryData', []);
+                this.$message.success('导入题库成功!');
+                this.$router.go(-1);
+            }).catch(()=>{
+                this.$message.error('导入题库失败！');
+            });
+        },
+        doCancel() {
+            this.$store.dispatch('race/setPreTheoryData', []);
+            this.$router.go(-1);
+        }
+    }
+};
+</script>
diff --git a/src/views/competitionManage/bankList/question-create-page.vue b/src/views/competitionManage/bankList/question-create-page.vue
index 804953422..2a4275618 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" />
+        <question-form ref="info" :option="formModel" :remove="true" @modify="doModify" @companyIdChange="companyIdChange" />
       </el-card>
       <div class="page__container-footer">
         <el-button type="primary" :is-create="true" @click="create">提 交</el-button>
@@ -33,7 +33,8 @@ export default {
                 type: 'select',
                 answer: 0,
                 optionList: []
-            }
+            },
+            companyId: null
         };
     },
     computed: {
@@ -58,9 +59,13 @@ export default {
         doModify(node) {
             this.$refs.rich.doShow(node);
         },
+        companyIdChange(value) {
+            this.companyId = value;
+        },
         create() {
             this.$refs.info.validate().then(valid => {
                 if (valid) {
+                    this.formModel.companyId = parseInt(this.companyId);
                     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 0d128f3b4..8b3cd803a 100644
--- a/src/views/competitionManage/bankList/question-form.vue
+++ b/src/views/competitionManage/bankList/question-form.vue
@@ -1,6 +1,11 @@
 <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-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 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" />
@@ -10,11 +15,11 @@
         <item-rich v-model="option.topic" @modify="onModify({model: option, prop: 'topic'})" />
       </el-form-item>
       <template v-if="isCreate">
-        <el-form-item v-if="option.type != 'judge'" label="选 项" prop="optionList">
+        <el-form-item v-if="option.type === 'select' || option.type === 'multi'" label="选 项" prop="optionList">
           <item-options :option-list="optionList" :type="option.type" :add="isSelect" :remove="remove" @remove="onRemove" @modify="onModify" @append="onAppend" />
         </el-form-item>
         <el-form-item label="答 案" prop="answer">
-          <item-answer v-model="option.answer" :option-list="optionList" :type="option.type" @change="onAnswerChnage" />
+          <item-answer refs="itemAnswer" :option-list="optionList" :type="option.type" @change="onAnswerChnage" @modify="onModify" />
         </el-form-item>
       </template>
     </el-form>
@@ -25,6 +30,8 @@
 import ItemRich from './item-rich';
 import ItemOptions from './item-options';
 import ItemAnswer from './item-answer';
+import { getCompanyList } from '@/api/company';
+import { getSessionStorage } from '@/utils/auth';
 
 export default {
     components: {
@@ -52,12 +59,18 @@ export default {
     },
     data() {
         return {
+            companyList: [],
+            companyId: null
         };
     },
     computed: {
         isSelect() {
             return this.remove && this.option.type == 'select';
         },
+        isProject() {
+            const project = getSessionStorage('project');
+            return project !== 'login' && project !== 'design';
+        },
         templateMap() {
             return {
                 select: function() {
@@ -73,6 +86,24 @@ export default {
                         { content: '√', correct: true },
                         { content: '×', correct: false }
                     ];
+                },
+                multi: function() {
+                    return [
+                        { content: '', correct: false},
+                        { content: '', correct: false },
+                        { content: '', correct: false },
+                        { content: '', correct: false }
+                    ];
+                },
+                fill: function() {
+                    return [
+                        { content: '', correct: true}
+                    ];
+                },
+                answer: function() {
+                    return [
+                        { content: '', correct: true}
+                    ];
                 }
             };
         },
@@ -98,6 +129,9 @@ export default {
     },
     mounted() {
         this.onTypeChnage(this.option.type);
+        getCompanyList().then(resp => {
+            this.companyList = resp.data;
+        });
     },
     methods: {
         validate() {
@@ -107,13 +141,36 @@ export default {
                 });
             });
         },
+        companyIdChange(e) {
+            this.$emit('companyIdChange', e);
+        },
         onTypeChnage(type) {
-            if (this.templateMap[type]) {
+            if (this.templateMap[type] && !this.update) {
                 this.option.optionList = this.templateMap[type]();
             }
         },
         onAnswerChnage(answer) {
-            this.option.optionList.forEach((el, i) => { el.correct = i == answer; });
+            if (this.option.type === 'judge' || this.option.type === 'select') {
+                this.option.optionList.forEach((el, i) => { el.correct = i == answer; });
+            } else if (this.option.type === 'multi') {
+                this.option.optionList.forEach((el, i) => { el.correct = answer.includes(i); });
+            } else if (this.option.type === 'fill') {
+                answer.forEach((item, index) => {
+                    if (this.option.optionList[index]) {
+                        this.option.optionList[index].content = item;
+                        this.option.optionList[index].correct = true;
+                        this.option.optionList[index].order = index + 1;
+                    } else {
+                        this.option.optionList[index] = { content: item, correct: true, order: index + 1 };
+                    }
+                });
+            } else if (this.option.type === 'answer') {
+                if (this.option.optionList[0]) {
+                    this.option.optionList[0].content = answer;
+                } else {
+                    this.option.optionList[0] = {content: answer, correct:true};
+                }
+            }
         },
         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 0e2a41161..30b124fcf 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" />
+        <question-form ref="info" :option="formModel" :remove="true" :update="true" @modify="doModify" @companyIdChange="companyIdChange" />
       </el-card>
     </div>
     <div class="page__container-footer">
@@ -17,6 +17,7 @@
 import QuestionForm from './question-form.vue';
 import DialogModifyRich from './dialog-modify-rich';
 import { getQuestionInfo, updateOption } from '@/api/questionBank.js';
+import { deepAssign } from '@/utils/index';
 
 export default {
     components: {
@@ -50,20 +51,34 @@ export default {
     },
     methods: {
         loadInitData() {
-            getQuestionInfo(this.questionId).then(resp => {
-                this.formModel = resp.data;
-                this.formModel.answer = this.formModel.optionList.findIndex(ele => ele.correct);
-            });
+            if (this.$route.query.draft) {
+                setTimeout(() => {
+                    this.formModel = deepAssign({}, this.$store.state.race.preTheoryData[this.questionId]);
+                    this.formModel.answer = this.formModel.optionList.findIndex(ele => ele.correct);
+                }, 500);
+            } else {
+                getQuestionInfo(this.questionId).then(resp => {
+                    this.formModel = resp.data;
+                    this.formModel.answer = this.formModel.optionList.findIndex(ele => ele.correct);
+                });
+            }
         },
         doBack() {
             this.$router.go(-1);
         },
+        companyIdChange(value) {
+            this.companyId = value;
+        },
         doModify(node) {
             this.$refs.rich.doShow(node);
         },
         update() {
             this.$refs.info.validate().then(valid => {
-                if (valid) {
+                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);
                     updateOption(this.formModel).then(resp => {
                         this.doBack();
                     }).catch(error => {
diff --git a/src/views/competitionManage/competition/create.vue b/src/views/competitionManage/competition/create.vue
deleted file mode 100644
index 95f8611dd..000000000
--- a/src/views/competitionManage/competition/create.vue
+++ /dev/null
@@ -1,165 +0,0 @@
-<template>
-  <el-dialog v-dialogDrag title="创建竞赛" :visible.sync="dialogVisible" width="500px" center :show-close="false" :close-on-click-modal="false" :close-on-press-escape="false">
-    <el-form ref="form" :model="formModel" :rules="rules" label-width="90px">
-      <el-form-item label="竞赛名称:" prop="name">
-        <el-input v-model="formModel.name" style="width: 220px;" />
-      </el-form-item>
-      <el-form-item label="竞赛地图:" prop="mapId">
-        <el-select v-model="formModel.mapId" placeholder="请选择">
-          <el-option
-            v-for="item in mapList"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value"
-          />
-        </el-select>
-      </el-form-item>
-      <el-form-item label="开始日期:" prop="startDate">
-        <el-date-picker
-          v-model="formModel.startDate"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="选择日期"
-          :picker-options="pickerOptions"
-        />
-      </el-form-item>
-      <el-form-item label="结束日期:" prop="endDate">
-        <el-date-picker
-          v-model="formModel.endDate"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="选择日期"
-          :picker-options="pickerOptions"
-        />
-      </el-form-item>
-    </el-form>
-    <span slot="footer" class="dialog-footer">
-      <el-button v-if="!isUpdate" v-loading="loading" type="primary" @click="doSave">创建</el-button>
-      <el-button v-if="isUpdate" v-loading="loading" type="primary" @click="doUpdate">修改</el-button>
-      <el-button @click="dialogVisible = false">{{ $t('global.cancel') }}</el-button>
-    </span>
-  </el-dialog>
-</template>
-
-<script>
-import { updateRace, createRace } from '@/api/race';
-export default {
-    name: 'CreateRace',
-    props: {
-        mapList: {
-            type: Array,
-            default: () => {
-                return [];
-            }
-        }
-    },
-    data() {
-        var validatePass = (rule, value, callback) => {
-            if (this.formModel.startDate && this.formModel.endDate) {
-                if (new Date(this.formModel.startDate).valueOf() > new Date(this.formModel.endDate).valueOf()) {
-                    callback(new Error('竞赛开始日期不得在结束日期之后'));
-                } else {
-                    this.$refs.form.clearValidate('startDate');
-                    this.$refs.form.clearValidate('endDate');
-                    callback();
-                }
-            } else {
-                callback();
-            }
-        };
-        return {
-            dialogVisible: false,
-            formModel: {
-                name: '',
-                startDate: '',
-                endDate: '',
-                mapId: '',
-                optionalTypes: ['DISPATCHER']
-            },
-            pickerOptions: {
-                disabledDate(time) {
-                    return time.getTime() < Date.now();
-                }
-            },
-            raceId: '',
-            loading: false,
-            isUpdate: false,
-            mapId: '',
-            rules: {
-                name: [
-                    { required: true, message: '请输入竞赛名称', trigger: 'blur' }
-                ],
-                mapId: [
-                    { required: true, message: '请输入竞赛地图', trigger: 'change'}
-                ],
-                startDate: [
-                    { required: true, message: '请输入竞赛开始日期', trigger: 'change' },
-                    {validator: validatePass, trigger: 'change' }
-                ],
-                endDate: [
-                    { required: true, message: '请输入竞赛开始日期', trigger: 'change' },
-                    {validator: validatePass, trigger: 'change' }
-                ]
-            }
-        };
-    },
-    computed: {
-
-    },
-    methods: {
-        doShow(row) {
-            this.dialogVisible = true;
-            this.loading = false;
-            this.isUpdate = false;
-            this.raceId = '';
-            if (row) {
-                this.isUpdate = true;
-                this.raceId = row.id;
-                this.formModel.name = row.name;
-                this.formModel.startDate = row.startDate;
-                this.formModel.endDate = row.endDate;
-                this.formModel.mapId = row.mapId + '';
-            }
-        },
-        doSave() {
-            if (this.loading) {
-                return;
-            }
-            this.loading = true;
-            createRace(this.formModel).then(resp => {
-                this.$message.success('创建竞赛成功！');
-                this.$emit('refresh');
-            }).catch(()=> {
-                this.$message.error('创建竞赛失败！');
-            }).finally(()=> {
-                this.dialogVisible = false;
-                this.loading = false;
-                this.$refs.form.resetFields();
-            });
-        },
-        doUpdate() {
-            if (this.loading) {
-                return;
-            }
-            this.loading = true;
-            const params = {
-                id: this.raceId,
-                name: this.formModel.name,
-                startDate: this.formModel.startDate,
-                endDate: this.formModel.endDate,
-                mapId: this.formModel.mapId
-            };
-            updateRace(this.raceId, params).then(resp => {
-                this.$message.success('修改竞赛成功！');
-                this.$emit('refresh');
-            }).catch(()=> {
-                this.$message.error('修改竞赛失败！');
-            }).finally(() => {
-                this.dialogVisible = false;
-                this.loading = false;
-                this.$refs.form.resetFields();
-            });
-        }
-    }
-};
-</script>
diff --git a/src/views/competitionManage/competition/index.vue b/src/views/competitionManage/competition/index.vue
deleted file mode 100644
index 0c424b27d..000000000
--- a/src/views/competitionManage/competition/index.vue
+++ /dev/null
@@ -1,184 +0,0 @@
-<template>
-  <div>
-    <QueryListPage ref="queryListPage" :pager-config="pagerConfig" :query-form="queryForm" :query-list="queryList" />
-    <create-race ref="createRace" :map-list="mapList" @refresh="refresh" />
-    <input id="competition-manage-url" v-model="url" style="opacity: 0;">
-    <div id="bm" ref="bm" />
-  </div>
-</template>
-
-<script>
-import { getRaceList } from '@/api/race';
-import CreateRace from './create';
-import { getPublishMapListOnline } from '@/api/jmap/map';
-
-export default {
-    name: 'PublishMap',
-    components: {
-        CreateRace
-    },
-    data() {
-        return {
-            cityList: [],
-            lineCodeList: [],
-            pagerConfig: {
-                pageSize: 'pageSize',
-                pageIndex: 'pageNum'
-            },
-            queryForm: {
-                labelWidth: '80px',
-                reset: true,
-                queryObject: {
-                    raceName: {
-                        type: 'text',
-                        label: '竞赛名称'
-                    }
-                }
-
-            },
-            queryList: {
-                query: getRaceList,
-                selectCheckShow: false,
-                indexShow: true,
-                columns: [
-                    {
-                        title: '竞赛名称',
-                        prop: 'name'
-                    },
-                    {
-                        title: '竞赛地图',
-                        prop: 'mapId',
-                        type: 'tag',
-                        columnValue: (row) => { return this.$convertField(row.mapId, this.mapList, ['value', 'label']); },
-                        tagType: (row) => { return 'success'; }
-                    },
-                    {
-                        title: '开始日期',
-                        prop: 'startDate'
-                    },
-                    {
-                        title: '结束日期',
-                        prop: 'endDate'
-                    },
-                    {
-                        title: '创建人',
-                        prop: 'creatorName'
-                    },
-                    {
-                        type: 'button',
-                        title: this.$t('global.operate'),
-                        width: 580,
-                        buttons: [
-                            {
-                                name: '修改',
-                                handleClick: this.update,
-                                type: ''
-                            },
-                            {
-                                name: '报名地址',
-                                handleClick: this.showApplyUrl,
-                                type: ''
-                            },
-                            {
-                                name: '参赛地址',
-                                handleClick: this.showJoinUrl
-                            },
-                            {
-                                name: '裁判地址',
-                                handleClick: this.showRefereeUrl
-                            },
-                            {
-                                name: '生成试卷',
-                                handleClick: this.generatePaper
-                            }
-                        ]
-                    }
-                ],
-                actions: [
-                    { text: '创建竞赛', handler: this.createRace }
-                ]
-            },
-            mapList: [],
-            currentModel: {},
-            url: ''
-        };
-    },
-    created() {
-        this.loadInitData();
-        getPublishMapListOnline().then(response=>{
-            this.mapList = response.data.map(elem => { return { value: elem.id, label: elem.name }; });
-        });
-    },
-    methods: {
-        loadInitData() {
-            this.cityList = [];
-            this.lineCodeList = [];
-        },
-        createRace() {
-            this.$refs.createRace.doShow();
-        },
-        refresh() {
-            this.$refs.queryListPage.refresh(true);
-        },
-        update(index, row) {
-            this.$refs.createRace.doShow(row);
-        },
-        showJoinUrl(index, row) {
-            const url = `${window.location.protocol}//${window.location.host}/jsxt/login?raceId=${row.id}`;
-            this.url = url;
-            this.$messageBox();
-            this.$confirm(`${row.name}参赛路径：${url}`, '参赛路径', {
-                confirmButtonText: '复制路径',
-                cancelButtonText: '关闭',
-                type: 'success'
-            }).then(() => {
-                const inputText = document.getElementById('competition-manage-url');
-                inputText.select(); // 选择对象
-                document.execCommand('Copy'); // 执行浏览器复制命令
-                this.$message.success('参赛路径已经复制到粘贴板');
-            });
-        },
-        showApplyUrl(index, row) {
-            // this.$messageBox(`${row.name}报名路径：${window.location.protocol}//${window.location.host}/jsxtApply?raceId=${row.id}`);
-            const url = `${window.location.protocol}//${window.location.host}/jsxtApply?raceId=${row.id}`;
-            this.url = url;
-            this.$messageBox();
-            this.$confirm(`${row.name}报名路径：${url}`, '报名路径', {
-                confirmButtonText: '复制路径',
-                cancelButtonText: '关闭',
-                type: 'success'
-            }).then(() => {
-                const inputText = document.getElementById('competition-manage-url');
-                inputText.select(); // 选择对象
-                document.execCommand('Copy'); // 执行浏览器复制命令
-                this.$message.success('报名路径已经复制到粘贴板');
-            });
-        },
-        showRefereeUrl(index, row) {
-            const url = `${window.location.protocol}//${window.location.host}/refereeJsxt/login?raceId=${row.id}`;
-            this.url = url;
-            this.$messageBox();
-            this.$confirm(`${row.name}裁判地址：${url}`, '报名路径', {
-                confirmButtonText: '复制路径',
-                cancelButtonText: '关闭',
-                type: 'success'
-            }).then(() => {
-                const inputText = document.getElementById('competition-manage-url');
-                inputText.select(); // 选择对象
-                document.execCommand('Copy'); // 执行浏览器复制命令
-                this.$message.success('报名路径已经复制到粘贴板');
-            });
-        },
-        generatePaper(index, row) {
-            this.$router.push({ path: `/design/race/generate`, query: {raceId:row.id, mapId: row.mapId} });
-        }
-    }
-};
-</script>
-<style lang="scss" scoped>
-	/deep/
-	.el-button+.el-button{
-		margin-top: 5px;
-		margin-left: 5px;
-	}
-</style>
diff --git a/src/views/competitionManage/generatePaper.vue b/src/views/competitionManage/generatePaper.vue
deleted file mode 100644
index a912deb81..000000000
--- a/src/views/competitionManage/generatePaper.vue
+++ /dev/null
@@ -1,230 +0,0 @@
-<template>
-  <div style="width: 100%;height: 100%;">
-    <div style="margin-top: 10px;position: absolute; right: 50px;">
-      <el-button size="small" type="primary" @click="exportPaper">导出试题</el-button>
-      <el-button size="small" type="primary" @click="goBack">返回</el-button>
-    </div>
-    <el-card style="width: 45%;margin-left: 50px;margin-top: 60px;display: inline-block;height: calc(100% - 100px);">
-      <div slot="header">
-        <span>理论试题列表</span>
-        <el-button style="float: right; padding: 3px 0" type="text" @click="addTheoryQuestion">添加试题</el-button>
-        <el-button style="float: right; padding: 3px 0;margin-right: 5px" type="text" @click="theoryReview">预览</el-button>
-      </div>
-      <el-table
-        :data="theoryQuestionList"
-        style="width: 100%"
-        height="100%"
-        :summary-method="getSummaries"
-        :show-summary="showSummary"
-        :row-style="handleRowStyle"
-      >
-        <el-table-column prop="type" label="类型" width="100">
-          <template slot-scope="scope">
-            <el-tag type="primary" disable-transitions>{{ QuestionTypeMap[scope.row.type] }}</el-tag>
-          </template>
-        </el-table-column>
-        <el-table-column prop="topic" label="题目" show-overflow-tooltip="">
-          <template slot-scope="scope">
-            <span v-html="scope.row.topic" />
-          </template>
-        </el-table-column>
-        <el-table-column prop="score" label="分值" width="100">
-          <template slot-scope="scope">
-            <span v-if="!scope.row.editScope" @click="editScope(scope.row)">{{ scope.row.score }}</span>
-            <i v-if="!scope.row.editScope" class="el-icon-edit" @click="editScope(scope.row)" />
-            <el-input-number v-if="scope.row.editScope" v-model="scope.row.score" v-focus="scope.row.editFocus" :controls="noControls" :min="0" size="mini" style="width: 90px" @blur="editScopeBlur(scope.row)" />
-          </template>
-        </el-table-column>
-        <el-table-column prop="operate" label="操作" width="100">
-          <template slot-scope="scope">
-            <el-button type="warning" size="mini" @click="removeTheoryQuestion(scope.row)">移出</el-button>
-          </template>
-        </el-table-column>
-      </el-table>
-    </el-card>
-    <el-card style="width: 45%;margin-left: calc(10% - 100px);margin-top: 60px;display: inline-block;height: calc(100% - 100px);">
-      <div slot="header">
-        <span>实操试题列表</span>
-        <el-button style="float: right; padding: 3px 0" type="text" @click="addOperateQuestion">添加试题</el-button>
-        <el-button style="float: right; padding: 3px 0;margin-right: 5px" type="text" @click="operateReview">预览</el-button>
-      </div>
-      <el-table
-        :data="operateQuestionList"
-        style="width: 100%"
-        height="100%"
-        :row-style="handleRowStyle"
-        :summary-method="getSummaries"
-        :show-summary="showSummary"
-      >
-        <el-table-column prop="question" label="实操名称">
-          <template slot-scope="scope">
-            <span>{{ scope.row.question.name }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column prop="question" label="实操描述">
-          <template slot-scope="scope">
-            <span>{{ scope.row.question.description }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column prop="score" label="分值">
-          <template slot-scope="scope">
-            <span v-if="!scope.row.editScope" @click="editScope(scope.row)">{{ scope.row.score }}</span>
-            <i v-if="!scope.row.editScope" class="el-icon-edit" @click="editScope(scope.row)" />
-            <el-input-number v-if="scope.row.editScope" v-model="scope.row.score" v-focus="scope.row.editFocus" :controls="noControls" :min="0" size="mini" @blur="editScopeBlur(scope.row)" />
-          </template>
-        </el-table-column>
-        <el-table-column prop="operate" label="操作">
-          <template slot-scope="scope">
-            <el-button type="warning" size="mini" @click="removeOperateQuestion(scope.row)">移出</el-button>
-          </template>
-        </el-table-column>
-      </el-table>
-    </el-card>
-    <set-exam-time ref="setExamTime" :theory-question-list="theoryQuestionList" :operate-question-list="operateQuestionList" />
-    <theory-review ref="theoryReview" :theory-question-list="theoryQuestionList" />
-    <theory-question ref="theoryQuestion" :theory-index-list="theoryIndexList" @addQuestion="addTheoryQuestionList" @removeQuestion="removeTheoryQuestion" />
-  </div>
-</template>
-
-<script>
-import TheoryReview from './theoryReview';
-import TheoryQuestion from './theoryQuestion';
-import SetExamTime from './setExamTime';
-export default {
-    name: 'GeneratPaper',
-    components: {
-        SetExamTime,
-        TheoryReview,
-        TheoryQuestion
-    },
-    data() {
-        return {
-            QuestionTypeMap: {
-                select: '选择题',
-                judge: '判断题'
-            },
-            showSummary: true,
-            noControls: false,
-            theoryQuestionList: [], // 理论试卷试题列表
-            operateQuestionList: [], // 实操试卷试题列表
-            theoryIndexList: [], // 理论试卷试题索引列表
-            operateIndexList: []// 实操试卷试题索引列表
-        };
-    },
-    methods: {
-        removeOperateQuestion(row) {
-            const index = this.operateIndexList.indexOf(row.id);
-            this.operateIndexList.splice(index, 1);
-            this.operateQuestionList.splice(index, 1);
-        },
-        removeTheoryQuestion(row) {
-            const index = this.theoryIndexList.indexOf(row.id);
-            this.theoryIndexList.splice(index, 1);
-            this.theoryQuestionList.splice(index, 1);
-        },
-        addTheoryQuestionList(row) {
-            if (this.theoryQuestionList.length) {
-                this.theoryIndexList.push(row.id);
-                this.theoryQuestionList.push(row);
-            } else {
-                this.theoryIndexList = [row.id];
-                this.theoryQuestionList = [row];
-            }
-        },
-        addOperateQuestionList(row) {
-            const length = this.operateQuestionList.length;
-            if (length) {
-                this.operateIndexList.push(row.id);
-                this.operateQuestionList.push({id:length + 1, score:0, question: row});
-            } else {
-                this.operateIndexList = [row.id];
-                this.operateQuestionList = [{id:1, score:0, question: row}];
-            }
-        },
-        addTheoryQuestion() {
-            this.$refs.theoryQuestion.doShow();
-        },
-        addOperateQuestion() {
-        },
-        goBack() {
-            this.$router.go(-1);
-        },
-        theoryReview() {
-            this.$refs.theoryReview.doShow();
-        },
-        operateReview() {
-        },
-        editScope(row) {
-            this.$set(row, 'editScope', true);
-            this.$nextTick(() => {
-                this.$set(row, 'editFocus', true);
-            });
-        },
-        editScopeBlur(row) {
-            this.$set(row, 'editScope', false);
-            this.$set(row, 'editFocus', true);
-            if (row.score > 0) {
-                this.$set(row, 'isError', false);
-            }
-            this.showSummary = false;
-
-            this.$nextTick(() => {
-                this.getSummaries({data: this.theoryQuestionList});
-            });
-        },
-        handleRowStyle({row, rowIndex}) {
-            return row.isError ? {background: '#F00'} : {background: '#FFF'};
-        },
-        getSummaries(param) {
-            const { data } = param;
-            const sums = [];
-            sums[0] = '总分';
-            const values = data.map(item => Number(item.score));
-            if (!values.every(value => isNaN(value))) {
-                sums[2] = values.reduce((prev, curr) => {
-                    const value = Number(curr);
-                    if (!isNaN(value)) {
-                        return prev + curr;
-                    } else {
-                        return prev;
-                    }
-                }, 0);
-                sums[2] += ' 分';
-            }
-            this.showSummary = true;
-            return sums;
-        },
-        exportPaper() {
-            let flag = false;
-            this.theoryQuestionList.forEach((item) => {
-                if (item.score <= 0) {
-                    flag = true;
-                    this.$set(item, 'isError', true);
-                }
-            });
-            this.operateQuestionList.forEach((item) => {
-                if (item.score <= 0) {
-                    flag = true;
-                    this.$set(item, 'isError', true);
-                }
-            });
-            if (flag) {
-                this.$message.error('试题分分值不得为0');
-            } else {
-                this.$refs.setExamTime.doShow();
-            }
-        }
-    }
-};
-</script>
-
-<style scoped>
-/deep/
-.el-card__body{
-	height: calc(100% - 47px);
-}
-/deep/
-.el-table__body-wrapper {
-	height: calc(100% - 97px) !important;
-}
-</style>
diff --git a/src/views/competitionManage/practiceList/create.vue b/src/views/competitionManage/practiceList/create.vue
deleted file mode 100644
index ec45ec05e..000000000
--- a/src/views/competitionManage/practiceList/create.vue
+++ /dev/null
@@ -1,120 +0,0 @@
-<template>
-  <el-dialog :title="title" :visible.sync="dialogVisible" width="500px" :before-close="doClose" center>
-    <data-form ref="dataform" :form="form" :form-model="formModel" :rules="rules" />
-    <span slot="footer" class="dialog-footer">
-      <el-button type="primary" @click="doCreate">{{ $t('global.confirm') }}</el-button>
-      <el-button @click="doClose">{{ $t('global.cancel') }}</el-button>
-    </span>
-  </el-dialog>
-</template>
-
-<script>
-import { getScriptByIdBasic} from '@/api/script';
-
-export default {
-    name: 'ScriptDraft',
-    props: {
-        title: {
-            type: String,
-            default() {
-                return '';
-            }
-        },
-        mapList:{
-            type: Array,
-            default() {
-                return '';
-            }
-        }
-    },
-    data() {
-        return {
-            dialogVisible: false,
-            isEdit:false,
-            formModel: {
-                name: '',
-                mapId: '',
-                description:''
-            }
-        };
-    },
-    computed: {
-        form() {
-            const form = {
-                labelWidth: '120px',
-                items: [
-                    { prop: 'name', label: '实操名称', type: 'text' },
-                    { prop:'mapId', label:'实操地图', type:'select', options:this.mapList, disabled:this.isEdit},
-                    { prop: 'description', label: '实操描述', type: 'textarea' }
-                ]
-            };
-            return form;
-        },
-        rules() {
-            const crules = {
-                name: [
-                    { validator: this.validateScriptName, trigger: 'blur' },
-                    { validator: this.validateScriptName, trigger: 'change' }
-                ],
-                description: [
-                    { validator: this.validateDescription, trigger: 'blur' },
-                    { validator: this.validateDescription, trigger: 'change' }
-                ],
-                mapId:[
-                    { required: true, message: '请选择地图', trigger: 'change' }
-                ]
-            };
-            return crules;
-        }
-    },
-    methods: {
-        validateScriptName(rule, value, callback) {
-            if (value.trim().length === 0) {
-                this.formModel.name = this.formModel.name.replace(/\s/g, '');
-                return callback(new Error('请输入实操名称'));
-            } else {
-                return callback();
-            }
-        },
-        validateDescription(rule, value, callback) {
-            if (value.trim().length === 0) {
-                this.formModel.description = this.formModel.description.replace(/\s/g, '');
-                return callback(new Error('请输入实操描述'));
-            } else {
-                return callback();
-            }
-        },
-        doShow(questid) {
-            if (questid) {
-                getScriptByIdBasic(questid).then(resp=>{
-                    const data = {'name':resp.data.name, 'description':resp.data.description, 'mapId':resp.data.mapId, isRace:resp.data.isRace};
-                    this.formModel = data;
-                    this.formModel.id = questid;
-                    this.dialogVisible = true;
-                    this.isEdit = true;
-                });
-            } else {
-                this.formModel.isRace = true;
-                this.dialogVisible = true;
-                this.isEdit = false;
-            }
-        },
-        doCreate() {
-            const self = this;
-            this.$refs.dataform.validateForm(() => {
-                self.$emit('create', Object.assign({}, this.formModel));
-                self.doClose();
-            });
-        },
-        doClose() {
-            this.$refs.dataform.resetForm();
-            this.dialogVisible = false;
-        }
-    }
-};
-</script>
-<style lang="scss" scoped>
-/deep/ .el-dialog--center .el-dialog__body{
-    padding: 25px 65px 30px 10px;
-}
-</style>
diff --git a/src/views/competitionManage/practiceList/display/index.vue b/src/views/competitionManage/practiceList/display/index.vue
deleted file mode 100644
index 5a1a1ea0d..000000000
--- a/src/views/competitionManage/practiceList/display/index.vue
+++ /dev/null
@@ -1,59 +0,0 @@
-<template>
-  <div class="script-parent">
-    <div class="script-card" :style="{width: widthLeft+'px'}">
-      <practice-record ref="tipTaskRecord" :group="group" :width="widthLeft" />
-    </div>
-    <drap-left :width-left="widthLeft" :min="480" :max="580" @drapWidth="drapWidth" />
-    <div class="script-display">
-      <display ref="display" :size="size" />
-    </div>
-  </div>
-</template>
-
-<script>
-import Display from '@/views/newMap/displayNew/index';
-import PracticeRecord from './practiceRecord';
-import drapLeft from '@/views/components/drapLeft/index';
-
-export default {
-    name: 'ScriptDisplayNew',
-    components: {
-        Display,
-        PracticeRecord,
-        drapLeft
-    },
-    data() {
-        return {
-            widthLeft: 480,
-            size: {
-                width: document.documentElement.clientWidth - 480,
-                height: document.documentElement.clientHeight
-            },
-            group: this.$route.query.group
-        };
-    },
-    watch: {
-        '$store.state.app.windowSizeCount': function() {
-            this.size = { width: this.$store.state.app.width - 480, height: this.$store.state.app.height};
-        },
-        widthLeft: function(val) {
-            this.size = { width: this.$store.state.app.width - val, height: this.$store.state.app.height};
-        }
-    },
-    methods: {
-        drapWidth(width) {
-            this.widthLeft = Number(width);
-        }
-    }
-};
-</script>
-<style rel="stylesheet/scss" lang="scss" scoped>
-    @import "src/styles/mixin.scss";
-    .script-parent {
-        display: flex;
-        flex-flow: row;
-        .script-card {
-            width: 780px;
-        }
-    }
-</style>
diff --git a/src/views/competitionManage/practiceList/display/practiceRecord.vue b/src/views/competitionManage/practiceList/display/practiceRecord.vue
deleted file mode 100644
index ca5fc3c8e..000000000
--- a/src/views/competitionManage/practiceList/display/practiceRecord.vue
+++ /dev/null
@@ -1,10 +0,0 @@
-<template>
-  <div>
-    111
-  </div>
-</template>
-<script>
-export default {
-
-};
-</script>
diff --git a/src/views/competitionManage/practiceList/index.vue b/src/views/competitionManage/practiceList/index.vue
deleted file mode 100644
index 7ac06c8c2..000000000
--- a/src/views/competitionManage/practiceList/index.vue
+++ /dev/null
@@ -1,201 +0,0 @@
-<template>
-  <div>
-    <query-list-page ref="user" :pager-config="pagerConfig" :query-form="queryForm" :query-list="queryList" />
-    <create-practice ref="createPractice" :map-list="mapList" title="创建实操" @reloadTable="reloadTable" @create="handleConfirmCreate" />
-    <create-practice ref="modifyPractice" :map-list="mapList" title="修改实操" @reloadTable="reloadTable" @create="handleConfirmModify" />
-  </div>
-</template>
-<script>
-import Cookies from 'js-cookie';
-import { getPublishMapListOnline, getPublishMapInfo } from '@/api/jmap/map';
-import { getPracticeList } from '@/api/race';
-import {updateScript, deleteScript, createScript} from '@/api/script';
-import { scriptRecordNotifyNew } from '@/api/simulation';
-
-import { launchFullscreen } from '@/utils/screen';
-import { UrlConfig } from '@/scripts/ConstDic';
-import CreatePractice from './create';
-export default {
-    name:'PracticeManage',
-    components:{
-        CreatePractice
-    },
-    data() {
-        return {
-            mapList:[],
-            pagerConfig: {
-                pageSize: 'pageSize',
-                pageIndex: 'pageNum'
-            },
-            queryForm: {
-                reset: true,
-                labelWidth: '80px',
-                queryObject: {
-                    mapId: {
-                        type: 'select',
-                        label: '实操地图',
-                        config: {
-                            data: []
-                        }
-                    },
-                    name: {
-                        type: 'text',
-                        label: '实操名称'
-                    }
-                }
-            },
-            queryList: {
-                query: getPracticeList,
-                // data:[
-                //     {id:1, raceId:2, name:'行调进行扣车操作', creatorName:'水墨'},
-                //     {id:2, raceId:4, name:'行调进行扣车操作', creatorName:'zyy'},
-                //     {id:3, raceId:3, name:'行调进行扣车操作', creatorName:'水墨'}
-                // ],
-                selectCheckShow: false,
-                indexShow: true,
-                columns: [
-                    {
-                        title: '实操地图',
-                        prop: 'mapId',
-                        type: 'tag',
-                        width: '320',
-                        columnValue: (row) => { return this.$convertField(row.mapId, this.mapList, ['value', 'label']); },
-                        tagType: (row) => { return 'success'; }
-                    },
-                    {
-                        title: '实操名称',
-                        prop: 'name',
-                        width: '400'
-                    },
-                    {
-                        title: '实操描述',
-                        prop: 'description'
-                    },
-                    {
-                        type: 'button',
-                        title: '操 作',
-                        width: '420',
-                        buttons: [
-                            {
-                                name: '录 制',
-                                handleClick: this.doRecord,
-                                type: 'success'
-                            },
-                            {
-                                name: '更 新',
-                                handleClick: this.doUpdate,
-                                type: 'primary'
-                            },
-                            {
-                                name: '删 除',
-                                handleClick: this.doDelete,
-                                type: 'danger'
-                            }
-                            // {
-                            //     name: '预 览',
-                            //     handleClick: this.doDetail
-                            // }
-                        ]
-                    }
-                ],
-                actions: [
-                    { text: '添 加', handler: this.doCreate }
-                ]
-            }
-        };
-    },
-    mounted() {
-        getPublishMapListOnline().then(response=>{
-            this.mapList = response.data.map(elem => { return { value: elem.id, label: elem.name }; });
-            this.queryForm.queryObject.mapId.config.data = this.mapList;
-        });
-    },
-    methods:{
-        doCreate() {
-            this.$refs.createPractice.doShow(null);
-        },
-        doDetail() {
-
-        },
-        doDelete(index, row) {
-            this.$confirm('此操作将删除此实操, 是否继续?', this.$t('global.tips'), {
-                confirmButtonText: this.$t('global.confirm'),
-                cancelButtonText: this.$t('global.cancel'),
-                type: 'warning'
-            }).then(() => {
-                deleteScript(row.id).then(response => {
-                    this.$message.success('删除实操试题成功');
-                    this.reloadTable();
-                }).catch((error) => {
-                    this.$messageBox(`删除实操试题失败: ${error.message}`);
-                });
-            }).catch(() => { });
-        },
-        doRecord(index, row) {
-            getPublishMapInfo(row.mapId).then(response=>{
-                const lineCode = response.data.lineCode;
-                scriptRecordNotifyNew(row.id).then(resp => {
-                    const query = { mapId: row.mapId, group: resp.data, scriptId: row.id, lang:row.lang, drawWay:true, lineCode:lineCode};
-                    this.$router.push({ path: `${UrlConfig.scriptDisplayNew}/script`, query });
-                    launchFullscreen();
-                }).catch(error => {
-                    this.$messageBox(`创建仿真失败: ${error.message}`);
-                });
-            });
-            // row.id
-            // let raceInfo;
-            // this.raceList.forEach(each=>{
-            //     if (each.id == row.raceId) {
-            //         raceInfo = each;
-            //     }
-            // });
-            // practiceRecordNotify(83).then(resp => {
-            //     const query = { mapId: raceInfo.mapId, group: resp.data, scriptId: row.id, lineCode:raceInfo.lineCode};
-            //     this.$router.push({ path: `${UrlConfig.practiceDisplayNew}/practice`, query });
-            //     launchFullscreen();
-            // }).catch(error => {
-            //     this.$messageBox(`创建仿真失败: ${error.message}`);
-            // });
-        },
-        // 修改
-        doUpdate(index, row) {
-            this.$refs.modifyPractice.doShow(row.id);
-        },
-        getRaceName(raceId) {
-            let raceName = '';
-            this.raceList.forEach(each=>{
-                if (each.id == raceId) {
-                    raceName = each.name;
-                }
-            });
-            return raceName;
-        },
-        reloadTable() {
-            if (this.queryList && this.queryList.reload) {
-                this.queryList.reload();
-            }
-        },
-        handleConfirmCreate(data) {
-            if (Cookies.get('user_lang') == 'en') {
-                data.lang = 'en';
-            } else {
-                data.lang = 'zh';
-            }
-            createScript(data).then(resp => {
-                this.reloadTable();
-                this.$message.success('创建实操试题成功');
-            }).catch(error => {
-                this.$messageBox(`创建实操试题失败: ${error.message}`);
-            });
-        },
-        handleConfirmModify(data) {
-            updateScript(data.id, data).then(resp => {
-                this.reloadTable();
-                this.$message.success('修改实操试题成功');
-            }).catch(error => {
-                this.$messageBox(`修改实操试题失败: ${error.message}`);
-            });
-        }
-    }
-};
-</script>
diff --git a/src/views/competitionManage/setExamTime.vue b/src/views/competitionManage/setExamTime.vue
index 1276e6079..057f4039e 100644
--- a/src/views/competitionManage/setExamTime.vue
+++ b/src/views/competitionManage/setExamTime.vue
@@ -2,10 +2,10 @@
   <el-dialog :visible.sync="dialogVisible" :before-close="handleClose" title="试卷导出" width="500px">
     <el-form ref="form" :model="form" label-width="150px" :rules="rules">
       <el-form-item label="理论竞赛时长:" prop="theoryExamTime">
-        <el-input-number v-model="form.theoryExamTime" controls-position :min="1" /><span>&nbsp&nbsp分</span>
+        <el-input-number v-model="form.theoryExamTime" controls-position :min="1" /><span>&nbsp;&nbsp;分</span>
       </el-form-item>
       <el-form-item label="实操竞赛时长:" prop="operateExamTime">
-        <el-input-number v-model="form.operateExamTime" controls-position :min="1" /><span>&nbsp&nbsp分</span>
+        <el-input-number v-model="form.operateExamTime" controls-position :min="1" /><span>&nbsp;&nbsp;分</span>
       </el-form-item>
       <el-form-item>
         <el-button type="primary" @click="handleExport">导出</el-button>
diff --git a/src/views/components/PopMenu/index.vue b/src/views/components/PopMenu/index.vue
index 31f0832d3..bdb8f0a54 100644
--- a/src/views/components/PopMenu/index.vue
+++ b/src/views/components/PopMenu/index.vue
@@ -90,126 +90,126 @@ import { checkRectCollision } from '@/utils/index';
 import { EventBus } from '@/scripts/event-bus';
 
 export default {
-	name: 'PopMenu',
-	props: {
-		menu: {
-			type: Array,
-			required: true
-		}
-	},
-	data() {
-		return {
-			show: false,
-			defaultFontSize: 14,
-			tPosition: {
-				x: -1000,
-				y: -1000
-			},
-			height: 'auto'
-		};
-	},
-	computed: {
-		width() {
-			let fontNum = 0;
-			this.menu.forEach(elem => {
-				if (elem.label && elem.label.length > fontNum) {
-					fontNum = elem.label.length;
-				}
-			});
-			var width = fontNum * this.defaultFontSize + 40 + 'px';
-			return width;
-		}
-	},
-	mounted() {
-		EventBus.$on('closeMenu', () => {
-			this.$nextTick(() => {
-				this.show = false;
-			});
-		});
-	},
-	methods: {
-		resetShowPosition(point) {
-			if (point) {
-				this.show = true;
-				const self = this;
-				this.$nextTick(() => {
-					const gutter = 3;
-					// 位置
-					const height = self.$el.clientHeight;
-					const width = self.$el.clientWidth;
-					let px = 0;
-					let py = 0;
-					if (point.x + width > document.documentElement.clientWidth) {
-						px = document.documentElement.clientWidth - width - gutter;
-					} else {
-						px = point.x;
-					}
-					if (point.y + height > document.documentElement.clientHeight) {
-						py = document.documentElement.clientHeight - height - gutter;
-					} else {
-						py = point.y;
-					}
-					// 处理和提示框重叠问题
-					const popTipDialog = document.getElementById('pop_tip_dialog');
-					if (popTipDialog) {
-						const tipRect = {
-							point: { x: popTipDialog.offsetLeft, y: popTipDialog.offsetTop },
-							width: popTipDialog.offsetWidth,
-							height: popTipDialog.offsetHeight
-						};
-						const menuRect = {
-							point: { x: px, y: py },
-							width: self.$el.offsetWidth,
-							height: self.$el.offsetHeight
-						};
-						const collision = checkRectCollision(tipRect, menuRect);
-						// 若重叠，调整位置
-						if (collision) {
-							px = tipRect.point.x + tipRect.width + gutter;
-							if (px + width > document.documentElement.clientWidth) {
-								px = tipRect.point.x - menuRect.width - gutter;
-							}
-						}
-					}
-					self.tPosition.x = px;
-					self.tPosition.y = py;
-				});
-			}
-		},
-		close() {
-			this.show = false;
-		},
-		checkIfDisabled(menuObj) {
-			return menuObj.disabled === true;
-		},
-		isShow(menuObj) {
-			if (typeof (menuObj.show) == 'undefined') {
-				return true;
-			} else {
-				return menuObj.show;
-			}
-		},
-		calculateSubWidth(item) {
-			const children = item.children;
-			let width = 0;
-			let fontNum = 0;
-			children.forEach(elem => {
-				if (elem.label.length > fontNum) {
-					fontNum = elem.label.length;
-				}
-			});
-			width = fontNum * this.defaultFontSize + 20 + 'px';
-			return width;
-		},
-		openLoadFile(item) {
-			const obj = this.$refs[item.label][0];
-			if (obj.files) {
-				const file = obj.files[0];
-				item.handler(file);
-				obj.value = '';
-			}
-		}
-	}
+    name: 'PopMenu',
+    props: {
+        menu: {
+            type: Array,
+            required: true
+        }
+    },
+    data() {
+        return {
+            show: false,
+            defaultFontSize: 14,
+            tPosition: {
+                x: -1000,
+                y: -1000
+            },
+            height: 'auto'
+        };
+    },
+    computed: {
+        width() {
+            let fontNum = 0;
+            this.menu.forEach(elem => {
+                if (elem.label && elem.label.length > fontNum) {
+                    fontNum = elem.label.length;
+                }
+            });
+            var width = fontNum * this.defaultFontSize + 40 + 'px';
+            return width;
+        }
+    },
+    mounted() {
+        EventBus.$on('closeMenu', () => {
+            this.$nextTick(() => {
+                this.show = false;
+            });
+        });
+    },
+    methods: {
+        resetShowPosition(point) {
+            if (point) {
+                this.show = true;
+                const self = this;
+                this.$nextTick(() => {
+                    const gutter = 3;
+                    // 位置
+                    const height = self.$el.clientHeight;
+                    const width = self.$el.clientWidth;
+                    let px = 0;
+                    let py = 0;
+                    if (point.x + width > document.documentElement.clientWidth) {
+                        px = document.documentElement.clientWidth - width - gutter;
+                    } else {
+                        px = point.x;
+                    }
+                    if (point.y + height > document.documentElement.clientHeight) {
+                        py = document.documentElement.clientHeight - height - gutter;
+                    } else {
+                        py = point.y;
+                    }
+                    // 处理和提示框重叠问题
+                    const popTipDialog = document.getElementById('pop_tip_dialog');
+                    if (popTipDialog) {
+                        const tipRect = {
+                            point: { x: popTipDialog.offsetLeft, y: popTipDialog.offsetTop },
+                            width: popTipDialog.offsetWidth,
+                            height: popTipDialog.offsetHeight
+                        };
+                        const menuRect = {
+                            point: { x: px, y: py },
+                            width: self.$el.offsetWidth,
+                            height: self.$el.offsetHeight
+                        };
+                        const collision = checkRectCollision(tipRect, menuRect);
+                        // 若重叠，调整位置
+                        if (collision) {
+                            px = tipRect.point.x + tipRect.width + gutter;
+                            if (px + width > document.documentElement.clientWidth) {
+                                px = tipRect.point.x - menuRect.width - gutter;
+                            }
+                        }
+                    }
+                    self.tPosition.x = px;
+                    self.tPosition.y = py;
+                });
+            }
+        },
+        close() {
+            this.show = false;
+        },
+        checkIfDisabled(menuObj) {
+            return menuObj.disabled === true;
+        },
+        isShow(menuObj) {
+            if (typeof (menuObj.show) == 'undefined') {
+                return true;
+            } else {
+                return menuObj.show;
+            }
+        },
+        calculateSubWidth(item) {
+            const children = item.children;
+            let width = 0;
+            let fontNum = 0;
+            children.forEach(elem => {
+                if (elem.label.length > fontNum) {
+                    fontNum = elem.label.length;
+                }
+            });
+            width = fontNum * this.defaultFontSize + 20 + 'px';
+            return width;
+        },
+        openLoadFile(item) {
+            const obj = this.$refs[item.label][0];
+            if (obj.files) {
+                const file = obj.files[0];
+                item.handler(file);
+                obj.value = '';
+            }
+        }
+    }
 };
 </script>
 
diff --git a/src/views/components/filterCity/index.vue b/src/views/components/filterCity/index.vue
index b634951a9..ee13c9e20 100644
--- a/src/views/components/filterCity/index.vue
+++ b/src/views/components/filterCity/index.vue
@@ -9,7 +9,7 @@
 </template>
 
 <script>
-import { publisMapCityList} from '@/api/designPlatform';
+import { publisMapCityList} from '@/api/jmap/map';
 
 import localStore from 'storejs';
 
diff --git a/src/views/components/pay/finish.vue b/src/views/components/pay/finish.vue
index d816e6dd2..7cd0b3c8b 100644
--- a/src/views/components/pay/finish.vue
+++ b/src/views/components/pay/finish.vue
@@ -32,50 +32,50 @@
 import img_pay_fail from '@/assets/pay_images/PayFail.png';
 import img_pay_success from '@/assets/pay_images/PaySuccess.png';
 export default {
-	name: 'FinishDraft',
-	props: {
-		finishStatus: {
-			type: String,
-			required: true
-		}
-	},
-	data() {
-		return {
-			count: 0,
-			maxTime: 5,
-			timer: null,
-			images: {
-				img_pay_fail,
-				img_pay_success
-			}
-		};
-	},
-	beforeDestroy() {
-		this.destroy();
-	},
-	methods: {
-		// 设置计时器，maxTime后返回
-		createCountTimer() {
-			const that = this;
-			// 如果计时器已存在，则先注销
-			this.destroy();
-			// 重新创建定时器
-			if (this.timer == null) {
-				this.count = this.maxTime;
-				this.timer = setInterval(() => {
-					(that.count-- <= 0) && that.finish();
-				}, 1000);
-			}
-		},
-		// 返回到课程首页
-		finish() {
-			this.$emit('finish');
-		},
-		// 注销计时器
-		destroy() {
-			clearInterval(this.timer);
-			this.timer = null;
-		}
-	}
+    name: 'FinishDraft',
+    props: {
+        finishStatus: {
+            type: String,
+            required: true
+        }
+    },
+    data() {
+        return {
+            count: 0,
+            maxTime: 5,
+            timer: null,
+            images: {
+                img_pay_fail,
+                img_pay_success
+            }
+        };
+    },
+    beforeDestroy() {
+        this.destroy();
+    },
+    methods: {
+        // 设置计时器，maxTime后返回
+        createCountTimer() {
+            const that = this;
+            // 如果计时器已存在，则先注销
+            this.destroy();
+            // 重新创建定时器
+            if (this.timer == null) {
+                this.count = this.maxTime;
+                this.timer = setInterval(() => {
+                    (that.count-- <= 0) && that.finish();
+                }, 1000);
+            }
+        },
+        // 返回到课程首页
+        finish() {
+            this.$emit('finish');
+        },
+        // 注销计时器
+        destroy() {
+            clearInterval(this.timer);
+            this.timer = null;
+        }
+    }
 };
 </script>
diff --git a/src/views/components/progressBar/index.vue b/src/views/components/progressBar/index.vue
index 7df3d9acc..6411e7093 100644
--- a/src/views/components/progressBar/index.vue
+++ b/src/views/components/progressBar/index.vue
@@ -14,8 +14,6 @@
 </template>
 
 <script>
-// import { requestAnimationFrame, cancelRequestAnimFrame } from '@/utils/animation';
-
 export default {
     name: 'ProgressBar',
     props: {
diff --git a/src/views/components/quickMenu/index.vue b/src/views/components/quickMenu/index.vue
index 5ad6b1ba3..f7f40c622 100644
--- a/src/views/components/quickMenu/index.vue
+++ b/src/views/components/quickMenu/index.vue
@@ -1,175 +1,186 @@
 <template>
-    <div class="quick-menu" ref="quickMenu" :style="quickMenuStyle">
-        <div v-for="(n,key) in menuCount" class="sub-menu" :style="getSubMenu(n-1)">
-            <router-link v-if="menuUrlList[n-1].isLink" :to="menuUrlList[n-1].url" :target="openNewTab"
-                :style="subMenuStyle" @mouseover.stop="mouseEnterSubMenu" @mouseout.stop="mouseOutSubMenu">
-                <i :class="iconClass[n-1]" ref="icon"></i>
-            </router-link>
-            <a v-else :style="subMenuStyle" @mouseover.stop="mouseEnterSubMenu" @mouseout.stop="mouseOutSubMenu"
-                @click="processCallback(key)">
-                <i :class="iconClass[n-1]" ref="icon"></i>
-            </a>
+  <div ref="quickMenu" class="quick-menu" :style="quickMenuStyle">
+    <div v-for="(n,key) in menuCount" :key="key" class="sub-menu" :style="getSubMenu(n-1)">
+      <router-link
+        v-if="menuUrlList[n-1].isLink"
+        :to="menuUrlList[n-1].url"
+        :target="openNewTab"
+        :style="subMenuStyle"
+        @mouseover.stop="mouseEnterSubMenu"
+        @mouseout.stop="mouseOutSubMenu"
+      >
+        <i ref="icon" :class="iconClass[n-1]" />
+      </router-link>
+      <a
+        v-else
+        :style="subMenuStyle"
+        @mouseover.stop="mouseEnterSubMenu"
+        @mouseout.stop="mouseOutSubMenu"
+        @click="processCallback(key)"
+      >
+        <i ref="icon" :class="iconClass[n-1]" />
+      </a>
 
-        </div>
-
-        <div class='menu' :style="menuStyle">
-            <div class='core-menu' @click="toggleMenu">
-                <div class='bar'></div>
-            </div>
-        </div>
     </div>
+
+    <div class="menu" :style="menuStyle">
+      <div class="core-menu" @click="toggleMenu">
+        <div class="bar" />
+      </div>
+    </div>
+  </div>
 </template>
 <script>
-    export default {
-        name: 'quickMenu',
-        props: {
-            menuCount: {
-                type: Number,
-                required: true,
-                default: 4
-            },
-            iconClass: {
-                type: Array,
-                required: true
-            },
-            menuUrlList: {
-                type: Array,
-                required: true
-            },
-            backgroundColor: {
-                type: String,
-                default: '#20babb'
-            },
-            color: {
-                type: String,
-                default: '#fff'
-            },
-            isOpenNewTab: {
-                type: Boolean,
-                default: false
-            },
-            position: {
-                type: String,
-                default: 'top-left'
-            }
+export default {
+    name: 'QuickMenu',
+    props: {
+        menuCount: {
+            type: Number,
+            required: true,
+            default: 4
         },
-        computed: {
-            openNewTab() {
-                return this.isOpenNewTab ? '_blank' : '_self'
-            },
-            quickMenuStyle() {
-                const topPosition = { top: '30px' },
-                    bottomPosition = { bottom: '30px' },
-                    leftPosition = { left: '30px' },
-                    rightPosition = { right: '30px' }
-
-                let style = this.isTop ? topPosition : bottomPosition
-                Object.assign(style, this.isLeft ? leftPosition : rightPosition)
-                Object.assign(style, { transform: this.isLeft ? "rotate(-180deg)" : "rotate(180deg)" })
-                return style
-            },
-            menuStyle() {
-                return {
-                    backgroundColor: this.backgroundColor,
-                    color: this.color
-                }
-            },
-            subMenuStyle() {
-                const style = {
-                    backgroundColor: this.backgroundColor,
-                    color: this.color
-                }
-                return style
-            },
-
-            isTop() {
-                return !!~this.position.toLowerCase().indexOf('top')
-            },
-            isLeft() {
-                return !!~this.position.toLowerCase().indexOf('left')
-            }
+        iconClass: {
+            type: Array,
+            required: true
         },
-        data() {
+        menuUrlList: {
+            type: Array,
+            required: true
+        },
+        backgroundColor: {
+            type: String,
+            default: '#20babb'
+        },
+        color: {
+            type: String,
+            default: '#fff'
+        },
+        isOpenNewTab: {
+            type: Boolean,
+            default: false
+        },
+        position: {
+            type: String,
+            default: 'top-left'
+        }
+    },
+    data() {
+        return {
+            menuSize: 60,
+            subMenu4: [[['0', '-160'], ['-80', '-138.6'], ['-138.6', '-80'], ['-160', '0']], [['0', '-160'], ['80', '-138.6'], ['138.6', '-80'], ['160', '0']], [['0', '160'], ['138.6', '80'], ['80', '138.6'], ['160', '0']], [['-160', '0'], ['-138.6', '80'], ['-80', '138.6'], ['0', '160']]],
+            subMenu3: [[['-160', '0'], ['-113', '-113'], ['0', '-160']], [['0', '-160'], ['113', '-113'], ['160', '0']], [['0', '160'], ['113', '113'], ['160', '0']], [['-160', '0'], ['-113', '113'], ['0', '160']]],
+            subMenu2: [[['-160', '0'], ['0', '-160']], [['0', '-160'], ['160', '0']], [['0', '160'], ['160', '0']], [['-160', '0'], ['0', '160']]]
+        };
+    },
+    computed: {
+        openNewTab() {
+            return this.isOpenNewTab ? '_blank' : '_self';
+        },
+        quickMenuStyle() {
+            const topPosition = { top: '30px' };
+            const bottomPosition = { bottom: '30px' };
+            const leftPosition = { left: '30px' };
+            const rightPosition = { right: '30px' };
+
+            const style = this.isTop ? topPosition : bottomPosition;
+            Object.assign(style, this.isLeft ? leftPosition : rightPosition);
+            Object.assign(style, { transform: this.isLeft ? 'rotate(-180deg)' : 'rotate(180deg)' });
+            return style;
+        },
+        menuStyle() {
             return {
-                menuSize: 60,
-                subMenu4: [[["0", "-160"], ["-80", "-138.6"], ["-138.6", "-80"], ["-160", "0"]], [["0", "-160"], ["80", "-138.6"], ["138.6", "-80"], ["160", "0"]], [["0", "160"], ["138.6", "80"], ["80", "138.6"], ["160", "0"]], [["-160", "0"], ["-138.6", "80"], ["-80", "138.6"], ["0", "160"]]],
-                subMenu3: [[["-160", "0"], ["-113", "-113"], ["0", "-160"]], [["0", "-160"], ["113", "-113"], ["160", "0"]], [["0", "160"], ["113", "113"], ["160", "0"]], [["-160", "0"], ["-113", "113"], ["0", "160"]]],
-                subMenu2: [[["-160", "0"], ["0", "-160"]], [["0", "-160"], ["160", "0"]], [["0", "160"], ["160", "0"]], [["-160", "0"], ["0", "160"]]]
-            }
+                backgroundColor: this.backgroundColor,
+                color: this.color
+            };
+        },
+        subMenuStyle() {
+            const style = {
+                backgroundColor: this.backgroundColor,
+                color: this.color
+            };
+            return style;
         },
-        methods: {
-            getSubMenu(n) {
-                let menuPosition = this.menuCount === 4 ? this.subMenu4 : this.menuCount === 3 ? this.subMenu3 : this.subMenu2
-                menuPosition = this.isTop && this.isLeft ? menuPosition[2] : this.isTop && !this.isLeft ? menuPosition[1] : !this.isTop && this.isLeft ? menuPosition[3] : menuPosition[0]
-                return { top: menuPosition[n][0] + 'px', left: menuPosition[n][1] + 'px' }
-            },
-            toggleMenu(e) {
-                let menuEl = this.$refs.quickMenu
-                let menuIconEl = this.$refs.icon
-                if (!~menuEl.className.indexOf(' active')) {
-                    menuEl.className += ' active';
-                    menuIconEl.forEach(function (element, index) {
-                        element.className += ' menu-animate';
-                    });
-                } else {
-                    menuEl.className = menuEl.className.replace(' active', '')
-                    menuIconEl.forEach(function (element, index) {
-                        element.className = element.className.replace(' menu-animate', '')
-                    });
-                }
 
-            },
-            processCallback(key) {
-                this.$emit('process', key)
-            },
-            mouseEnterSubMenu(e) {
-                if (e.target.tagName === 'A') {
-                    e.target.style.backgroundColor = this.lightenColor(this.backgroundColor, 20)
-                    // e.target.firstElementChild.style.backgroundColor = this.lightenColor(this.backgroundColor, 20)
-                } else if (e.target.tagName === 'I') {
-                    e.target.parentElement.style.backgroundColor = this.lightenColor(this.backgroundColor, 20)
-                    // e.target.style.backgroundColor = this.lightenColor(this.backgroundColor, 20)
-                }
-
-            },
-            mouseOutSubMenu(e) {
-                if (e.target.tagName === 'A') {
-                    e.target.style.backgroundColor = this.backgroundColor
-                    // e.target.firstElementChild.style.backgroundColor = this.backgroundColor
-                } else if (e.target.tagName === 'I') {
-                    e.target.parentElement.style.backgroundColor = this.backgroundColor
-                    // e.target.style.backgroundColor = this.backgroundColor
-                }
-
-            },
-            lightenColor(hex, amt) {
-
-                var usePound = false
-
-                if (hex[0] === '#') {
-                    hex = hex.slice(1)
-                    usePound = true
-                }
-
-                var num = parseInt(hex, 16)
-                var r = (num >> 16) + amt
-
-                if (r > 255) r = 255
-                else if (r < 0) r = 0
-
-                var b = ((num >> 8) & 0x00FF) + amt
-
-                if (b > 255) b = 255
-                else if (b < 0) b = 0
-
-                var g = (num & 0x0000FF) + amt
-
-                if (g > 255) g = 255
-                else if (g < 0) g = 0
-                return (usePound ? '#' : '') + (g | (b << 8) | (r << 16)).toString(16)
+        isTop() {
+            return !!~this.position.toLowerCase().indexOf('top');
+        },
+        isLeft() {
+            return !!~this.position.toLowerCase().indexOf('left');
+        }
+    },
+    methods: {
+        getSubMenu(n) {
+            let menuPosition = this.menuCount === 4 ? this.subMenu4 : this.menuCount === 3 ? this.subMenu3 : this.subMenu2;
+            menuPosition = this.isTop && this.isLeft ? menuPosition[2] : this.isTop && !this.isLeft ? menuPosition[1] : !this.isTop && this.isLeft ? menuPosition[3] : menuPosition[0];
+            return { top: menuPosition[n][0] + 'px', left: menuPosition[n][1] + 'px' };
+        },
+        toggleMenu(e) {
+            const menuEl = this.$refs.quickMenu;
+            const menuIconEl = this.$refs.icon;
+            if (!~menuEl.className.indexOf(' active')) {
+                menuEl.className += ' active';
+                menuIconEl.forEach(function (element, index) {
+                    element.className += ' menu-animate';
+                });
+            } else {
+                menuEl.className = menuEl.className.replace(' active', '');
+                menuIconEl.forEach(function (element, index) {
+                    element.className = element.className.replace(' menu-animate', '');
+                });
             }
+
+        },
+        processCallback(key) {
+            this.$emit('process', key);
+        },
+        mouseEnterSubMenu(e) {
+            if (e.target.tagName === 'A') {
+                e.target.style.backgroundColor = this.lightenColor(this.backgroundColor, 20);
+                // e.target.firstElementChild.style.backgroundColor = this.lightenColor(this.backgroundColor, 20)
+            } else if (e.target.tagName === 'I') {
+                e.target.parentElement.style.backgroundColor = this.lightenColor(this.backgroundColor, 20);
+                // e.target.style.backgroundColor = this.lightenColor(this.backgroundColor, 20)
+            }
+
+        },
+        mouseOutSubMenu(e) {
+            if (e.target.tagName === 'A') {
+                e.target.style.backgroundColor = this.backgroundColor;
+                // e.target.firstElementChild.style.backgroundColor = this.backgroundColor
+            } else if (e.target.tagName === 'I') {
+                e.target.parentElement.style.backgroundColor = this.backgroundColor;
+                // e.target.style.backgroundColor = this.backgroundColor
+            }
+
+        },
+        lightenColor(hex, amt) {
+
+            var usePound = false;
+
+            if (hex[0] === '#') {
+                hex = hex.slice(1);
+                usePound = true;
+            }
+
+            var num = parseInt(hex, 16);
+            var r = (num >> 16) + amt;
+
+            if (r > 255) r = 255;
+            else if (r < 0) r = 0;
+
+            var b = ((num >> 8) & 0x00FF) + amt;
+
+            if (b > 255) b = 255;
+            else if (b < 0) b = 0;
+
+            var g = (num & 0x0000FF) + amt;
+
+            if (g > 255) g = 255;
+            else if (g < 0) g = 0;
+            return (usePound ? '#' : '') + (g | (b << 8) | (r << 16)).toString(16);
         }
     }
+};
 </script>
 <style rel="stylesheet/scss" lang="scss" scoped>
     @import "src/styles/mixin.scss";
@@ -445,4 +456,4 @@
             transform: translateY(-2px);
         }
     }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/views/components/systemTime/point.vue b/src/views/components/systemTime/point.vue
index 6d03098c4..87805cf6e 100644
--- a/src/views/components/systemTime/point.vue
+++ b/src/views/components/systemTime/point.vue
@@ -7,21 +7,21 @@
 
 <script>
 export default {
-	name: 'Point',
-	props: {
-		zoom: {
-			type: Number,
-			required: true
-		},
-		fine: {
-			type: Number,
-			required: true
-		},
-		color: {
-			type: String,
-			required: true
-		}
-	}
+    name: 'Point',
+    props: {
+        zoom: {
+            type: Number,
+            required: true
+        },
+        fine: {
+            type: Number,
+            required: true
+        },
+        color: {
+            type: String,
+            required: true
+        }
+    }
 };
 </script>
 
diff --git a/src/views/components/systemTime/separator.vue b/src/views/components/systemTime/separator.vue
index 555734ca3..34121c49e 100644
--- a/src/views/components/systemTime/separator.vue
+++ b/src/views/components/systemTime/separator.vue
@@ -9,35 +9,35 @@
 import Point from './point';
 
 export default {
-	name: 'Separator',
-	components: {
-		Point
-	},
-	props: {
-		zoom: {
-			type: Number,
-			required: true
-		},
-		fine: {
-			type: Number,
-			required: true
-		},
-		color: {
-			type: String,
-			required: true
-		}
-	},
-	computed: {
-		p() {
-			return this.fine * 1;
-		},
-		w() {
-			return this.fine * 4;
-		},
-		h() {
-			return this.zoom * 8 + this.fine * 6 + this.p*2;
-		}
-	}
+    name: 'Separator',
+    components: {
+        Point
+    },
+    props: {
+        zoom: {
+            type: Number,
+            required: true
+        },
+        fine: {
+            type: Number,
+            required: true
+        },
+        color: {
+            type: String,
+            required: true
+        }
+    },
+    computed: {
+        p() {
+            return this.fine * 1;
+        },
+        w() {
+            return this.fine * 4;
+        },
+        h() {
+            return this.zoom * 8 + this.fine * 6 + this.p * 2;
+        }
+    }
 };
 </script>
 
diff --git a/src/views/demonstration/deomonList/index.vue b/src/views/demonstration/deomonList/index.vue
index 81fe6b297..11307b1fb 100644
--- a/src/views/demonstration/deomonList/index.vue
+++ b/src/views/demonstration/deomonList/index.vue
@@ -42,8 +42,6 @@
 </template>
 
 <script>
-import { getjointTrainList, getjointTraining, putJointTrainingSimulationEntrance } from '@/api/chat';
-import { getPublishMapInfo } from '@/api/jmap/map';
 import { getSimulationListCantainUser } from '@/api/jointSimulation';
 import { launchFullscreen } from '@/utils/screen';
 import { getToken } from '@/utils/auth';
@@ -116,17 +114,9 @@ export default {
         },
         async handleJoinRoom(data) {
             try {
-                const rest = await getPublishMapInfo(data.map.id);
                 launchFullscreen();
-                if (rest.data.drawWay) {
-                    const query = { lineCode: data.map.lineCode, mapId: data.map.id, group: data.group};
-                    this.$router.push({path:'/jointTrainingNew', query:query});
-                } else {
-                    await getjointTraining(data.group);
-                    const query = { group: data.group, drawWay: rest.data.drawWay };
-                    this.$router.push({ path: `/trainroom`, query: query });
-                }
-
+                const query = { lineCode: data.map.lineCode, mapId: data.map.id, group: data.group};
+                this.$router.push({path:'/jointTrainingNew', query:query});
             } catch (e) {
                 console.error(e);
             } finally {
diff --git a/src/views/demonstration/deomonTopic/index.vue b/src/views/demonstration/deomonTopic/index.vue
index 1ad920cf1..30d7a100c 100644
--- a/src/views/demonstration/deomonTopic/index.vue
+++ b/src/views/demonstration/deomonTopic/index.vue
@@ -19,7 +19,6 @@
 
 <script>
 import { launchFullscreen } from '@/utils/screen';
-import { getjointTraining, putJointTrainingSimulationEntrance } from '@/api/chat';
 import { getPublishMapInfo } from '@/api/jmap/map';
 import { getToken } from '@/utils/auth';
 import { creatSubscribe, clearSubscribe, roomTopic} from '@/utils/stomp';
@@ -75,25 +74,10 @@ export default {
         async handleJoin() {
             try {
                 this.loading = true;
-                const rest = await getPublishMapInfo(this.mapId);
-                const drawWay = rest.data.drawWay;
-                if (drawWay) {
-                    launchFullscreen();
-                    const query = { lineCode: this.lineCode, mapId: this.mapId, group: this.group};
-                    this.$router.push({path: `/jointTrainingNew`, query: query});
-                } else {
-                    await getjointTraining(this.group);
-                    if (this.state == '02') {
-                        this.subscribe();
-                        launchFullscreen();
-                        const query = { lineCode: rest.data.lineCode, mapId: this.mapId, group: this.group, drawWay: drawWay };
-                        await putJointTrainingSimulationEntrance(this.group);
-                        this.$router.push({ path: `/jointTraining`, query: query });
-                    } else if (this.state == '01') {
-                        const query = { group: this.group, drawWay: drawWay };
-                        this.$router.push({ path: `/trainroom`, query: query });
-                    }
-                }
+                await getPublishMapInfo(this.mapId);
+                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'));
diff --git a/src/views/demonstration/detail/index.vue b/src/views/demonstration/detail/index.vue
index b46685f37..567debf20 100644
--- a/src/views/demonstration/detail/index.vue
+++ b/src/views/demonstration/detail/index.vue
@@ -17,8 +17,6 @@
       <el-button v-if="!isLocal" type="success" :disabled="disabled" @click="buy">{{ $t('global.buy') }}</el-button>
       <el-button v-if="hasPermssion && !isComprehensive && !isLocal" type="primary" :disabled="disabled" @click="distribute">{{ $t('global.distributePermission') }}</el-button>
       <el-button v-show="isStartDemon" :disabled="disabled" type="primary" @click="start">{{ $t('demonstration.startSimulation') }}</el-button>
-      <el-button v-show="isCreateRoom" :disabled="disabled" type="primary" @click="start">{{ $t('demonstration.createRoom') }}</el-button>
-      <el-button v-show="isInRoom" :disabled="disabled" type="primary" @click="joinRoom">{{ $t('demonstration.enterRoom') }}</el-button>
     </div>
   </div>
 </template>
@@ -28,12 +26,11 @@ import { getPublishMapInfo } from '@/api/jmap/map';
 import { getGoodsTryUse } from '@/api/management/goods';
 import { PermissionType, UrlConfig } from '@/scripts/ConstDic';
 import { launchFullscreen } from '@/utils/screen';
-import { simulationNotify, schedulingNotify, createSimulationNew } from '@/api/simulation';
+import { createSimulationNew } from '@/api/simulation';
 import LimitList from '@/views/components/limits/index';
 import { getSubSystemDetail } from '@/api/trainingPlatform';
 import { getSessionStorage } from '@/utils/auth';
 import localStore from 'storejs';
-import { postCreateRoom, getjointTraining } from '@/api/chat';
 import { checkRoomExistNew } from '@/api/jointTraining';
 
 export default {
@@ -63,7 +60,6 @@ export default {
             jointShow: false,
             jointGroup: '',
             lineCode:'',
-            drawWay: false, // 是否新版地图
             loadingProjectList: ['login', 'design', 'xty', 'designxty', 'gzb', 'designxty', 'xadt', 'designxadt', 'drts', 'designdrts']
         };
     },
@@ -88,19 +84,13 @@ export default {
             return this.courseModel.prdType === '03';
         },
         isStartDemon() {
-            return (this.hasPermssion || this.tryTime > 0) && !(this.courseModel.prdType === '03' && !this.drawWay);
+            return (this.hasPermssion || this.tryTime > 0);
         },
         mapId() {
             return this.$route.query.mapId;
         },
         project() {
             return getSessionStorage('project');
-        },
-        isCreateRoom() {
-            return this.courseModel.prdType === '03' && this.hasPermssion && !this.jointShow && !this.drawWay;
-        },
-        isInRoom() {
-            return this.courseModel.prdType === '03' && this.hasPermssion && this.jointShow && !this.drawWay;
         }
     },
     watch: {
@@ -130,7 +120,6 @@ export default {
                 const resp = await getSubSystemDetail(this.$route.params.subSystem);
                 this.tryUser = 0;
                 this.loading = false;
-                this.drawWay = res.data.drawWay;
                 const remarksList = {
                     '01':'ATS现地工作站原理级仿真系统，实现车站值班员培训功能。',
                     '02':'ATS行调工作站原理级仿真系统，实现行车调度员培训功能。',
@@ -151,9 +140,6 @@ export default {
                     PermissionType: PermissionType.SIMULATION
                 };
                 this.currentPrdType = resp.data.prdType;
-                if (resp.data.prdType === '03' && !this.drawWay) {
-                    this.getJointTrainingList();
-                }
                 if (!this.courseModel.pmsList) {
                     this.tryUser = 1;
                     const paras = {
@@ -196,43 +182,10 @@ export default {
                 console.error(error, '获取是否拥有综合演练房间');
             }
         },
-        async joinRoom() {
-            this.disabled = true;
-            await getjointTraining(this.jointGroup);
-            this.$store.dispatch('socket/setInRoom', true);
-            const query = { lineCode: this.courseModel.lineCode, group: this.jointGroup, drawWay: this.drawWay};
-            this.$router.push({ path: `/trainroom`, query: query });
-        },
-        async createRoom() {
-            try {
-                this.disabled = true;
-                const param = {
-                    mapId: Number(this.mapId),
-                    prdType: this.courseModel.prdType
-                };
-                const res = await postCreateRoom(param);
-                if (res && res.code == 200) {
-                    const query = { lineCode: this.courseModel.lineCode, group: res.data, drawWay: this.drawWay };
-                    this.$router.push({ path: `/trainroom`, query: query });
-                }
-            } catch (error) {
-                this.disabled = false;
-                if (error.code == 20001) {
-                    this.$confirm(this.$t('tip.createRoomFailedHint'), this.$t('global.tips'), {
-                        confirmButtonText: this.$t('global.confirm'),
-                        cancelButtonText: this.$t('global.cancel'),
-                        type: 'warning'
-                    }).then(() => {}).catch(() => {});
-                }
-                if (error.code == 500009) {
-                    this.$messageBox(error.message);
-                }
-            }
-        },
         async enterIntegratedSimulation() {
             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, drawWay: true };
+                const query = { lineCode: this.courseModel.lineCode, group: resp.data, mapId: this.courseModel.mapId};
                 if (this.loadingProjectList.includes(this.project)) {
                     this.$store.dispatch('app/transitionAnimations');
                 }
@@ -248,11 +201,7 @@ export default {
                 this.disabled = true;
                 const data = { mapId: this.courseModel.mapId, prdType: this.currentPrdType, lineCode: this.courseModel.lineCode };
                 let res = {};
-                if (!this.drawWay) {
-                    res = await simulationNotify(data);
-                } else {
-                    res = await createSimulationNew(data);
-                }
+                res = await createSimulationNew(data);
                 if (res && res.code == 200) {
                     const query = { group: res.data, lineCode:this.courseModel.lineCode };
                     this.$router.push({ path: `/displayIscs/system`, query: query });
@@ -278,8 +227,7 @@ export default {
             if (this.courseModel.prdType == '05') {
                 this.jumpScheduling();
             } else if (this.courseModel.prdType == '03') {
-                this.drawWay && this.enterIntegratedSimulation();
-                !this.drawWay && this.createRoom();
+                this.enterIntegratedSimulation();
             } else if (this.courseModel.prdType == '06') {
                 this.enterISCS();
             } else if (this.courseModel.prdType == '07') {
@@ -293,22 +241,14 @@ export default {
             setTimeout(() => {
                 const data = { mapId: this.courseModel.mapId, prdType: this.currentPrdType };
                 try {
-                    if (this.drawWay) {
-                        createSimulationNew(data).then(resp => {
-                            const query = { lineCode: this.courseModel.lineCode, group: resp.data, prdType: this.courseModel.prdType, mapId: this.courseModel.mapId, goodsId: this.goodsId, try: this.tryUser };
-                            if (this.loadingProjectList.includes(this.project)) {
-                                this.$store.dispatch('app/transitionAnimations');
-                            }
-                            this.$router.push({ path: `${UrlConfig.displayNew}/demon`, query: query });
-                            launchFullscreen();
-                        });
-                    } else {
-                        schedulingNotify(data).then(resp => {
-                            const query = { lineCode: this.courseModel.lineCode, group: resp.data, prdType: this.courseModel.prdType, mapId: this.courseModel.mapId, goodsId: this.goodsId, try: this.tryUser };
-                            this.$router.push({ path: `${UrlConfig.display}/demon`, query: query });
-                            launchFullscreen();
-                        });
-                    }
+                    createSimulationNew(data).then(resp => {
+                        const query = { lineCode: this.courseModel.lineCode, group: resp.data, prdType: this.courseModel.prdType, mapId: this.courseModel.mapId, goodsId: this.goodsId, try: this.tryUser };
+                        if (this.loadingProjectList.includes(this.project)) {
+                            this.$store.dispatch('app/transitionAnimations');
+                        }
+                        this.$router.push({ path: `${UrlConfig.displayNew}/demon`, query: query });
+                        launchFullscreen();
+                    });
                 } catch (e) {
                     this.$messageBox(this.$t('error.createSimulationFailed') + e.message);
                     this.disabled = false;
@@ -319,29 +259,18 @@ export default {
             this.disabled = true;
             setTimeout(() => {
                 const data = { mapId: this.courseModel.mapId, prdType: this.currentPrdType };
-                if (!this.drawWay) {
-                    simulationNotify(data).then(resp => {
-                        const query = { lineCode: this.courseModel.lineCode, group: resp.data, prdType: this.courseModel.prdType, mapId: this.courseModel.mapId, goodsId: this.goodsId, try: this.tryUser, project: this.project };
-                        this.$router.push({ path: `${UrlConfig.display}/demon`, query: query });
-                        launchFullscreen();
-                    }).catch(error => {
-                        this.$messageBox(this.$t('error.createSimulationFailed') + error.message);
-                        this.disabled = false;
-                    });
-                } else {
-                    createSimulationNew(data).then(resp => {
-                        const query = { lineCode: this.courseModel.lineCode, group: resp.data, prdType: this.courseModel.prdType, mapId: this.courseModel.mapId, goodsId: this.goodsId, try: this.tryUser, project: this.project };
-                        this.$store.dispatch('training/setPrdType', this.currentPrdType); // 改变prdType
-                        if (this.loadingProjectList.includes(this.project)) {
-                            this.$store.dispatch('app/transitionAnimations');
-                        }
-                        this.$router.push({ path: `${UrlConfig.displayNew}/demon`, query: query });
-                        launchFullscreen();
-                    }).catch(error => {
-                        this.$messageBox(this.$t('error.createSimulationFailed') + error.message);
-                        this.disabled = false;
-                    });
-                }
+                createSimulationNew(data).then(resp => {
+                    const query = { lineCode: this.courseModel.lineCode, group: resp.data, prdType: this.courseModel.prdType, mapId: this.courseModel.mapId, goodsId: this.goodsId, try: this.tryUser, project: this.project };
+                    this.$store.dispatch('training/setPrdType', this.currentPrdType); // 改变prdType
+                    if (this.loadingProjectList.includes(this.project)) {
+                        this.$store.dispatch('app/transitionAnimations');
+                    }
+                    this.$router.push({ path: `${UrlConfig.displayNew}/demon`, query: query });
+                    launchFullscreen();
+                }).catch(error => {
+                    this.$messageBox(this.$t('error.createSimulationFailed') + error.message);
+                    this.disabled = false;
+                });
             }, 100);
         },
         buy() {
diff --git a/src/views/designPlatform/demonList.vue b/src/views/designPlatform/demonList.vue
index 91f6a8a18..d6064243a 100644
--- a/src/views/designPlatform/demonList.vue
+++ b/src/views/designPlatform/demonList.vue
@@ -93,13 +93,13 @@ export default {
             switch (obj.type) {
             case 'scriptDesign': {
                 setSessionStorage('designType', 'scriptDesign');
-                const query = {lineCode:obj.lineCode, drawWay:obj.drawWay};
+                const query = {lineCode:obj.lineCode};
                 this.$router.push({ path: `${UrlConfig.design.scriptHome}/${obj.mapId}?`, query});
                 break;
             }
             case 'lessonDesign': {
                 setSessionStorage('designType', 'lessonDesign');
-                this.$router.push({ path: `${UrlConfig.design.lessonHome}/${obj.mapId}?lineCode=${obj.lineCode}&cityCode=${obj.cityCode}&drawWay=${data.parent.data.drawWay}` });
+                this.$router.push({ path: `${UrlConfig.design.lessonHome}/${obj.mapId}?lineCode=${obj.lineCode}&cityCode=${obj.cityCode}` });
                 break;
             }
             case 'runPlanDesign': {
@@ -112,11 +112,7 @@ export default {
                 break;
             }
             case 'mapPreview': {
-                if (obj.drawWay) {
-                    this.$router.push({ path: `${UrlConfig.design.mapPreviewNew}/${obj.mapId}` });
-                } else {
-                    this.$router.push({ path: `${UrlConfig.design.mapPreview}/${obj.mapId}` });
-                }
+                this.$router.push({ path: `${UrlConfig.design.mapPreviewNew}/${obj.mapId}` });
                 break;
             }
             case 'ibpDesign': {
@@ -155,8 +151,7 @@ export default {
                             name: this.$t('designPlatform.mapPreview'),
                             type: 'mapPreview',
                             mapId: elem.id,
-                            cityCode: elem.cityCode,
-                            drawWay: elem.drawWay
+                            cityCode: elem.cityCode
                         }
                     ];
                     this.isAdministrator() ? elem.children.push({id: '2', name: this.$t('designPlatform.lessonDesign'), type: 'lessonDesign', mapId: elem.id, cityCode: elem.cityCode, lineCode: elem.lineCode}) : '';
@@ -167,8 +162,7 @@ export default {
                             type: 'scriptDesign',
                             mapId: elem.id,
                             cityCode: elem.cityCode,
-                            lineCode: elem.lineCode,
-                            drawWay: elem.drawWay
+                            lineCode: elem.lineCode
                             // code:elem.children.find(n => { return n.name.includes("行调")})
                         });
                     elem.children.push(
diff --git a/src/views/designPlatform/mapPreview.vue b/src/views/designPlatform/mapPreview.vue
deleted file mode 100644
index bfbc19fb5..000000000
--- a/src/views/designPlatform/mapPreview.vue
+++ /dev/null
@@ -1,108 +0,0 @@
-<template>
-  <div class="map-view">
-    <jlmap-visual ref="jlmapVisual" />
-  </div>
-</template>
-<script>
-import JlmapVisual from '@/views/oldMap/jlmap/index';
-import { loadMapDataById } from '@/utils/loaddata';
-import { EventBus } from '@/scripts/event-bus';
-
-export default {
-    name: 'MapPreview',
-    components: {
-        JlmapVisual
-    },
-    props: {
-        widthLeft: {
-            type: Number,
-            required: true
-        }
-    },
-    data() {
-        return {
-            size: {
-                width: document.documentElement.clientWidth - 400,
-                height: document.documentElement.clientHeight - 80
-            }
-        };
-    },
-    computed: {
-        mapId() {
-            return this.$route.params.mapId;
-        },
-        height() {
-            return this.$store.state.app.height - 50 - 30;
-        }
-    },
-    watch: {
-        widthLeft(val) {
-            this.setWindowSize();
-        },
-        $route() {
-            this.$nextTick(() => {
-                this.initLoadData();
-            });
-        },
-        '$store.state.app.windowSizeCount': function() {
-            this.setWindowSize();
-        },
-        '$store.state.map.mapViewLoadedCount':function() {
-            this.$store.dispatch('map/setTrainWindowShow', false);
-        }
-    },
-    async beforeDestroy() {
-        await this.$store.dispatch('map/mapClear');
-    },
-    async mounted() {
-        await this.setWindowSize();
-        await this.initLoadData();
-    },
-    methods: {
-        async initLoadData() { // 加载地图数据
-            if (parseInt(this.mapId)) {
-                await this.loadMapDataById(this.mapId);
-            } else {
-                this.endViewLoading();
-            }
-        },
-        // 通过id加载地图数据
-        async loadMapDataById(mapId) {
-            try {
-                await this.$store.dispatch('training/changeMode', { mode: null });
-                loadMapDataById(mapId).then(()=>{
-                    this.$store.dispatch('training/over');
-                    this.$store.dispatch('training/setMapDefaultState');
-                    this.$store.dispatch('map/clearJlmapTrainView');
-                });
-            } catch (error) {
-                this.$messageBox(`获取地图数据失败: ${error.message}`);
-                this.endViewLoading();
-            }
-        },
-        // 结束加载状态
-        endViewLoading(isSuccess) {
-            if (!isSuccess) {
-                this.$store.dispatch('map/mapClear');
-            }
-
-            this.$nextTick(() => {
-                EventBus.$emit('viewLoading', false);
-            });
-        },
-        setWindowSize() {
-            this.$nextTick(() => {
-                const width = this.$store.state.app.width - (this.widthLeft || 450) - 2;
-                const height = this.height;
-                this.$store.dispatch('config/resize', { width, height });
-            });
-        }
-    }
-};
-</script>
-<style lang="scss" scoped>
-    .map-view {
-        float: left;
-        width: auto;
-    }
-</style>
diff --git a/src/views/designUser/demonList.vue b/src/views/designUser/demonList.vue
deleted file mode 100644
index 9420b0798..000000000
--- a/src/views/designUser/demonList.vue
+++ /dev/null
@@ -1,238 +0,0 @@
-<template>
-  <div v-loading="loading" class="joylink-card map-list-main">
-    <div class="clearfix">
-      <span>{{ $t('map.myMapList') }}</span>
-    </div>
-    <div class="text_item">
-      <el-input v-model="filterText" :placeholder="this.$t('global.filteringKeywords')" clearable />
-      <div class="tree_box">
-        <el-tree ref="tree" :data="treeList" node-key="id" :props="defaultProps" highlight-current :span="22" :filter-node-method="filterNode" @node-click="clickEvent" @node-contextmenu="showContextMenu">
-          <span slot-scope="{ node:tnode, data }">
-            <span class="el-icon-tickets" :style="{color: data.valid ? 'green':''}" />
-            <span>&nbsp;{{ tnode.label }}</span>
-          </span>
-        </el-tree>
-      </div>
-      <div class="buttonList">
-        <el-button size="small" type="primary" class="eachButton uploadDemo ">
-          <input ref="files" type="file" class="file_box" accept=".json, application/json" @change="importf">
-          {{ $t('map.importMap') }}
-        </el-button>
-        <el-button size="small" type="primary" class="eachButton" @click="createMap">{{ $t('map.newConstruction') }}</el-button>
-      </div>
-    </div>
-    <map-operate-menu
-      ref="menu"
-      :point="point"
-      :edit-model="editModel"
-      :line-code="lineCode"
-      @refresh="loadInitData"
-      @jlmap3d="jlmap3d"
-    />
-  </div>
-</template>
-<script>
-import { DeviceMenu } from '@/scripts/ConstDic';
-import { postBuildMapImport, listMap } from '@/api/jmap/mapdraft';
-import { UrlConfig } from '@/scripts/ConstDic';
-import { removeSessionStorage } from '@/utils/auth';
-import MapOperateMenu from './mapmanage/operateMenu';
-
-export default {
-    name: 'UserMapList',
-    components: {
-        MapOperateMenu
-    },
-    data() {
-        return {
-            loading: true,
-            defaultShowKeys: [],
-            filterText: '',
-            treeData: [],
-            treeList: [],
-            selected: {},
-            defaultProps: {
-                children: 'children',
-                label: 'name'
-            },
-            point: {
-                x: 0,
-                y: 0
-            },
-            editModel: {},
-            lineCode: ''
-        };
-    },
-    computed: {
-        // role() {
-        //     return this.$store.state.user.roles.includes('04') ||
-        //             this.$store.state.user.roles.includes('05') ||
-        //             this.$store.state.user.roles.includes('01');
-        // }
-    },
-    watch: {
-        filterText(val) {
-            this.$refs.tree.filter(val);
-        }
-    },
-    beforeDestroy () {
-        removeSessionStorage('demonList');
-    },
-    mounted() {
-        this.loadInitData();
-    },
-    methods: {
-        filterNode(value, data) {
-            if (!value) return true;
-            return data.name.indexOf(value) !== -1;
-        },
-        createMap() {
-            this.$emit('createMap');
-        },
-        async loadInitData() {
-            this.loading = true;
-            this.treeData = this.treeList = [];
-            try {
-                const res = await listMap({ drawWay:false});
-                res.data && res.data.forEach(elem=>{
-                    elem.type = 'map';
-                    elem.children = [
-                        {
-                            id: '1',
-                            name: this.$t('designPlatform.mapDesign'),
-                            type: 'mapDesign',
-                            mapId: elem.id,
-                            mapName: elem.name,
-                            lineCode: elem.lineCode
-                        },
-                        {
-                            id: '4',
-                            name: this.$t('designPlatform.runPlanDesign'),
-                            type: 'runPlanDesign',
-                            mapId: elem.id,
-                            mapName: elem.name,
-                            lineCode: elem.lineCode
-                        }
-                    ];
-                });
-
-                this.treeData = res.data;
-                this.treeList = this.filterText
-                    ? res.data.filter(elem => { return elem.name.includes(this.filterText); })
-                    : res.data;
-                this.loading = false;
-            } catch (error) {
-                this.loading = false;
-                this.$messageBox(this.$t('error.refreshFailed'));
-            }
-        },
-        clickEvent(obj, data, ele) {
-            switch (obj.type) {
-            case 'mapDesign': {
-                this.$router.push({ path: `${UrlConfig.designUser.mapDraw}/${obj.mapId}/draft`, query: { name: obj.mapName } });
-                break;
-            }
-            case 'runPlanDesign': {
-                this.$router.push({ path: `${UrlConfig.designUser.runPlan}/${obj.mapId}?lineCode=${obj.lineCode}` });
-                break;
-            }
-            }
-            this.$refs.menu.doClose();
-        },
-        showContextMenu(e, obj, node, vueElem) {
-            if (obj && obj.type == 'map') {
-                e.preventDefault();
-                const menu = DeviceMenu.Map;
-
-                this.point = {
-                    x: e.clientX,
-                    y: e.clientY
-                };
-                this.editModel = obj;
-                this.editModel.lineCode = obj.lineCode;
-                this.$store.dispatch('menuOperation/setPopMenu', { position: this.point, menu: menu });
-            }
-        },
-        jlmap3d() {
-            this.$router.push({ path: '/design/jlmap3d/edit', query: { mapid: this.editModel.id } });
-        },
-        importf() {
-            const loading = this.$loading({
-                lock: true,
-                text: '正在导入中...',
-                spinner: 'el-icon-loading',
-                background: 'rgba(0, 0, 0, 0.7)'
-            });
-            setTimeout(() => {
-                const obj = this.$refs.files;
-                if (!obj.files) return;
-                const f = obj.files[0];
-                const reader = new FileReader();
-                const that = this;
-                reader.readAsText(f, 'utf-8');
-                reader.onload = function(e) {
-                    const data = e.target.result;
-                    postBuildMapImport(JSON.parse(data)).then(res => {
-                        loading.close();
-                        that.$message.success('导入成功！');
-                        that.loadInitData();
-                        loading.close();
-                    }).catch(error => {
-                        loading.close();
-                        that.$message.error('导入失败' + error.message);
-                    });
-                    obj.value = '';
-                };
-            });
-        }
-    }
-};
-</script>
-<style lang="scss" scoped>
-	.clearfix{
-		padding: 0 20px;
-		border-bottom: 1px solid #EBEEF5;
-		box-sizing: border-box;
-		height: 47px;
-		line-height: 47px;
-        position: absolute;
-        width:100%;
-	}
-    .text_item{
-        height: 100%;
-        padding-top: 47px;
-        .tree_box{
-            height: calc(100% - 89px);
-            overflow-y: auto;
-        }
-    }
-    .buttonList{
-        padding: 8px 0px 8px 0px;
-        border-top: 1px #ccc solid;
-    }
-    .eachButton{
-        margin-left:10px;
-    }
-    .uploadDemo {
-        position: relative;
-        overflow: hidden;
-        // float: right;
-        padding: 9px 15px;
-        margin-right: 3px;
-        cursor: pointer;
-        input {
-            width: 100%;
-            height: 100%;
-            position: absolute;
-            left: 0;
-            top: 0;
-            opacity: 0;
-            cursor: pointer;
-        }
-    }
-    .map-list-main{
-        text-align:left;
-		height: 100%;
-        position: relative;
-    }
-</style>
diff --git a/src/views/designUser/index.vue b/src/views/designUser/index.vue
deleted file mode 100644
index d0de0ab9e..000000000
--- a/src/views/designUser/index.vue
+++ /dev/null
@@ -1,100 +0,0 @@
-<template>
-  <div class="app-wrapper">
-    <map-create ref="mapCreate" :line-code="lineCode" @refresh="refresh1" />
-    <div class="examList" :style="{width: widthLeft+'px'}">
-      <demon-list ref="demonList" @createMap="createMap" />
-    </div>
-    <drap-left :width-left="widthLeft" @drapWidth="drapWidth" />
-    <transition>
-      <router-view :product-list="productList" />
-    </transition>
-  </div>
-</template>
-
-<script>
-import demonList from './demonList';
-import drapLeft from '@/views/components/drapLeft/index';
-import { launchFullscreen } from '@/utils/screen';
-import localStore from 'storejs';
-import { getSessionStorage, setSessionStorage } from '@/utils/auth';
-import MapCreate from './mapmanage/create';
-
-export default {
-    name: 'DesignPlatform',
-    components: {
-        demonList,
-        drapLeft,
-        MapCreate
-    },
-    data() {
-        return {
-            widthLeft: Number(localStore.get('LeftWidth')) || 450,
-            productList: [],
-            lineCode: ''
-        };
-    },
-    computed: {
-        width() {
-            return this.$store.state.app.width;
-        }
-    },
-    watch: {
-        widthLeft(val) {
-            this.setMapResize(val);
-        },
-        '$store.state.app.windowSizeCount': function() {
-            this.resize();
-        }
-    },
-    mounted() {
-        const againEnter = getSessionStorage('againEnter') || null;
-        if (!againEnter) {
-            launchFullscreen();
-            setSessionStorage('againEnter', true);
-        }
-        this.resize();
-        this.widthLeft = Number(localStore.get('LeftWidth'));
-    },
-    methods: {
-        refresh() {
-            this.$refs && this.$refs.demonList && this.$refs.demonList.loadInitData();
-        },
-        drapWidth(width) {
-            this.widthLeft = Number(width);
-        },
-        createMap() {
-            this.$refs.mapCreate.show();
-        },
-        refresh1() {
-            this.$refs.demonList.loadInitData();
-        },
-        resize() {
-            this.widthLeft = Number(localStore.get('LeftWidth')) || this.widthLeft;
-            const width = this.$store.state.app.width - 521 - this.widthLeft;
-            const height = this.$store.state.app.height - 90;
-            this.$store.dispatch('config/resize', { width: width, height: height });
-        },
-        setMapResize(LeftWidth) {
-            const widths = this.$store.state.app.width - 521 - LeftWidth;
-            const heights = this.$store.state.app.height - 90;
-            this.$store.dispatch('config/resize', { width: widths, height: heights });
-        }
-    }
-};
-</script>
-<style rel="stylesheet/scss" lang="scss" scoped>
-    @import "src/styles/mixin.scss";
-
-    .app-wrapper {
-        @include clearfix;
-        position: relative;
-        height: 100%;
-        width: 100%;
-        overflow: hidden;
-    }
-
-    .examList {
-        float: left;
-        height: 100%;
-    }
-</style>
diff --git a/src/views/designUser/mapmanage/create.vue b/src/views/designUser/mapmanage/create.vue
deleted file mode 100644
index c3e0ac02b..000000000
--- a/src/views/designUser/mapmanage/create.vue
+++ /dev/null
@@ -1,306 +0,0 @@
-<template>
-  <el-dialog v-dialogDrag v-dialogLoading="loadingUpload" :title="$t('map.createNewMap')" :visible.sync="dialogShow" width="30%" :close-on-click-modal="false" :before-close="handleClose">
-    <div>
-      <el-tabs v-model="activeTab" type="card">
-        <el-tab-pane :label="$t('map.normalCreate')" name="first">
-          <el-form ref="newForm" label-position="right" :model="newModel" label-width="140px" size="mini" :rules="newRules" @submit.native.prevent>
-            <el-form-item :label="$t('map.lineCode')" prop="lineCode">
-              <el-select v-model="newModel.lineCode" :placeholder="$t('map.pleaseSelect')">
-                <el-option
-                  v-for="item in lineCodeList"
-                  :key="item.code"
-                  :label="item.name"
-                  :value="item.code"
-                />
-              </el-select>
-            </el-form-item>
-            <el-form-item :label="$t('map.mapName')" prop="name">
-              <el-input v-model.trim="newModel.name" />
-            </el-form-item>
-          </el-form>
-        </el-tab-pane>
-        <el-tab-pane :label="$t('map.publishMapCreation')" name="second">
-          <el-form ref="pullForm" label-position="right" :model="pullModel" :rules="pullRules" label-width="140px" size="mini">
-            <el-form-item :label="$t('map.publishMap')+ ':'" prop="id">
-              <el-select v-model="pullModel.id" :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="$t('map.mapName')" prop="name">
-              <el-input v-model.trim="pullModel.name" />
-            </el-form-item>
-          </el-form>
-        </el-tab-pane>
-      </el-tabs>
-    </div>
-    <span slot="footer" class="dialog-footer">
-      <el-button @click="dialogShow = false">{{ $t('map.cancel') }}</el-button>
-      <el-button type="primary" :loading="loading" @click="create">{{ $t('map.confirm') }}</el-button>
-    </span>
-  </el-dialog>
-</template>
-
-<script>
-import { newMap, newUsePublishMap } from '@/api/jmap/mapdraft';
-// import XLSX from 'xlsx';
-// import { translate, translateSheetTitle } from '@/scripts/translate';
-// import { sheet_to_json } from '@/utils/Export2Excel';
-import { getLineCodeList } from '@/api/management/mapline';
-import { getMapListByProject } from '@/utils/mapList';
-
-export default {
-    name: 'MapCreate',
-    props: {
-        lineCode: {
-            type: String,
-            default() {
-                return '';
-            }
-        }
-    },
-    data() {
-        return {
-            dialogShow: false,
-            loading: false,
-            file: null,
-            rABS: false,
-            loadingUpload: false,
-            resultJSON: {},
-            activeTab: 'first',
-            lineCodeList: [],
-            publishMapList: [],
-            newModel: {
-                id: '',
-                name: '',
-                lineCode: ''
-            },
-            pullModel: {
-                id: '',
-                name: ''
-            },
-            newRules: {
-                name: [
-                    { required: true, message: this.$t('rules.pleaseEnterMapName'), trigger: 'blur' }
-                ],
-                lineCode: [
-                    { required: true, message: this.$t('rules.pleaseChooseLineCode'), trigger: 'change' }
-                ]
-            },
-            pullRules: {
-                id: [
-                    { required: true, message: this.$t('rules.pleaseSelectMapSource'), trigger: 'change' }
-                ],
-                name: [
-                    { required: true, message: this.$t('rules.pleaseEnterMapName'), trigger: 'blur' }
-                ]
-            },
-            cityList: []
-        };
-    },
-    watch: {
-        lineCode(val) {
-            this.newModel.lineCode = val;
-        }
-    },
-    methods: {
-        show() {
-            this.dialogShow = true;
-            this.initLoadData();
-        },
-        close() {
-            if (this.$refs.newForm) {
-                this.$refs.newForm.resetFields();
-            }
-            if (this.$refs.pullForm) {
-                this.$refs.pullForm.resetFields();
-            }
-            this.dialogShow = false;
-        },
-        handleClose() {
-            this.close();
-        },
-        initLoadData() {
-            this.lineCodeList = [];
-            this.$Dictionary.cityType().then(list => {
-                this.cityList = list;
-            });
-
-            getLineCodeList().then(response => {
-                this.lineCodeList = response.data;
-            });
-
-            const drawWay = false;
-            getMapListByProject(drawWay).then(response => {
-                this.publishMapList = response.data;
-            }).catch(() => {
-                this.$messageBox(this.$t('map.failedLoadListPublishedMaps'));
-            });
-        },
-        create() {
-            if (this.activeTab === 'first') {
-                this.$refs['newForm'].validate((valid) => {
-                    if (valid) {
-                        this.loading = true;
-                        this.newModel['drawWay'] = false;
-                        newMap(this.newModel).then(response => {
-                            this.loading = false;
-                            this.$emit('refresh');
-                            this.$message.success(this.$t('map.creatingSuccessful'));
-                            this.close();
-                        }).catch(() => {
-                            this.loading = false;
-                            this.$messageBox(this.$t('map.createFailure'));
-                            this.close();
-                        });
-                    }
-                });
-            } else {
-                this.$refs['pullForm'].validate((valid) => {
-                    if (valid) {
-                        this.loading = true;
-                        newUsePublishMap(this.pullModel).then(response => {
-                            this.loading = false;
-                            this.$emit('refresh');
-                            this.$message.success(this.$t('map.creatingSuccessful'));
-                            this.close();
-                        }).catch(() => {
-                            this.loading = false;
-                            this.$messageBox(this.$t('map.createFailure'));
-                            this.close();
-                        });
-                    }
-                });
-            }
-        }
-        // importf() { // 导入
-        //     const obj = this.$refs.files;
-        //     let wb;
-        //     if (!obj.files) return;
-        //     const f = obj.files[0];
-        //     this.loadingUpload = true;
-        //     const reader = new FileReader();
-        //     const that = this;
-        //     reader.onload = function (e) {
-        //         const data = e.target.result;
-        //         if (that.rABS) {
-        //             wb = XLSX.read(btoa(that.fixdata(data)), {// 手动转化
-        //                 type: 'base64'
-        //             });
-        //         } else {
-        //             wb = XLSX.read(data, {
-        //                 type: 'binary'
-        //             });
-        //         }
-        //         const resultJSONData = {};
-        //         for (const index in wb.Sheets) {
-
-        //             const titleNum = that.formatSheetTitle(index);
-        //             const key = translateSheetTitle.sheetName[titleNum];
-
-        //             const filterVal = that.handelData(key);
-        //             const jsonData = sheet_to_json(wb.Sheets[index]);
-        //             const data = that.formatJson(filterVal, jsonData, key);
-        //             if (key === 'base') {
-        //                 for (const i in data[0]) {
-        //                     resultJSONData[i] = data[0][i];
-        //                 }
-        //             } else {
-        //                 resultJSONData[key] = data;
-        //             }
-        //         }
-        //         that.resultJSON = resultJSONData;
-        //         if (that.resultJSON) {
-        //             postBuildMapImport(that.resultJSON).then(res => {
-        //                 that.loadingUpload = false;
-        //                 that.$message.success(this.$t('map.importSuccessful'));
-        //                 that.$emit('refresh');
-        //                 that.close();
-        //             }).catch(error => {
-        //                 that.loadingUpload = false;
-        //                 that.$message.error(this.$t('map.importFailure') + error.message);
-        //             });
-        //         }
-        //         obj.value = ''; // 清空上次导入文件
-        //     };
-        //     if (that.rABS) {
-        //         reader.readAsArrayBuffer(f);
-        //     } else {
-        //         reader.readAsBinaryString(f);
-        //     }
-        // },
-        // // 转换数据格式
-        // handelData(key) {
-        //     const tHeader = [];
-        //     const tHeaderF = [];
-        //     if (translate[key]) {
-        //         translate[key].columns.forEach(item => {
-        //             tHeader.push(item.tHeader);
-        //             tHeaderF.push(item.key);
-        //         });
-        //     }
-        //     const filterVal = {
-        //         tHeader: tHeader,
-        //         tHeaderF: tHeaderF
-        //     };
-        //     return filterVal;
-        // },
-        // // 文件流转BinaryString
-        // fixdata(data) {
-        //     var o = '';
-        //     var l = 0;
-        //     var w = 10240;
-        //     for (; l < data.byteLength / w; ++l) o += String.fromCharCode.apply(null, new Uint8Array(data.slice(l * w, l * w + w)));
-        //     o += String.fromCharCode.apply(null, new Uint8Array(data.slice(l * w)));
-        //     return o;
-        // },
-        // // 转换属性名称 格式
-        // formatJson(filterVal, jsonData, key) {
-        //     jsonData.map((item, index) => {
-        //         const json = {};
-        //         filterVal.tHeader.map((j, o) => {
-        //             if (item[j] != undefined) {
-        //                 json[filterVal.tHeaderF[o]] = translate[key].columns[o].formatter(item[j]);
-        //             }
-        //         });
-        //         jsonData.splice(index, 1, json);
-        //     });
-        //     return jsonData;
-        // },
-        // // 转换sheet名字
-        // formatSheetTitle(title) {
-        //     let index;
-        //     translateSheetTitle.sheetTitle.forEach((v, i) => {
-        //         if (title == v) index = i;
-        //     });
-        //     return index;
-        // }
-    }
-};
-</script>
-<style scoped rel="stylesheet/scss" lang="scss">
-    .uploadDemo {
-        .el-upload-dragger {
-            margin: 0 auto;
-        }
-
-        .file_box {
-            width: 100%;
-            height: 100%;
-            position: absolute;
-            left: 0;
-            top: 0;
-            opacity: 0;
-            cursor: pointer;
-        }
-    }
-</style>
-<style>
-    .el-loading-mask {
-        background-color: rgba(0, 0, 0, 0.3);
-    }
-</style>
diff --git a/src/views/designUser/mapmanage/edit.vue b/src/views/designUser/mapmanage/edit.vue
deleted file mode 100644
index cbbd3a8bb..000000000
--- a/src/views/designUser/mapmanage/edit.vue
+++ /dev/null
@@ -1,229 +0,0 @@
-<template>
-  <el-dialog v-dialogDrag :title="$t('map.mapEditor')" :visible.sync="dialogShow" :close-on-click-modal="false" width="30%" :before-close="handleClose">
-    <div>
-      <template v-if="basicInfo">
-        <el-form ref="edit" label-position="right" :model="editModel" :rules="editRules" label-width="120px" size="mini" @submit.native.prevent>
-          <el-form-item :label="$t('map.lineCode')" prop="lineCode">
-            <el-select v-model="editModel.lineCode" :placeholder="$t('map.pleaseSelect')" size="mini" disabled>
-              <el-option
-                v-for="item in lineCodeList"
-                :key="item.code"
-                :label="item.name"
-                :value="item.code"
-              />
-            </el-select>
-          </el-form-item>
-          <el-form-item :label="$t('map.mapName')" prop="name">
-            <el-input v-model.trim="editModel.name" />
-          </el-form-item>
-        </el-form>
-      </template>
-      <template v-else>
-        <el-form ref="updt" label-position="right" :model="updtModel" :rules="updtRules" label-width="120px" size="mini" @submit.native.prevent>
-          <el-form-item :label="$t('map.offsetXColon')" :prop="'origin.x'">
-            <el-input v-model="updtModel.origin.x" :label="$t('map.offsetX')" disabled />
-          </el-form-item>
-          <el-form-item :label="$t('map.offsetYColon')" :prop="'origin.y'">
-            <el-input v-model="updtModel.origin.y" :label="$t('map.offsetY')" disabled />
-          </el-form-item>
-          <el-form-item :label="$t('map.scalingColon')" prop="scaling">
-            <el-input-number v-model="updtModel.scaling" :precision="1" :step="0.2" disabled />
-          </el-form-item>
-        </el-form>
-      </template>
-    </div>
-    <span slot="footer" class="dialog-footer">
-      <el-button @click="dialogShow = false">{{ $t('map.cancel') }}</el-button>
-      <el-button type="primary" :loading="loading" @click="save">{{ $t('map.confirm') }}</el-button>
-    </span>
-  </el-dialog>
-
-</template>
-
-<script>
-import { updateMap, getMapDetail } from '@/api/jmap/mapdraft';
-import { getLineCodeList } from '@/api/management/mapline';
-import { saveMap } from '@/api/jmap/mapdraft';
-
-export default {
-    name: 'MapEdit',
-    props: {
-        map: {
-            type: Object,
-            required: true
-        },
-        basicInfo: {
-            type: Boolean,
-            required: true,
-            default: function () {
-                return true;
-            }
-        },
-        lineCode: {
-            type: String,
-            required: true
-        }
-    },
-    data() {
-        return {
-            dialogShow: false,
-            loading: false,
-            lineCodeList: [],
-            cityList: [],
-            editModel: {
-                id: '',
-                name: '',
-                lineCode: '01',
-                cityCode: ''
-            },
-            updtModel: {
-                code: '',
-                scaling: '',
-                origin: {
-                    x: '',
-                    y: ''
-                }
-            },
-            isUpdate: false
-        };
-    },
-    computed: {
-        editRules() {
-            return {
-                name: [
-                    { required: true, message: this.$t('rules.pleaseEnterMapName'), trigger: 'blur' }
-                ],
-                lineCode: [
-                    { required: true, message: this.$t('rules.pleaseSelectAssociatedSkin'), trigger: 'change' }
-                ]
-            };
-        },
-        updtRules() {
-            return {
-                'origin.x': [
-                    { required: true, message: this.$t('rules.enterXOffset'), trigger: 'blur' }
-                ],
-                'origin.y': [
-                    { required: true, message: this.$t('rules.enterYOffset'), trigger: 'blur' }
-                ],
-                scaling: [
-                    { required: true, message: this.$t('rules.enterScale'), trigger: 'blur' }
-                ]
-            };
-        }
-    },
-    watch: {
-        map: function (val, old) {
-            if (val) {
-                Object.assign(this.editModel, this.map);
-            }
-        },
-        '$store.state.map.mapDataLoadedCount': function () {
-            if (this.$jlmap.lineCode) {
-                this.isUpdate = true;
-            }
-        }
-    },
-    mounted() {
-        this.initLoadData();
-    },
-    methods: {
-        show(type) {
-            const dataZoom = this.$store.state.map.dataZoom;
-            if (type == 'editCode') {
-                this.editModel.lineCode = this.editModel.lineCode ? this.editModel.lineCode : '';
-                this.editModel.name = this.editModel.name ? this.editModel.name : '';
-            } else if (type == 'editPoint') {
-                if (dataZoom && dataZoom.offsetX) {
-                    this.updtModel.origin.x = Number.parseInt(dataZoom.offsetX);
-                    this.updtModel.origin.y = Number.parseInt(dataZoom.offsetY);
-                    this.updtModel.scaling = dataZoom.scaleRate;
-                }
-            }
-
-            this.dialogShow = true;
-        },
-        close() {
-            if (this.basicInfo) {
-                this.$refs.edit.resetFields();
-            } else {
-                this.$refs.updt.resetFields();
-            }
-
-            this.dialogShow = false;
-        },
-        handleClose() {
-            this.close();
-        },
-        save() {
-            this.loading = true;
-            if (this.basicInfo) {
-                this.$refs['edit'].validate((valid) => {
-                    if (valid) {
-                        updateMap(this.editModel).then(response => {
-                            this.loading = false;
-                            if (this.isUpdate && this.$route.params.mapId) {
-                                getMapDetail(this.$route.params.mapId).then(response => {
-                                    this.$store.dispatch('map/setMapData', response.data);
-                                });
-                            }
-                            this.$message.success(this.$t('map.mapUpdateSuccessful'));
-                            this.$emit('refresh');
-                            this.close();
-                        }).catch(error => {
-                            this.loading = false;
-                            this.$message.error(this.$t('map.operationUnusual') + error.message);
-                        });
-                    } else {
-                        this.loading = false;
-                    }
-                });
-            } else {
-                this.updtModel.code = this.lineCode;
-                const map = this.$store.state.map.map;
-                this.$refs['updt'].validate((valid) => {
-                    if (valid) {
-                        this.$store.dispatch('map/saveMapDeviceDefaultRelations').then(() => {
-                            const param = {
-                                mapId: this.$route.params.mapId,
-                                skinVO: {
-                                    code: this.$store.state.map.map.skinVO.code,
-                                    name: this.$store.state.map.map.skinVO.name,
-                                    origin: {
-                                        x: this.updtModel.origin.x,
-                                        y: this.updtModel.origin.y
-                                    },
-                                    scaling: this.updtModel.scaling
-                                }
-                            };
-                            saveMap(Object.assign(map, param)).then(response => {
-                                this.loading = false;
-                                this.close();
-                                this.$message.success(this.$t('map.updateSuccessfully'));
-                            }).catch(() => {
-                                this.loading = false;
-                                this.$messageBox(this.$t('map.updateFailed'));
-                            });
-                        });
-                    } else {
-                        this.loading = false;
-                    }
-                });
-            }
-        },
-        initLoadData() {
-            this.cityList = [];
-            this.$Dictionary.cityType().then(list => {
-                this.cityList = list;
-            }).catch(() => {
-                this.$messageBox(this.$t('map.failedLoadCityList'));
-            });
-
-            this.lineCodeList = [];
-            getLineCodeList().then(response => {
-                this.lineCodeList = response.data;
-            });
-        }
-    }
-};
-</script>
diff --git a/src/views/designUser/mapmanage/operateMenu.vue b/src/views/designUser/mapmanage/operateMenu.vue
deleted file mode 100644
index bb5f2f6cf..000000000
--- a/src/views/designUser/mapmanage/operateMenu.vue
+++ /dev/null
@@ -1,265 +0,0 @@
-<template>
-  <div>
-    <pop-menu ref="popMenu" :menu="menu" />
-    <map-edit ref="edit" :basic-info="true" :map="editModel" :line-code="lineCode" @refresh="refresh" />
-    <!-- <map-edit ref="axisEdit" :basic-info="false" :map="editModel" :skin-code="skinCode" @refresh="refresh" /> -->
-    <map-save-as ref="saveAs" :map="editModel" @refresh="refresh" />
-    <map-publish ref="publish" :map="editModel" />
-  </div>
-</template>
-
-<script>
-import { deleteMap } from '@/api/jmap/mapdraft';
-import { DeviceMenu } from '@/scripts/ConstDic';
-import { UrlConfig } from '@/scripts/ConstDic';
-import PopMenu from '@/components/PopMenu';
-import MapEdit from './edit';
-import MapSaveAs from './saveAs';
-import MapPublish from './publish';
-import { mapGetters } from 'vuex';
-import { saveMap } from '@/api/jmap/mapdraft';
-
-export default {
-    name: 'MapOperateMenu',
-    components: {
-        PopMenu,
-        MapEdit,
-        MapSaveAs,
-        MapPublish
-    },
-    props: {
-        point: {
-            type: Object,
-            required: true
-        },
-        lineCode: {
-            type: String,
-            required: true
-        },
-        editModel: {
-            type: Object,
-            required: true
-        }
-    },
-    data() {
-        return {
-            menuMap: [
-                {
-                    label: this.$t('map.updateObj'),
-                    handler: this.updateObj
-                },
-                {
-                    label: this.$t('map.updateObjAxis'),
-                    handler: this.updateObjAxis
-                },
-                {
-                    label: this.$t('map.saveAs'),
-                    handler: this.saveAs
-                },
-                {
-                    label: this.$t('map.deleteObj'),
-                    handler: this.deleteObj
-                },
-                {
-                    label: this.$t('map.jlmap3d'),
-                    handler: this.jlmap3d
-                }
-            ],
-            publishMapMenu: {
-                label: this.$t('map.publish'),
-                handler: this.publish
-            },
-            menuNormal: [],
-            menu: [],
-            updtModel: {
-                code: '',
-                scaling: '',
-                origin: {
-                    x: '',
-                    y: ''
-                }
-            }
-        };
-    },
-    computed: {
-        ...mapGetters('map', [
-            'stationList'
-        ]),
-        hasRelease() {
-            return this.$store.state.user.roles.includes('04') ||
-                this.$store.state.user.roles.includes('05');
-        }
-    },
-    watch: {
-        '$store.state.menuOperation.menuCount': function (val) {
-            if (this.$store.getters['menuOperation/checkDialogIsOpen'](DeviceMenu.Map)) {
-                this.menu = [...this.menuMap];
-                if (this.hasRelease) {
-                    this.menu.push(this.publishMapMenu);
-                }
-                this.doShow(this.$store.state.menuOperation.menuPosition);
-            } else if (this.$store.getters['menuOperation/checkDialogIsOpen'](DeviceMenu.Cancel)) {
-                this.initCancelMenu();
-                this.doShow(this.$store.state.menuOperation.menuPosition);
-            } else {
-                this.doClose();
-            }
-        }
-    },
-    mounted() {
-        this.closeEvent();
-    },
-    methods: {
-        closeEvent() {
-            const self = this;
-            window.onclick = function (e) {
-                self.doClose();
-            };
-        },
-        doShow(point) {
-            this.closeEvent();
-            if (this.$refs && this.$refs.popMenu) {
-                this.$refs.popMenu.resetShowPosition(point);
-            }
-        },
-        doClose() {
-            if (this.$refs && this.$refs.popMenu) {
-                this.$refs.popMenu.close();
-            }
-        },
-        updateObj() {
-            this.doClose();
-            if (this.$refs && this.$refs.edit) {
-                this.$refs.edit.show('editCode');
-            }
-        },
-        updateObjAxis() {
-            this.doClose();
-            this.getMapOrigin();
-            this.$confirm('您确认按当前绘图位置更新坐标及缩放比例？', this.$t('tip.hint'), {
-                confirmButtonText: this.$t('tip.confirm'),
-                cancelButtonText: this.$t('tip.cancel'),
-                type: 'warning'
-            }).then(() => {
-                const map = this.$store.state.map.map;
-                this.$store.dispatch('map/saveMapDeviceDefaultRelations').then(() => {
-                    const param = {
-                        mapId: this.$route.params.mapId,
-                        skinVO: {
-                            code: this.$store.state.map.map.skinVO.code,
-                            name: this.$store.state.map.map.skinVO.name,
-                            origin: {
-                                x: this.updtModel.origin.x,
-                                y: this.updtModel.origin.y
-                            },
-                            scaling: this.updtModel.scaling
-                        }
-                    };
-                    saveMap(Object.assign(map, param)).then(response => {
-                        this.$message.success(this.$t('map.updateSuccessfully'));
-                    }).catch(() => {
-                        this.$messageBox(this.$t('map.updateFailed'));
-                    });
-                });
-            }).catch(() => { });
-        },
-        getMapOrigin() {
-            const dataZoom = this.$store.state.map.dataZoom;
-            if (dataZoom && dataZoom.offsetX) {
-                this.updtModel.origin.x = Number.parseInt(dataZoom.offsetX);
-                this.updtModel.origin.y = Number.parseInt(dataZoom.offsetY);
-                this.updtModel.scaling = dataZoom.scaleRate;
-            }
-        },
-        saveAs() {
-            this.doClose();
-            if (this.$refs && this.$refs.saveAs) {
-                this.$refs.saveAs.show();
-            }
-        },
-        publish() {
-            this.doClose();
-            if (this.$refs && this.$refs.publish) {
-                this.$refs.publish.show();
-            }
-        },
-        deleteObj() {
-            this.doClose();
-            const _that = this;
-            this.$confirm(this.$t('tip.confirmDeletion'), this.$t('tip.hint'), {
-                confirmButtonText: this.$t('map.confirm'),
-                cancelButtonText: this.$t('map.cancel'),
-                type: 'warning'
-            }).then(() => {
-                deleteMap(this.editModel.id).then(response => {
-                    if (this.editModel.id == this.$route.params.mapId) {
-                        this.$store.dispatch('map/mapClear').then(() => {
-                            _that.$emit('editMap', null);
-                            // _that.$router.push({ path: `${UrlConfig.map.draft}/0/draft` });
-                            _that.$router.push({ path: `${UrlConfig.designUser.prefix}` });
-                        });
-                    }
-                    _that.refresh();
-                    _that.$message.success(this.$t('map.successfullyDelete'));
-                }).catch(error => {
-                    _that.$message.error(this.$t('map.failDelete') + error.message);
-                });
-            }).catch(() => {
-            });
-        },
-        jlmap3d() {
-            this.$emit('jlmap3d');
-        },
-        refresh() {
-            this.$emit('refresh');
-        },
-        initCancelMenu() {
-            this.menuNormal = [];
-            this.stationList.forEach(station => {
-                if (station.code === station.concentrateStationCode) {
-                    const node = {
-                        label: station.name,
-                        children: []
-                    };
-
-                    this.stationList.forEach(elem => {
-                        if (elem.visible) {
-                            let next = elem;
-                            while (next.code != next.concentrateStationCode || !next.concentrateStationCode) {
-                                next = this.$store.getters['map/getDeviceByCode'](next.concentrateStationCode);
-                            }
-
-                            if (station.code == next.code) {
-                                node.children.push({
-                                    code: elem.code,
-                                    label: elem.name,
-                                    handler: this.mapLocation
-                                });
-                            }
-                        }
-                    });
-
-                    this.menuNormal.push(node);
-                }
-            });
-            this.menu = [...this.menuNormal];
-        },
-        mapLocation(item) {
-            if (item) {
-                this.doClose();
-                this.$store.dispatch('training/updateOffsetStationCode', { offsetStationCode: item.code });
-            }
-        }
-    }
-};
-</script>
-<style rel="stylesheet/scss" lang="scss" scoped>
-	/deep/ {
-		.menu-item{
-			background: #f1ecec;
-			.pop-menu {
-				background: #5F9EA0;
-			}
-		}
-	}
-</style>
diff --git a/src/views/designUser/mapmanage/publish.vue b/src/views/designUser/mapmanage/publish.vue
deleted file mode 100644
index c5f5cf887..000000000
--- a/src/views/designUser/mapmanage/publish.vue
+++ /dev/null
@@ -1,137 +0,0 @@
-<template>
-  <el-dialog v-dialogDrag :title="$t('map.mapPublished')" :visible.sync="dialogShow" width="30%" :before-close="handleClose">
-    <div>
-      <el-form ref="form" label-position="right" :model="editModel" label-width="120px" :rules="editRules" size="mini" @submit.native.prevent>
-        <el-form-item :label="$t('map.publishingAssociatedCity')" prop="cityCode">
-          <el-select v-model="editModel.cityCode" :placeholder="$t('map.pleaseSelect')">
-            <el-option v-for="item in cityList" :key="item.code" :label="item.name" :value="item.code" />
-          </el-select>
-        </el-form-item>
-        <el-form-item :label="$t('map.publishMapName')" prop="name">
-          <el-input v-model="editModel.name" />
-        </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="publish">{{ $t('map.confirm') }}</el-button>
-    </span>
-  </el-dialog>
-</template>
-
-<script>
-import { publishMap } from '@/api/jmap/mapdraft';
-import { checkMapName } from '@/api/jmap/map';
-export default {
-    name: 'MapPublish',
-    props: {
-        map: {
-            type: Object,
-            required: true
-        }
-    },
-    data() {
-        return {
-            dialogShow: false,
-            loading: false,
-            cityList: [],
-            editModel: {
-                id: '',
-                name: '',
-                cityCode: '000000'
-            },
-            editRules: {
-                cityCode: [
-                    { required: true, message: this.$t('rules.pleaseEnterMapName'), trigger: 'change' }
-                ],
-                name: [
-                    { required: true, message: this.$t('rules.pleaseEnterMapName'), trigger: 'blur' }
-                ]
-            }
-        };
-    },
-    watch: {
-        map: function (val, old) {
-            if (val) {
-                Object.assign(this.editModel, this.map);
-            }
-        }
-    },
-    mounted() {
-        this.$Dictionary.cityType().then(list => {
-            this.cityList = list;
-        });
-    },
-    methods: {
-        show() {
-            this.dialogShow = true;
-        },
-        close() {
-            this.$refs.form.resetFields();
-            this.dialogShow = false;
-        },
-        handleClose() {
-            this.close();
-        },
-        publish() {
-            this.$refs.form.validate((valid) => {
-                if (valid) {
-                    this.loading = true;
-                    delete this.editModel.children;
-                    this.verifyMapName();
-                }
-            });
-        },
-        async verifyMapName() { // 校验地图名称是否唯一
-            try {
-                const res = await checkMapName(this.editModel.name);
-                if (res.data) {
-                    this.confirmPublish();
-                } else {
-                    this.publishMap();
-                }
-            } catch (error) {
-                console.log(error);
-            }
-        },
-        confirmPublish() {
-            this.$confirm(this.$t('map.verifyMapName'), this.$t('tip.hint'), {
-                confirmButtonText: this.$t('tip.confirm'),
-                cancelButtonText: this.$t('tip.cancel'),
-                type: 'warning'
-            }).then(() => {
-                this.publishMap();
-            }).catch(() => { this.loading = false; });
-        },
-        publishMap() {
-            publishMap(this.editModel).then(response => {
-                this.loading = false;
-                if (response.data && response.data.length) {
-                    this.tableToExcel(response.data);
-                    this.$messageBox(this.$t('map.dataValidationFailed'));
-                } else {
-                    this.$message.success(this.$t('map.releaseSuccess'));
-                }
-                this.close();
-            }).catch((error) => {
-                this.loading = false;
-                this.$messageBox(`${this.$t('map.abnormalOperation')}, ${error.message}`);
-            });
-        },
-        tableToExcel(data) {
-            const filterVal = ['index'];
-            const arr = [];
-            data.forEach(item => {
-                arr.push({ index: item });
-            });
-            const dataList = this.formatJson(filterVal, arr);
-                import('@/utils/Export2Excel').then(excel => {
-                    excel.export_json_to_excel([this.$t('map.datQuestion')], dataList, this.$t('map.dataList'));
-                });
-        },
-        formatJson(filterVal, jsonData) {
-            return jsonData.map(v => filterVal.map(j => v[j]));
-        }
-    }
-};
-</script>
diff --git a/src/views/designUser/mapmanage/saveAs.vue b/src/views/designUser/mapmanage/saveAs.vue
deleted file mode 100644
index ee1497d2f..000000000
--- a/src/views/designUser/mapmanage/saveAs.vue
+++ /dev/null
@@ -1,74 +0,0 @@
-<template>
-  <el-dialog v-dialogDrag :title="$t('map.saveMapAs')" :visible.sync="dialogShow" width="30%" :before-close="handleClose">
-    <div>
-      <el-form ref="form" label-position="right" :model="editModel" label-width="100px" :rules="editRules" size="mini" @submit.native.prevent>
-        <el-form-item :label="$t('map.mapName')" prop="name">
-          <el-input v-model="editModel.name" />
-        </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 { saveAsMap } from '@/api/jmap/mapdraft';
-
-export default {
-    name: 'MapSaveAs',
-    props: {
-        map: {
-            type: Object,
-            required: true
-        }
-    },
-    data() {
-        return {
-            dialogShow: false,
-            loading: false,
-            editModel: {
-                id: '',
-                name: ''
-            },
-            editRules: {
-                name: [
-                    { required: true, message: this.$t('rules.pleaseEnterMapName'), trigger: 'blur' }
-                ]
-            }
-        };
-    },
-    watch: {
-        map: function (val, old) {
-            if (val) {
-                Object.assign(this.editModel, this.map);
-            }
-        }
-    },
-    methods: {
-        show() {
-            this.dialogShow = true;
-        },
-        close() {
-            this.$refs.form.resetFields();
-            this.dialogShow = false;
-        },
-        handleClose() {
-            this.close();
-        },
-        saveAs() {
-            this.loading = true;
-            saveAsMap(this.editModel).then(response => {
-                this.loading = false;
-                this.$emit('refresh');
-                this.close();
-            }).catch(() => {
-                this.loading = false;
-                this.$messageBox(this.$t('map.saveFailed'));
-            });
-        }
-    }
-};
-</script>
diff --git a/src/views/drts/scene/importScene.vue b/src/views/drts/scene/importScene.vue
new file mode 100644
index 000000000..48b936983
--- /dev/null
+++ b/src/views/drts/scene/importScene.vue
@@ -0,0 +1,171 @@
+<template>
+  <el-dialog v-dialogDrag title="场景导入" :visible.sync="dialogShow" width="360px" :before-close="handleClose" custom-class="importClass">
+    <div>
+      <div v-show="!formDisplay" class="eachButton uploadDemo">
+        <i class="el-icon-plus avatar-uploader-icon el-icon-other" />
+        <input ref="files" type="file" class="file_box" accept=".json, application/json" @change="importf">
+      </div>
+      <el-form v-show="formDisplay" ref="form" label-position="right" :rules="editRules" :model="editModel" label-width="100px" size="mini" @submit.native.prevent>
+        <el-form-item label="场景名称" prop="name">
+          <el-input v-model="editModel.name" />
+        </el-form-item>
+        <el-form-item label="请选择剧本" prop="scriptId">
+          <el-select v-model="editModel.scriptId">
+            <el-option v-for="item in scriptList" :key="item.code" :label="item.label" :value="item.value" />
+          </el-select>
+        </el-form-item>
+      </el-form>
+      <div style="margin-left:18px;color:red;font-size:13px;">{{ validateText }}</div>
+    </div>
+    <span slot="footer" class="dialog-footer">
+      <el-button @click="handleClose">{{ $t('map.cancel') }}</el-button>
+      <el-button type="primary" :loading="loading" @click="importScene">{{ $t('map.confirm') }}</el-button>
+    </span>
+  </el-dialog>
+</template>
+<script>
+import { postSceneImport } from '@/api/competition';
+export default {
+    name:'ImportScene',
+    props: {
+        scriptList:{
+            type: Array,
+            default() {
+                return [];
+            }
+        }
+    },
+    data() {
+        return {
+            formDisplay:false,
+            dialogShow: false,
+            loading: false,
+            jsonData:null,
+            validateText:'',
+            editModel: {
+                scriptId: '',
+                name: ''
+            },
+            editRules: {
+                name: [
+                    { required: true, message: '请输入场景名称', trigger: 'blur' }
+                ],
+                scriptId:[
+                    { required: true, message: '请选择剧本', trigger: 'change' }
+                ]
+            }
+        };
+    },
+    methods:{
+        close() {
+            this.$refs.form.resetFields();
+            this.formDisplay = false;
+            this.editModel.scriptId = '';
+            this.jsonData = null;
+            this.dialogShow = false;
+            this.validateText = '';
+        },
+        handleClose() {
+            this.close();
+        },
+        doShow() {
+            this.validateText = '';
+            this.dialogShow = true;
+        },
+        importf() {
+            const that = this;
+            setTimeout(() => {
+                const obj = this.$refs.files;
+                if (!obj.files) return;
+                const f = obj.files[0];
+                if (f.type != 'application/json') {
+                    this.$message.error('请上传json格式的文件');
+                    return;
+                }
+                const reader = new FileReader();
+                reader.readAsText(f, 'utf-8');
+                reader.onload = function(e) {
+                    const data = e.target.result;
+                    that.formDisplay = true;
+                    const json = JSON.parse(data);
+                    that.jsonData = json;
+                    that.editModel.name = json.name;
+                    obj.value = '';
+                    that.validateText = '';
+                };
+            });
+        },
+        importScene() {
+            if (!this.jsonData) {
+                this.validateText = '请选择文件';
+                return false;
+            }
+            this.$refs['form'].validate((valid) => {
+                if (valid) {
+                    this.submitData();
+                } else {
+                    return false;
+                }
+            });
+        },
+        submitData() {
+            const loading = this.$loading({
+                lock: true,
+                text: '正在导入中...',
+                spinner: 'el-icon-loading',
+                background: 'rgba(0, 0, 0, 0.7)'
+            });
+            this.loading = true;
+            this.dialogShow = false;
+            this.validateText = '';
+            const that = this;
+            postSceneImport(that.editModel.scriptId, that.editModel.name, that.jsonData).then(res => {
+                loading.close();
+                that.loading = false;
+                that.$message.success('导入成功！');
+                this.$emit('refresh');
+                // loading.close();
+                this.close();
+            }).catch(error => {
+                loading.close();
+                that.loading = false;
+                this.close();
+                that.$message.error('导入失败' + error.message);
+            });
+        }
+    }
+};
+</script>
+<style lang="scss" scoped>
+.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: 72px;
+    font-size: 16px;
+}
+.uploadDemo {
+    position: relative;
+    overflow: hidden;
+    // float: right;
+    padding: 9px 15px;
+    margin-right: 3px;
+    cursor: pointer;
+    input {
+        width: 100%;
+        height: 100%;
+        position: absolute;
+        left: 0;
+        top: 0;
+        opacity: 0;
+        cursor: pointer;
+    }
+}
+</style>
diff --git a/src/views/drts/scene/index.vue b/src/views/drts/scene/index.vue
index d780193dc..7d61a66f2 100644
--- a/src/views/drts/scene/index.vue
+++ b/src/views/drts/scene/index.vue
@@ -4,19 +4,21 @@
     <create-scene ref="createScene" title="创建场景" :script-list="scriptList" @reloadTable="reloadTable" />
     <create-scene ref="updateScene" title="更新场景" :script-list="scriptList" @reloadTable="reloadTable" />
     <modify-step ref="modifyStep" title="编辑步骤数据" />
-    <!-- <update-scene ref="modifyScene" :script-list="scriptList" @reloadTable="reloadTable" /> -->
+    <import-scene ref="importScene" :script-list="scriptList" @refresh="reloadTable" />
   </div>
 </template>
 <script>
-import { getCompetitionPracticalScene, deleteCompetitionPracticalScene } from '@/api/competition';
+import { getCompetitionPracticalScene, deleteCompetitionPracticalScene, getSceneExport } from '@/api/competition';
 import { getScriptPageListOnlineNew } from '@/api/script';
 import CreateScene from './create';
 import ModifyStep from './modify';
+import ImportScene from './importScene';
 export default {
     name:'SceneManage',
     components:{
         CreateScene,
-        ModifyStep
+        ModifyStep,
+        ImportScene
     },
     data() {
         return {
@@ -84,12 +86,18 @@ export default {
                                 name: '删 除',
                                 handleClick: this.doDelete,
                                 type: 'danger'
+                            },
+                            {
+                                name: '导 出',
+                                handleClick: this.doExport,
+                                type: 'primary'
                             }
                         ]
                     }
                 ],
                 actions: [
-                    { text: '添 加', handler: this.doCreate }
+                    { text: '添 加', handler: this.doCreate },
+                    { text: '导 入', handler: this.doImport }
                 ]
             }
         };
@@ -122,6 +130,9 @@ export default {
         doCreate() {
             this.$refs.createScene.doShow(null);
         },
+        doImport() {
+            this.$refs.importScene.doShow();
+        },
         reloadTable() {
             if (this.queryList && this.queryList.reload) {
                 this.queryList.reload();
@@ -129,6 +140,22 @@ export default {
         },
         doModify(index, row) {
             this.$refs.modifyStep.doShow(row);
+        },
+        doExport(index, row) {
+            getSceneExport(row.id).then(res=>{
+                const resultData = res.data;
+                if (resultData === false) {
+                    return;
+                }
+                const content = new Blob([JSON.stringify(resultData)]);
+                const urlObject = window.URL || window.webkitURL || window;
+                const url = urlObject.createObjectURL(content);
+                const el = document.createElement('a');
+                el.href = url;
+                el.download = `${resultData.name}.json`;
+                el.click();
+                urlObject.revokeObjectURL(url);
+            });
         }
     }
 };
diff --git a/src/views/drts/scene/modify.vue b/src/views/drts/scene/modify.vue
index 1e4a43cde..b51fe9e90 100644
--- a/src/views/drts/scene/modify.vue
+++ b/src/views/drts/scene/modify.vue
@@ -271,7 +271,9 @@ export default {
             this.formModel.operationScore = row.operationScore;
             this.formModel.scriptId = row.scriptId;
             getScriptByIdNew(row.scriptId).then(res=>{
-                this.actionList = res.data.actionList;
+                this.actionList = res.data.actionList.filter(action=>{
+                    return action.type != 'Exit_Conversation' && action.type != 'Accept_Conversation_Invitation';
+                });
                 getCompetitionPracticalSceneById(row.id).then(response=>{
                     const commandEvaluationRuleVOs = {};
                     if (response.data.commandEvaluationRuleVOs) {
diff --git a/src/views/error-page/404.vue b/src/views/error-page/404.vue
index c94ad1250..0ccdb6a22 100644
--- a/src/views/error-page/404.vue
+++ b/src/views/error-page/404.vue
@@ -15,7 +15,7 @@
         <div class="bullshit__headline">{{ message }}</div>
         <div class="bullshit__info">Please check that the URL you entered is correct, or click the button below to
           return to the homepage.</div>
-        <button @click="back" class="bullshit__return-home">Back</button>
+        <button class="bullshit__return-home" @click="back">Back</button>
       </div>
     </div>
   </div>
@@ -23,18 +23,18 @@
 
 <script>
 export default {
-	name: 'Page404',
-	computed: {
-		message() {
-			return 'The webmaster said that you can not enter this page...'
-		}
-	},
+    name: 'Page404',
+    computed: {
+        message() {
+            return 'The webmaster said that you can not enter this page...';
+        }
+    },
     methods: {
         back() {
-	        this.$router.go(-1);
+            this.$router.go(-1);
         }
     }
-}
+};
 </script>
 
 <style lang="scss" scoped>
diff --git a/src/views/exam/detail/examDetail.vue b/src/views/exam/detail/examDetail.vue
index 46cfb7eee..46706c5ea 100644
--- a/src/views/exam/detail/examDetail.vue
+++ b/src/views/exam/detail/examDetail.vue
@@ -50,12 +50,12 @@
   </div>
 </template>
 <script>
-import { examNotify, examNotifyNew } from '@/api/simulation';
+import { examNotifyNew } from '@/api/simulation';
 import { getExamLessonDetail } from '@/api/management/exam';
 import { generateExamList } from '@/api/management/userexam';
 import { getPublishLessonDetail } from '@/api/jmap/lesson';
 import { PermissionType } from '@/scripts/ConstDic';
-import { getDetailList } from '@/api/management/dictionary';
+// import { getDetailList } from '@/api/management/dictionary';
 import { mapGetters } from 'vuex';
 import { launchFullscreen } from '@/utils/screen';
 import { UrlConfig } from '@/scripts/ConstDic';
@@ -85,7 +85,6 @@ export default {
             typeList: [],
             examList: [],
             trainingOperateTypeMap: {},
-            drawWay: false,
             lineCode: '', // 线路对应的皮肤
             loadingProjectList: ['login', 'design', 'xty', 'designxty', 'gzb', 'designxty', 'xadt', 'designxadt', 'drts', 'designdrts']
         };
@@ -108,75 +107,17 @@ export default {
     },
     methods: {
         async getList() {
-            if (this.drawWay) {
-                this.typeList = [];
-                for (const val in ConstConfig.ConstSelect.trainingDeviceType) {
-                    this.typeList.push({name: LangStorage.getLang() == 'en' ? ConstConfig.ConstSelect.trainingDeviceType[val].enlabel : ConstConfig.ConstSelect.trainingDeviceType[val].label, code: val});
-                }
-                this.trainingOperateTypeMap = getTrainingOperateTypeMap();
-            } else {
-                this.trainingOperateTypeMap = {};
-                this.$Dictionary.stationControl().then(list => {
-                    this.trainingOperateTypeMap['01'] = list; // 控制权实训
-                });
-                this.$Dictionary.signalOperation().then(list => {
-                    this.trainingOperateTypeMap['02'] = list; // 信号机实训
-                });
-                this.$Dictionary.switchOperation().then(list => {
-                    this.trainingOperateTypeMap['03'] = list; // 道岔实训
-                });
-                this.$Dictionary.sectionOperation().then(list => {
-                    this.trainingOperateTypeMap['04'] = list; // 区段实训
-                });
-                this.$Dictionary.stationStandOperation().then(list => {
-                    this.trainingOperateTypeMap['05'] = list; // 站台实训
-                });
-                this.$Dictionary.trainPlanOperation().then(list => {
-                    this.trainingOperateTypeMap['06'] = list; // 行车计划实训
-                });
-                this.$Dictionary.trainOperation().then(list => {
-                    this.trainingOperateTypeMap['07'] = list; // 列车实训
-                });
-                const res = await getDetailList('training_type');
-                this.typeList = res.data;
-                if (LangStorage.getLang() == 'en' && this.typeList) {
-                    this.typeList.forEach(item => {
-                        switch (item.code) {
-                        case '01':
-                            item.name = 'Control permission operation';
-                            break;
-                        case '02':
-                            item.name = 'Signalling machine operation';
-                            break;
-                        case '03':
-                            item.name = 'Turnout operation';
-                            break;
-                        case '04':
-                            item.name = 'Section operation';
-                            break;
-                        case '05':
-                            item.name = 'Platform operation';
-                            break;
-                        case '06':
-                            item.name = 'Train scheduling operation';
-                            break;
-                        case '07':
-                            item.name = 'Train operation';
-                            break;
-                        case '08':
-                            item.name = 'Temporary speed limit operation of the whole line';
-                            break;
-                        }
-                    });
-                }
+            this.typeList = [];
+            for (const val in ConstConfig.ConstSelect.trainingDeviceType) {
+                this.typeList.push({name: LangStorage.getLang() == 'en' ? ConstConfig.ConstSelect.trainingDeviceType[val].enlabel : ConstConfig.ConstSelect.trainingDeviceType[val].label, code: val});
             }
+            this.trainingOperateTypeMap = getTrainingOperateTypeMap();
         },
         async loadInitPage(examId) {
             if (examId) {
                 try {
                     const response = await getPublishMapInfo(this.$route.query.mapId);
                     if (response.data) {
-                        this.drawWay = response.data.drawWay;
                         this.lineCode = response.data.lineCode;
                         this.typeList = [];
                         await this.getList();
@@ -246,26 +187,7 @@ export default {
         async exmaStart() {
             this.disabled = true;
             await this.examDetail();
-            if (this.examList.length && !this.drawWay) {
-                examNotify({ examId: this.$route.params.examId }).then(resp => {
-                    const query = {
-                        group: resp.data,
-                        trainingId: this.examList[0].trainingId,
-                        userExamId: this.userExam.id,
-                        examQuestionId: this.examList[0].id,
-                        subSystem: this.$route.query.subSystem,
-                        examId: this.$route.params.examId,
-                        mapId: this.$route.query.mapId,
-                        lineCode: this.lineCode,
-                        noPreLogout: this.$route.query.noPreLogout
-                    };
-                    this.$router.push({ path: `${UrlConfig.display}/exam`, query: query });
-                    launchFullscreen();
-                }).catch(error => {
-                    this.disabled = false;
-                    this.$messageBox( this.$t('error.createSimulationFailed') + `: ${error.message}`);
-                });
-            } else if (this.examList.length && this.drawWay) {
+            if (this.examList.length) {
                 examNotifyNew({ examId: this.$route.params.examId }).then(resp => {
                     const query = {
                         group: resp.data,
diff --git a/src/views/ibp/ibpsystem/index.vue b/src/views/ibp/ibpsystem/index.vue
index a1c67cca6..c8b33e309 100644
--- a/src/views/ibp/ibpsystem/index.vue
+++ b/src/views/ibp/ibpsystem/index.vue
@@ -66,9 +66,6 @@ export default {
         ]),
         ibpId() {
             return ['ibp', (Math.random().toFixed(5)) * 100000].join('_');
-        },
-        drawWay() {
-            return this.$route.query.drawWay + '';
         }
     },
     watch: {
diff --git a/src/views/iscs/iscsDesign/mapmanage/create.vue b/src/views/iscs/iscsDesign/mapmanage/create.vue
index 1a1534691..5bf0aa462 100644
--- a/src/views/iscs/iscsDesign/mapmanage/create.vue
+++ b/src/views/iscs/iscsDesign/mapmanage/create.vue
@@ -130,10 +130,8 @@ export default {
             getLineCodeList().then(response => {
                 this.lineCodeList = response.data;
             });
-
             // 新地图
-            const drawWay = true;
-            getMapListByProject(drawWay).then(response => {
+            getMapListByProject().then(response => {
                 this.publishMapList = response.data;
             }).catch(() => {
                 this.$messageBox(this.$t('map.failedLoadListPublishedMaps'));
diff --git a/src/views/iscs/iscsSystem/stationConfig/dialog/alarm.vue b/src/views/iscs/iscsSystem/stationConfig/dialog/alarm.vue
new file mode 100644
index 000000000..bf2574d7b
--- /dev/null
+++ b/src/views/iscs/iscsSystem/stationConfig/dialog/alarm.vue
@@ -0,0 +1,57 @@
+<template>
+  <div>
+    <el-dialog
+      v-dialogDrag
+      class="iscs_fuzhou-01__systerm route-detail"
+      title="报警浏览"
+      :visible.sync="show"
+      width="500px"
+      :before-close="doClose"
+      :z-index="2000"
+      :modal="false"
+      :close-on-click-modal="false"
+    >
+      <div style="height: 300px">
+        <div v-for="(item, index) in alarmList" :key="index">{{ item.station }} {{ item.name }} 执行了 {{ item[item.key] ? 'XX保护动作' : '' }} {{ item[item.key] ? list[item.key][0] : list[item.key][1] }}操作</div>
+      </div>
+    </el-dialog>
+  </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');
+        }
+    }
+};
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+
+</style>
diff --git a/src/views/iscs/iscsSystem/stationConfig/dialog/incident.vue b/src/views/iscs/iscsSystem/stationConfig/dialog/incident.vue
new file mode 100644
index 000000000..ea7bb3d5b
--- /dev/null
+++ b/src/views/iscs/iscsSystem/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>{{ 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/iscsSystem/stationConfig/dialog/malfunction.vue b/src/views/iscs/iscsSystem/stationConfig/dialog/malfunction.vue
new file mode 100644
index 000000000..f03419ef2
--- /dev/null
+++ b/src/views/iscs/iscsSystem/stationConfig/dialog/malfunction.vue
@@ -0,0 +1,233 @@
+<template>
+  <div>
+    <el-dialog
+      v-dialogDrag
+      class="iscs_fuzhou-01__systerm route-detail"
+      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' }
+            ],
+            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.$refs['form'].validate((valid) => {
+                if (valid) {
+                    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);
+            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);
+                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);
+                    this.handleModel(model2);
+                    this.handleModel(model3);
+                    this.handleModel(model4);
+                    time = 1500;
+                }
+                setTimeout(() => {
+                    let models = {};
+                    // valve true 变绿 false 红色
+                    if (model.code == 'group_2' || model.code == 'group_52') {
+                        models = this.$iscs.iscsDevice['group_23'].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);
+                    }
+                }, 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;
+            }));
+            // 改变元素状态
+            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);
+                }
+            });
+            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);
+        },
+        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;
+        },
+        cancel() {
+            this.dialogShow = false;
+            this.formModel = {
+                value: ''
+            };
+        }
+    }
+};
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+
+</style>
diff --git a/src/views/iscs/iscsSystem/stationConfig/dialog/valve.vue b/src/views/iscs/iscsSystem/stationConfig/dialog/valve.vue
index fe38feba4..b7b079b69 100644
--- a/src/views/iscs/iscsSystem/stationConfig/dialog/valve.vue
+++ b/src/views/iscs/iscsSystem/stationConfig/dialog/valve.vue
@@ -59,6 +59,7 @@
 <script>
 import mapElement from '@/iscs/status/mapElement.js';
 import {deviceFactory} from '@/iscs/utils/parser';
+import { setNum } from '@/iscs/status/mapElement.js';
 
 export default {
     name: '',
@@ -89,7 +90,6 @@ export default {
     methods: {
         doShow(models) {
             this.model = models;
-            console.log(models);
             this.dialogShow = true;
             this.title = models.name || '弹窗名称';
             this.elemList = [];
@@ -122,12 +122,93 @@ export default {
             this.showSublayer = false;
             this.rowData[this.rowData.key] = !this.rowData[this.rowData.key];
             this.elemList.splice(this.activeIndex, 1, this.rowData);
-            this.model[this.rowData.key] = this.rowData[this.rowData.key];
+            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 {
+                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_23'].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 = [];
-            this.model.statusList.forEach(item => {
-                if (item.key == this.rowData.key && item.value === this.rowData[this.rowData.key]) {
+            model.statusList.forEach(item => {
+                if (item.key == 'valve' && item.value == model.valve) {
                     item.childList.forEach(ele => {
-                        Object.values(this.model.elemMap).forEach(elem => {
+                        Object.values(model.elemMap).forEach(elem => {
                             if (elem.type == ele.type) {
                                 arr.push({
                                     code: elem.code,
@@ -135,11 +216,10 @@ export default {
                                 });
                             }
                         });
-                        // const data = this.model.elemMap
                     });
                 }
             });
-            const models = [{...this.model, [this.rowData.key]: this.rowData[this.rowData.key]}];
+            const models = [{...model, valve: model.valve}];
             this.$store.dispatch('iscs/updateIscsDevices', models.map(el => {
                 const device = deviceFactory(el._type, el);
                 return device.model;
@@ -151,6 +231,22 @@ export default {
                     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);
         },
         doClose() {
             this.dialogShow = false;
@@ -163,6 +259,29 @@ export default {
         },
         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;
         }
     }
 };
diff --git a/src/views/iscs/iscsSystem/stationNav.vue b/src/views/iscs/iscsSystem/stationNav.vue
index ad3cef632..9e6fc95f7 100644
--- a/src/views/iscs/iscsSystem/stationNav.vue
+++ b/src/views/iscs/iscsSystem/stationNav.vue
@@ -57,7 +57,16 @@
         </div>
       </div>
       <div class="bottom-back" @click="back">返回</div>
+      <div class="bottom-back" :class="{'disable_box': alarmInfo}" @click="handleAlarmInfo">
+        报警
+        <span v-show="!alarmInfo" class="point_box" />
+      </div>
+      <div class="bottom-back" @click="getIncidentList">事件</div>
+      <div class="bottom-back" @click="handleMalfunction">故障设置</div>
     </div>
+    <alarm-config ref="alarmConfig" />
+    <incident-config ref="incidentConfig" />
+    <malfunction ref="malfunction" />
   </div>
 </template>
 <script>
@@ -72,13 +81,24 @@ import iscs_icon8 from '@/assets/iscs_system/iscs_icon8.png';
 import iscs_icon9 from '@/assets/iscs_system/iscs_icon9.png';
 import { getByGroupStationList } from '@/api/jmap/map';
 import { getToken } from '@/utils/auth';
-import { getSessionStorage } from '@/utils/auth';
+// import { getSessionStorage } from '@/utils/auth';
 import { creatSubscribe, clearSubscribe, displayTopic} from '@/utils/stomp';
 import { clearSimulation } from '@/api/simulation';
+
+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 {
+            alarmInfo: true,
             selectStation: 'mainHouseOne',
             stationList:[],
             tractionList:['象峰站', '罗汉山站', '树兜站', '东街口站', '达道站', '三叉街站', '葫芦阵站', '城门站', '胪雷站', '安平站', '梁厝站', '三江口站'],
@@ -290,6 +310,12 @@ export default {
         $route() {
             const data = Object.values(this.buttonList);
             this.initButtonGroup(data);
+        },
+        '$store.state.iscs.alarmList': function (list) {
+            this.alarmInfo = true;
+            if (list && list.length) {
+                this.alarmInfo = false;
+            }
         }
     },
     async created () {
@@ -378,6 +404,20 @@ export default {
             this.selectStation = item;
             this.selectChildren(this.$route.params.mode, false);
         },
+        // 获取事件列表
+        getIncidentList() {
+            this.$refs.incidentConfig.doShow();
+        },
+        // 获取报警信息
+        handleAlarmInfo() {
+            if (!this.alarmInfo) {
+                this.$refs.alarmConfig.doShow();
+            }
+        },
+        // 设置故障
+        handleMalfunction() {
+            this.$refs.malfunction.doShow();
+        },
         selectChildren(type, isReplace = false) { // 选择菜单
             let stationName = '';
             const station = this.stationList.find(each=>{ return each.id == this.selectStation; });
@@ -528,7 +568,23 @@ export default {
     cursor: pointer;
     font-size: 0.8vw;
     float: right;
-    margin-right: 5px;
+	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;
+	}
 }
 .eachButton{
     padding: 2px 0px;
diff --git a/src/views/iscsSystem/index.vue b/src/views/iscsSystem/index.vue
index 91f6f9f92..3a64755df 100644
--- a/src/views/iscsSystem/index.vue
+++ b/src/views/iscsSystem/index.vue
@@ -13,10 +13,7 @@ import {getIscsData} from '@/api/iscs';
 // import {getIscsData} from '@/iscs/constant/iscsData';
 import { mapGetters } from 'vuex';
 import { exitFullscreen } from '@/utils/screen';
-import { putJointTrainingSimulationUser } from '@/api/chat';
 import { putJointTrainingSimulationUserNew} from '@/api/jointTraining';
-// import { handlerIscsEvent } from '@/api/simulation';
-// import { IscsOperation } from '@/scripts/ConstDic';
 import { deepAssign } from '@/utils/index';
 import { getUID } from '@/iscs/utils/Uid';
 
@@ -67,9 +64,6 @@ export default {
         iscsId() {
             return ['iscs', (Math.random().toFixed(5)) * 100000].join('_');
         },
-        drawWay() {
-            return this.$route.query.drawWay + '';
-        },
         width() {
             return this.$store.state.config.width;
         },
@@ -103,7 +97,6 @@ export default {
             this.iscsDestroy();
             this.loading = true;
 
-            // const data = parser(getIscsData(mode, system, part), {width: this.canvasWidth, height: this.canvasHeight});
             this.$iscs = new Iscs({
                 dom: document.getElementById(this.iscsId),
                 config: {
@@ -262,17 +255,11 @@ export default {
         back() {
             this.group = this.$route.query.group;
             this.$store.dispatch('training/over').then(() => {
-                if (this.drawWay === 'true') {
-                    putJointTrainingSimulationUserNew(this.group).then(() => {
-                        this.$router.replace({ path: `/trainroom`, query: { group: this.group, lineCode:this.$route.query.lineCode, drawWay: this.drawWay } });
-                        exitFullscreen();
-                    });
-                } else {
-                    putJointTrainingSimulationUser(this.group).then(() => {
-                        this.$router.replace({ path: `/trainroom`, query: { group: this.group, lineCode:this.$route.query.lineCode } });
-                        exitFullscreen();
-                    });
-                }
+                putJointTrainingSimulationUserNew(this.group).then(() => {
+                    this.$router.replace({ path: `/trainroom`, query: { group: this.group, lineCode:this.$route.query.lineCode } });
+                    exitFullscreen();
+                });
+
             });
         },
         iscsDestroy() {
diff --git a/src/views/jlmap3d/device/jl3ddevice.vue b/src/views/jlmap3d/device/jl3ddevice.vue
index 5eedfb997..e5d1a49fb 100644
--- a/src/views/jlmap3d/device/jl3ddevice.vue
+++ b/src/views/jlmap3d/device/jl3ddevice.vue
@@ -26,7 +26,6 @@
 <script>
 	import Vue from 'vue';
 	import { JL3D_LOCAL_STATIC } from '@/api/jlmap3d/assets3d.js';
-	import { Jl3ddevice } from '@/jlmap3d/jl3ddevice/jl3ddevice.js';
 	import { Jl3ddeviceNew } from '@/jlmap3d/jl3ddevice/jl3ddeviceNew.js';
 
 	import Jl3ddeviceMsg from '@/views/jlmap3d/device/component/devicemsg';
@@ -135,13 +134,10 @@
 				this.windowstatus = true;
 				// this.jl3d.updatewindowstatus('1');
 	    }
-			if(this.$store.state.map.map.linkList){
-				this.datastatus = "old";
-	      this.initolddata(group,header);
-			}else{
-				this.datastatus = "new";
-				this.initnewdata(group,header);
-			}
+			//定义转辙机动画
+			this.datastatus = "new";
+			this.initnewdata(group,header);
+
 			if(this.$route.query.type == "VR_PSD"){
 				this.jl3d.updatewindowstatus('1');
 				this.psdCode = this.$route.query.psdCode;
@@ -156,11 +152,6 @@
 		beforeDestroy() {
 		},
 		methods: {
-			initolddata: function (group,header) {
-				// let mapdata = this.$store.state.socket.device;
-				let dom = document.getElementById('jl3d');
-				this.jl3d = new Jl3ddevice(dom,group,header,this.mapId);
-			},
 			initnewdata: function (group,header){
 				let dom = document.getElementById('jl3d');
 				this.jl3d = new Jl3ddeviceNew(dom,group,header,this.mapId);
diff --git a/src/views/jlmap3d/devicetrain/component/devicetrainmenu.vue b/src/views/jlmap3d/devicetrain/component/devicetrainmenu.vue
deleted file mode 100644
index 2dee7bbba..000000000
--- a/src/views/jlmap3d/devicetrain/component/devicetrainmenu.vue
+++ /dev/null
@@ -1,149 +0,0 @@
-<template>
-  <div class="editassets">
-    <div class="asset-list">
-      <el-tabs style="margin:5px" v-model="activeName">
-
-        <el-tab-pane  class="displayscrol" label="设备部件" name="train">
-            <el-scrollbar ref="devicescrol" style="height:100%;margin-bottom:1px">
-                <el-form ref="form"   label-width="120px" size="mini">
-                  <div class="displaylist" v-for="(part,index) in devicelist"  @click="deviceselect(index,part)" v-show="true" >
-                      <div >
-                        <p style="border:1px solid #000;">设备名称:{{part.text}}</p>
-                      </div>
-                  </div>
-                </el-form>
-            </el-scrollbar>
-        </el-tab-pane>
-
-
-
-      </el-tabs>
-    </div>
-
-
-  </div>
-
-
-</template>
-
-<script>
-
-
-export default {
-  name: 'Jl3ddevicetrainMenu',
-  components: {
-
-  },
-  props: ['devicelist'],
-  data() {
-    return {
-      activeName: 'train',
-      filterText: '',
-      defaultProps: {
-        children: 'children',
-        label: 'label'
-      },
-      devicetype:true,
-    }
-  },
-  beforeDestroy() {
-
-  },
-  watch: {
-    filterText(val) {
-      this.$refs.tree2.filter(val);
-    },
-
-    'devicelist.length':function(newVal){
-      this.$refs.devicescrol.update()
-    }
-
-   },
-  methods: {
-
-    deviceselect(index,train){
-      this.$emit('sdevice',train);
-    },
-    filterNode(value, data) {
-        if (!value) return true;
-        return data.label.indexOf(value) !== -1;
-      },
-    init: function() {
-
-    },
-    back() {
-
-    },
-
-
-  },
-  mounted() {
-
-  }
-}
-</script>
-
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-  @import "src/styles/mixin.scss";
-  .editassets {
-    position: absolute;
-    float:right;
-    right:0;
-    top:0;
-    width: 20%;
-    height: 100%;
-    background-color:  #FFFFFF;
-    // background-repeat: no-repeat;
-    // background-size: 100%;
-    // border-radius:5px;
-  }
-
-  .asset-list{
-    position:absolute;
-    left:0;
-    width: 90%;
-    height: 100%;
-    left: 5px;
-    top: 15px;
-
-
-  }
-  .default-scrollbar {
-    width: 100%;
-    height: 100%;
-  }
-  .el-scrollbar__wrap.default-scrollbar__wrap {
-    overflow-x: hidden;
-    overflow-y: auto;
-  }
-  .el-scrollbar__view.default-scrollbar__view {}
-  .displayscrol{
-
-    height: 100%;
-  }
-  .displaylist {
-    float:left;
-    position: relative;
-    width:80%;
-    height:20px;
-    margin:0px 0px 20px 0px;
-
-  }
-  .modelpic{
-    left:0;
-    position: absolute;
-    width:100%;
-    height:100%;
-  }
-
-  .modeltop{
-    bottom:0;
-    z-index:0;
-  }
-  .modeldown{
-    top:0;
-    z-index:0;
-  }
-
-</style>
diff --git a/src/views/jlmap3d/devicetrain/jl3ddevicetrain.vue b/src/views/jlmap3d/devicetrain/jl3ddevicetrain.vue
deleted file mode 100644
index 490451a74..000000000
--- a/src/views/jlmap3d/devicetrain/jl3ddevicetrain.vue
+++ /dev/null
@@ -1,559 +0,0 @@
-<template>
-	<div class="jl3ddevice">
-		<div id="jl3d" class="jl3ddraw">
-
-    </div>
-		<Jl3ddevicetrain-Menu :devicelist="devicelist"  @sdevice="sdevice" >
-		</Jl3ddevicetrain-Menu>
-		<div class="menutop">
-			<el-button-group>
-
-
-			</el-button-group>
-		</div>
-		<div class="menudown" v-show = "modelcontrolview">
-			<el-button-group>
-				<el-button type="primary" @click="back">初始化</el-button>
-				<el-button type="primary" @click="alldisper">{{disperreset}}</el-button>
-				<!-- <el-button type="primary" @click="beforeclick">上一个</el-button>
-				<el-button type="primary" @click="startstop">暂停</el-button>
-				<el-button type="primary" @click="nextclick">下一个</el-button> -->
-
-				<el-button type="primary" @click="dispersed">{{devicestats}}</el-button>
-				<el-button type="primary" @click="selectdevice">返回继电器柜</el-button>
-			</el-button-group>
-		</div>
-
-		<div id="testjlmap3d" class="jlmap3ddraw">
-			<canvas id="canvastexture" />
-		</div>
-		<div class="showmsg" :style="{'background-image': 'url('+localStatic+'/texture/showmsg.png)'}" v-show="msgshow">
-			<div class="msgtop">
-				{{devicename}}
-			</div>
-			<div class="msgdown">
-				{{devicemsg}}
-			</div>
-
-		</div>
-
-		<div class="jlmap3dstats" >
-				<div class="modeldiv" v-show="showa1700">
-					<div class="statusdiv">JWJXC-1700</div>
-					<div class="statusdiv">状态:{{statsa1700}}</div>
-					<div class="statusdiv" @click="switcha1700">{{texta1700}}</div>
-				</div>
-
-				<div class="modeldiv" v-show="showb1700">
-					<div class="statusdiv">JWJXC-1700</div>
-					<div class="statusdiv">状态:{{statsb1700}}</div>
-					<div class="statusdiv" @click="switchb1700">{{textb1700}}</div>
-				</div>
-
-				<div class="modeldiv" v-show="showc1700">
-					<div class="statusdiv">JWJXC-1700</div>
-					<div class="statusdiv">状态:{{statsc1700}}</div>
-					<div class="statusdiv" @click="switchc1700">{{textc1700}}</div>
-				</div >
-
-				<div class="modeldiv" v-show="showh125">
-					<div class="statusdiv">JZJXC-H18</div>
-					<div class="statusdiv">状态:{{statsh18}}</div>
-					<div class="statusdiv" @click="switchh18">{{texth18}}</div>
-				</div>
-
-				<div class="modeldiv" v-show="showh18">
-					<div class="statusdiv">JWJXC-H125</div>
-					<div class="statusdiv">状态:{{statsh125}}</div>
-					<div class="statusdiv" @click="switch1000">{{texth125}}</div>
-				</div>
-
-				<div class="modeldiv" v-show="show135">
-					<div class="statusdiv">JYJXC-135</div>
-					<div class="statusdiv">状态:{{stats135}}</div>
-					<div class="statusdiv" @click="switch480">{{text135}}</div>
-				</div>
-
-		</div>
-
-	</div>
-
-</template>
-<script>
-	import Vue from 'vue';
-	import { JL3D_LOCAL_STATIC } from '@/api/jlmap3d/assets3d.js';
-	import { Jl3ddevice } from '@/jlmap3d/jl3ddevicetrain/jl3ddevicetrain.js';
-	import Jl3ddevicetrainMenu from '@/views/jlmap3d/devicetrain/component/devicetrainmenu';
-	export default {
-		name: 'devicetrain',
-		components: {
-			Jl3ddevicetrainMenu
-		},
-		data() {
-			return {
-				localStatic:JL3D_LOCAL_STATIC,
-				device: this.$route.params.deviceid,
-				jl3d: null,
-				devicelist:[],
-				msgshow:false,
-				devicename:"",
-				devicemsg:"",
-				devicestats:"分步拆解",
-				disperreset:"整体拆解",
-				statsa1700:"off",
-				statsb1700:"off",
-				statsc1700:"off",
-				statsh125:"off",
-				statsh18:"off",
-				stats135:"off",
-
-				texta1700:"关",
-				textb1700:"关",
-				textc1700:"关",
-				texth125:"关",
-				texth18:"关",
-				text135:"关",
-
-				ona1700:false,
-				onb1700:false,
-				onc1700:false,
-				onh125:false,
-				onh18:false,
-				on135:false,
-
-				showa1700:true,
-				showb1700:true,
-				showc1700:true,
-				showh125:true,
-				showh18:true,
-				show135:true,
-
-				modelcontrolview:false,
-			}
-		},
-		watch: {
-			// '$store.state.socket.device.code': {
-			// 	handler: function (newVal, oldVal) {
-			// 		if (newVal != oldVal) {
-			// 			this.jl3d.selectmodel(this.$store.state.socket.device);
-      //
-			// 		}
-			// 	}
-			// },
-			// '$store.state.socket.device': {
-			// 	deep: true,
-			// 	handler: function (newVal, oldVal) {
-			// 		if (newVal.code == oldVal.code) {
-			// 			this.jl3d.updateaction(newVal);
-			// 		} else {
-      //
-			// 		}
-      //
-			// 	}
-			// },
-			'jl3d.animastats': {
-				handler: function (newVal, oldVal) {
-					if (newVal != oldVal) {
-						if(newVal == false){
-							this.devicestats = "分步拆解";
-
-							this.disperreset = "整体拆解";
-						}
-						if(newVal == true){
-							this.devicestats = "分步复位";
-
-							this.disperreset = "整体复位";
-						}
-					}
-				}
-			},
-		},
-		computed: {
-			code() {
-				return this.$route.query.code;
-			}
-		},
-		mounted() {
-			window.updatemenulist = this.updatemenulist;
-			window.updatemsg = this.updatemsg;
-			window.upjdqstats = this.upjdqstats;
-      this.init();
-		},
-		beforeDestroy() {
-		},
-		methods: {
-			init: function () {
-				// let mapdata = this.$store.state.socket.device;
-				let dom = document.getElementById('jl3d');
-				this.jl3d = new Jl3ddevice(dom,this.device);
-			},
-			sdevice(changedata) {
-
-					this.jl3d.updateselect(changedata);
-
-			},
-			selectdevice(device) {
-				this.jl3d.backselect();
-			},
-			dispersed(device) {
-				this.jl3d.disperdevice1();
-			},
-			updatemenulist(devicelist,modelcode) {
-				this.devicelist = devicelist;
-
-				if(modelcode){
-					if(modelcode == "all"){
-						this.showa1700 = true;
-						this.showb1700 = true;
-						this.showc1700 = true;
-						this.showh125 = true;
-						this.showh18 = true;
-						this.show135 = true;
-						this.modelcontrolview = false;
-					}
-
-					if(modelcode == "jdq1"){
-						this.showa1700 = true;
-						this.showb1700 = false;
-						this.showc1700 = false;
-						this.showh125 = false;
-						this.showh18 = false;
-						this.show135 = false;
-						this.modelcontrolview = true;
-					}
-					console.log(modelcode);
-					if(modelcode == "jdq2"){
-						this.showa1700 = false;
-						this.showb1700 = true;
-						this.showc1700 = false;
-						this.showh125 = false;
-						this.showh18 = false;
-						this.show135 = false;
-						this.modelcontrolview = true;
-					}
-
-					if(modelcode == "jdq3"){
-						this.showa1700 = false;
-						this.showb1700 = false;
-						this.showc1700 = true;
-						this.showh125 = false;
-						this.showh18 = false;
-						this.show135 = false;
-						this.modelcontrolview = true;
-					}
-					if(modelcode == "jdq4"){
-						this.showa1700 = false;
-						this.showb1700 = false;
-						this.showc1700 = false;
-						this.showh125 = true;
-						this.showh18 = false;
-						this.show135 = false;
-						this.modelcontrolview = true;
-					}
-					if(modelcode == "jdq5"){
-						this.showa1700 = false;
-						this.showb1700 = false;
-						this.showc1700 = false;
-						this.showh125 = false;
-						this.showh18 = true;
-						this.show135 = false;
-						this.modelcontrolview = true;
-					}
-					if(modelcode == "jdq6"){
-						this.showa1700 = false;
-						this.showb1700 = false;
-						this.showc1700 = false;
-						this.showh125 = false;
-						this.showh18 = false;
-						this.show135 = true;
-						this.modelcontrolview = true;
-					}
-				}
-			},
-			updatemsg(name,text) {
-				// console.log(name);
-				// console.log(text);
-				if(name){
-					this.msgshow = true;
-					this.devicename = name;
-					this.devicemsg = text;
-				}else{
-					this.msgshow = false;
-				}
-			},
-			upjdqstats(data){
-				// console.log(data[0].on);
-				if(data[0].on != this.ona1700){
-					if(data[0].on == true){
-						this.texta1700 = "开";
-						this.statsa1700 = "on";
-						this.ona1700 = true;
-						this.jl3d.upmodelaction(0,0);
-					}
-					if(data[0].on == false){
-						this.texta1700 = "关";
-						this.statsa1700 = "off";
-						this.ona1700 = false;
-						this.jl3d.upmodelaction(1,0);
-					}
-				}
-
-				if(data[1].on != this.onb1700){
-					if(data[1].on == true){
-						this.textb1700 = "开";
-						this.statsb1700 = "on";
-						this.onb1700 = true;
-						this.jl3d.upmodelaction(0,1);
-					}
-					if(data[1].on == false){
-						this.textb1700 = "关";
-						this.statsb1700 = "off";
-						this.onb1700 = false;
-						this.jl3d.upmodelaction(1,1);
-					}
-				}
-
-				if(data[2].on != this.onc1700){
-					if(data[2].on == true){
-						this.textc1700 = "开";
-						this.statsc1700 = "on";
-						this.onc1700 = true;
-						this.jl3d.upmodelaction(0,2);
-					}
-					if(data[2].on == false){
-						this.textc1700 = "关";
-						this.statsc1700 = "off";
-						this.onc1700 = false;
-						this.jl3d.upmodelaction(1,2);
-					}
-				}
-				if(data[3].on != this.onh18){
-					if(data[3].on == true){
-						this.texth18 = "开";
-						this.statsh18 = "on";
-						this.onh18 = true;
-						this.jl3d.upmodelaction(0,3);
-					}
-					if(data[3].on == false){
-						this.texth18 = "关";
-						this.statsh18 = "off";
-						this.onh18 = false;
-						this.jl3d.upmodelaction(1,3);
-					}
-				}
-
-				if(data[4].on != this.onh125){
-					if(data[4].on == true){
-						this.texth125 = "开";
-						this.statsh125 = "on";
-						this.onh125 = true;
-						this.jl3d.upmodelaction(0,4);
-					}
-					if(data[4].on == false){
-						this.texth125 = "关";
-						this.statsh125 = "off";
-						this.onh125 = false;
-						this.jl3d.upmodelaction(1,4);
-					}
-				}
-				if(data[5].on != this.on135){
-					if(data[5].on == true){
-						this.text135 = "开";
-						this.stats135 = "on";
-						this.on135 = true;
-						this.jl3d.upmodelaction(0,5);
-					}
-					if(data[5].on == false){
-						this.text135 = "关";
-						this.stats135 = "off";
-						this.on135 = false;
-						this.jl3d.upmodelaction(1,5);
-					}
-				}
-			},
-			switcha1700(){
-				if(this.statsa1700 == "off"){
-
-					this.jl3d.sendmsg(0,0);
-				}else if(this.statsa1700 == "on"){
-
-					this.jl3d.sendmsg(1,0);
-				}
-			},
-			switchb1700(){
-				if(this.statsb1700 == "off"){
-
-					this.jl3d.sendmsg(0,1);
-				}else if(this.statsb1700 == "on"){
-
-					this.jl3d.sendmsg(1,1);
-				}
-			},
-			switchc1700(){
-				if(this.statsc1700 == "off"){
-
-					this.jl3d.sendmsg(0,2);
-				}else if(this.statsc1700 == "on"){
-
-					this.jl3d.sendmsg(1,2);
-				}
-			},
-			switchh18(){
-				if(this.statsh18 == "off"){
-
-					this.jl3d.sendmsg(0,3);
-				}else if(this.statsh18 == "on"){
-
-					this.jl3d.sendmsg(1,3);
-				}
-			},
-			switch1000(){
-				if(this.statsh125 == "off"){
-
-					this.jl3d.sendmsg(0,4);
-				}else if(this.statsh125 == "on"){
-
-					this.jl3d.sendmsg(1,4);
-				}
-			},
-			switch480(){
-				if(this.stats135 == "off"){
-
-					this.jl3d.sendmsg(0,5);
-				}else if(this.stats135 == "on"){
-
-					this.jl3d.sendmsg(1,5);
-				}
-			},
-			alldisper(){
-				this.jl3d.disperdevice2();
-			},
-			// startstop(changedata) {
-			// 	this.jl3d.buttoncontrol("startstop");
-			// },
-			// nextclick(changedata) {
-			// 	this.jl3d.buttoncontrol("next");
-			// },
-			// beforeclick(changedata) {
-			// 	this.jl3d.buttoncontrol("before");
-			// },
-			back() {
-				this.jl3d.resetmodel();
-				// move3();
-					// window.close();
-			},
-		}
-	}
-</script>
-<style scoped>
-	/* #jl3d {
-		width: 937px;
-		height: 937px;
-	} */
-
-	.jl3ddraw {
-    position: absolute;
-		float: left;
-    top:0;
-		/* left: 0; */
-		width: 80%;
-		height: 100%;
-		/* z-index: 1500; */
-	}
-	.showmsg{
-    position: absolute;
-    float:left;
-    left:0;
-    bottom:0;
-    width: 20%;
-    height: 40%;
-		z-index: 10;
-    background-repeat: no-repeat;
-    background-size: 100%;
-
-  }
-
-
-
-	.jlmap3dstats{
-		position: absolute;
-		float:left;
-		/* left:10px; */
-		/* top:20px; */
-		/* width: 60%; */
-		height: 10%;
-		z-index: 10;
-		background-color: #409EFF;
-		border-radius: 4px;
-		color: #FFFFFF
-		/* background-repeat: no-repeat; */
-		/* background-size: 100%; */
-	}
-
-	.modeldiv{
-		float:left;
-		/* width:16.66%; */
-		height:100%;
-		text-align: center;
-	}
-
-	.statusdiv{
-		/* float:left; */
-		/* top:50%; */
-		width:150px;
-		height:33%;
-		font-size: 20px;
-		border: 1px solid white;
-		text-align: center;
-		cursor:pointer;
-	}
-	.msgtop{
-		text-align: center;
-		width: 90%;
-		height:10%;
-		position: absolute;
-		top:10%;
-		font-size:30px;
-	  color:#FFFFFF;
-	}
-
-	.msgdown{
-		position: absolute;
-		top:20%;
-		left:5%;
-		width: 90%;
-		height:80%;
-		font-size:20px;
-	  color:#FFFFFF;
-		word-wrap:break-word;
-		letter-spacing:2px;
-	}
-
-  #testjlmap3d {
-  }
-
-  .jlmap3ddraw {
-    float: left;
-    left: 0;
-    width: 100%;
-    height: 100%;
-    position:absolute;
-    z-index: -1;
-  }
-	.menutop{
-		top:0;
-    right:20%;
-		position:absolute;
-	}
-	.menudown{
-		bottom:0;
-		right:20%;
-		position:absolute;
-	}
-  #canvastexture {
-    position: absolute;
-    float: left;
-    left: 0;
-    z-index: -12;
-  }
-</style>
diff --git a/src/views/jlmap3d/drive/drivecontrol/centerpane.vue b/src/views/jlmap3d/drive/drivecontrol/centerpane.vue
index 28cb67120..016b93185 100644
--- a/src/views/jlmap3d/drive/drivecontrol/centerpane.vue
+++ b/src/views/jlmap3d/drive/drivecontrol/centerpane.vue
@@ -35,10 +35,6 @@
 
 		},
 		props: {
-			drawWay: {
-				type: String,
-				default: 'false'
-			},
 			groupNum: {
 				type: String,
 				default: null
diff --git a/src/views/jlmap3d/drive/drivecontrol/drivecontrol.vue b/src/views/jlmap3d/drive/drivecontrol/drivecontrol.vue
index 570ba0974..2b9f3672f 100644
--- a/src/views/jlmap3d/drive/drivecontrol/drivecontrol.vue
+++ b/src/views/jlmap3d/drive/drivecontrol/drivecontrol.vue
@@ -16,7 +16,7 @@
 			</el-select>
 		</div>
 
-			<Centerc-Pane ref="centercontrol" :draw-way="drawWay" :group-num="groupnum" :user-role="userrole" />
+			<Centerc-Pane ref="centercontrol" :group-num="groupnum" :user-role="userrole" />
 
 			<!-- <Left-Pane ref="leftcontrol" /> -->
 
@@ -87,7 +87,6 @@ import axios from 'axios';
 				trainlist:null,
 				groupnum:"",
 				userrole:'',
-				drawWay:'',
 				nowdrive:null,
 
 	      tuoguanbutton:false,
diff --git a/src/views/jlmap3d/drive/drivecontrol/toprightpane.vue b/src/views/jlmap3d/drive/drivecontrol/toprightpane.vue
index 29794f493..70fb4dc5b 100644
--- a/src/views/jlmap3d/drive/drivecontrol/toprightpane.vue
+++ b/src/views/jlmap3d/drive/drivecontrol/toprightpane.vue
@@ -17,7 +17,7 @@
 		<div id="bmcbtc" class="panebutton" style="top:8%;left:17%;" @click="bmcbtcclick">
 			<img class="buttonimg" :src="cbtcbuttonimg" />
 			<div class="buttontext">BM/CBTC</div>
-		</div> -->
+		</div>
 		<!-- RM -->
 		<div id="rm" class="panebutton" style="top:8%;left:31%;" @click="rmclick">
 			<img class="buttonimg" :src="rmbuttonimg" />
@@ -83,20 +83,20 @@
 		</div> -->
 
 		<!-- 受电弓升 -->
-		<!-- <div id="sg" class="panebutton" style="bottom:6%;left:3%;" @click="sgclink">
+		<div id="sg" class="panebutton" style="bottom:6%;left:3%;" @click="sgclink">
 			<img class="buttonimg" :src="sgimg" />
 			<div class="buttontext">{{ $t('jlmap3d.electricGongSheng') }}</div>
-		</div> -->
+		</div> 
 		<!-- 受电弓降 -->
-		<!-- <div id="jg" class="panebutton" style="bottom:6%;left:17%;" @click="jgclick">
+		<div id="jg" class="panebutton" style="bottom:6%;left:17%;" @click="jgclick">
 			<img class="buttonimg" :src="jgimg" />
 			<div class="buttontext">{{ $t('jlmap3d.pantographFall') }}</div>
-		</div> -->
+		</div>
 		<!-- 试灯按钮 -->
 		<!-- <div id="sl" class="panebutton" style="bottom:6%;left:40%;" @click="slclick">
 			<img class="buttonimg" :src="slimg" />
 			<div class="buttontext">{{ $t('jlmap3d.lampButton') }}</div>
-		</div> -->
+		</div>
 		<!-- ATP切除 -->
 		<div id="atp" class="panebutton" style="bottom:6%;left:31%;" @click="atpclick">
 			<img class="buttonimg" :src="atpimg" />
@@ -193,6 +193,11 @@
 				doorleftimg:JL3D_LOCAL_STATIC+"/jl3d/control/green.png",
 				doorrightimg:JL3D_LOCAL_STATIC+"/jl3d/control/green.png",
 
+				//升降弓灯亮light暗dark
+				sgl:JL3D_LOCAL_STATIC+"/jl3d/control/greenz.png",
+				jgl:JL3D_LOCAL_STATIC+"/jl3d/control/redz.png",
+				sgd:JL3D_LOCAL_STATIC+"/jl3d/control/greenz.png",
+				jgd:JL3D_LOCAL_STATIC+"/jl3d/control/redz.png",
 			}
 		},
 		watch: {
diff --git a/src/views/jlmap3d/drive/sceneview/tmscomponent/tmsfault.vue b/src/views/jlmap3d/drive/sceneview/tmscomponent/tmsfault.vue
new file mode 100644
index 000000000..cce1a2b75
--- /dev/null
+++ b/src/views/jlmap3d/drive/sceneview/tmscomponent/tmsfault.vue
@@ -0,0 +1,95 @@
+<template>
+  <div class = "tmsfault" >
+    <div class = "tmsvoltage">{{voltage}}</div>
+    <div class = "tmscurrent">{{current}}</div>
+    <div class = "tmslevel">{{level}}</div>
+    <div class = "tmsspeed">{{speed}}</div>
+  </div>
+</template>
+
+<script>
+
+import axios from 'axios';
+
+export default {
+  name: 'TmsFault',
+  components: {
+
+  },
+  data() {
+    return {
+      voltage:"750V",
+      current:"0A",
+      level:"",
+      speed:"km/h",
+    }
+  },
+  mounted() {
+  },
+  beforeDestroy() {
+
+
+  },
+  watch: {
+
+  },
+  methods: {
+    init(){
+
+    },
+
+  },
+  beforeDestroy() {
+  }
+}
+</script>
+
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+.tmsfault{
+  position: absolute;
+  // border-style:solid;
+  // border-color: #ffffff;
+  top:7%;
+  width:100%;
+  height:84%;
+  color:white;
+}
+.tmsvoltage{
+  top:7%;
+  left:3%;
+  width: 15%;
+  position: absolute;
+  text-align: center;
+  // border-style:solid;
+  // border-color: #ffffff;
+}
+.tmscurrent{
+  top:7%;
+  left:19%;
+  width: 15%;
+  position: absolute;
+  text-align: center;
+  // border-style:solid;
+  // border-color: #ffffff;
+}
+.tmslevel{
+  top:7%;
+  left:60%;
+  width: 20%;
+  position: absolute;
+  text-align: center;
+  // border-style:solid;
+  // border-color: #ffffff;
+}
+.tmsspeed{
+  top:7%;
+  left:82%;
+  width: 15%;
+  position: absolute;
+  text-align: center;
+  // border-style:solid;
+  // border-color: #ffffff;
+
+}
+</style>
diff --git a/src/views/jlmap3d/drive/sceneview/tmsview.vue b/src/views/jlmap3d/drive/sceneview/tmsview.vue
index 9d2b603f4..cc3b0e810 100644
--- a/src/views/jlmap3d/drive/sceneview/tmsview.vue
+++ b/src/views/jlmap3d/drive/sceneview/tmsview.vue
@@ -1,6 +1,7 @@
 <template>
   <div class = "tms"   :style="{'background-image': 'url('+localStatic+'/jl3d/tms.png)'}" >
-
+    <Tms-Fault>
+    </Tms-Fault>
   </div>
 
 
@@ -10,10 +11,13 @@
 
 import axios from 'axios';
 import { JL3D_LOCAL_STATIC } from '@/api/jlmap3d/assets3d.js';
-export default {
-  name: 'SimulationTms',
-  components: {
 
+import TmsFault from '@/views/jlmap3d/drive/sceneview/tmscomponent/tmsfault';
+
+export default {
+  name: 'DriveTms',
+  components: {
+    TmsFault,
   },
   data() {
     return {
diff --git a/src/views/jlmap3d/edit/component/property.vue b/src/views/jlmap3d/edit/component/property.vue
index 4e7d7352c..cd02a55cb 100644
--- a/src/views/jlmap3d/edit/component/property.vue
+++ b/src/views/jlmap3d/edit/component/property.vue
@@ -55,6 +55,8 @@
 
                   <el-button v-if="selectmodel.meshtype == 'section'" type="vexscal" @click="sectionFlat">区段平整</el-button>
 
+                  <el-button v-if="selectmodel.meshtype == 'section'" type="vexscal" @click="sectionStraight">直区段修复</el-button>
+
                   <el-button v-if="selectmodel.meshtype == 'station'" @click="changeStationPos">自动对齐停车点</el-button>
 
                   <!-- <el-button v-if="selectmodel.meshtype == 'station'" type="vexscal" @click="vexScalVertical">高度改变</el-button> -->
@@ -191,7 +193,9 @@ export default {
     sectionFlat(){
       this.$emit('flat',this.selectmodel.code);
     },
-
+    sectionStraight(){
+      this.$emit('straight',this.selectmodel.code);
+    },
     changeStationPos(){
       this.$emit('changeStationPos',this.selectmodel);
     },
diff --git a/src/views/jlmap3d/edit/jlmap3dedit.vue b/src/views/jlmap3d/edit/jlmap3dedit.vue
index a2f34e2ab..d12d98b82 100644
--- a/src/views/jlmap3d/edit/jlmap3dedit.vue
+++ b/src/views/jlmap3d/edit/jlmap3dedit.vue
@@ -8,7 +8,7 @@
     <Edit-Action ref="action"  @saction="saction" @actionevent="actionevent">
     </Edit-Action>
 
-    <Edit-Property ref="property" :selectmodel='selectmodel' @alignment="alignment"  @vexscal= "vexscal" @changeStationPos="changeStationPos" @flat="flat">
+    <Edit-Property ref="property" :selectmodel='selectmodel' @alignment="alignment"  @vexscal= "vexscal" @changeStationPos="changeStationPos" @flat="flat" @straight="straight">
     </Edit-Property>
 
     <Edit-Assets ref="assets" @smodel="smodel" @stexture="stexture">
@@ -28,7 +28,6 @@
   import Vue from 'vue';
   import localStore from 'storejs';
   import { mapGetters } from 'vuex';
-  import SetTime from '@/views/oldMap/display/demon/setTime';
   import { getTrainingCbtcDemon, setTrainingCbtcInitTime } from '@/api/simulation';
 
   import { UrlConfig } from '@/scripts/ConstDic';
@@ -199,6 +198,10 @@
         this.jlmap3dedit.vexscaloff();
         this.jlmap3dedit.flatSection(alignmentCode);
       },
+      straight(alignmentCode){
+        this.jlmap3dedit.vexscaloff();
+        this.jlmap3dedit.straightSection(alignmentCode);
+      },
       save() {
         //console.log("save");
         console.log(this.jlmap3dedit.assetManager);
diff --git a/src/views/jlmap3d/jl3dassetmanager/component/modellist.vue b/src/views/jlmap3d/jl3dassetmanager/component/modellist.vue
index a26b3d458..a4e92cc21 100644
--- a/src/views/jlmap3d/jl3dassetmanager/component/modellist.vue
+++ b/src/views/jlmap3d/jl3dassetmanager/component/modellist.vue
@@ -152,17 +152,13 @@ export default {
       handleDelete(index, row) {
 
         console.log(row);
-        deleteAsset(row.modelurl).then(netdata => {
-          console.log(netdata);
           deleteAssetData(row.id).then(netdata => {
             this.tableData.splice(index, 1);
             console.log(netdata);
           }).catch(error => {
             console.log(error);
           });
-        }).catch(error => {
-          console.log(error);
-        });
+
 
       }
     }
diff --git a/src/views/jlmap3d/maintainer/component/faultdevice.vue b/src/views/jlmap3d/maintainer/component/faultdevice.vue
index 48f0fedf8..40d5259f1 100644
--- a/src/views/jlmap3d/maintainer/component/faultdevice.vue
+++ b/src/views/jlmap3d/maintainer/component/faultdevice.vue
@@ -9,11 +9,19 @@
 					<el-button type="primary" @click="switchhide">{{switchshow}}</el-button>
 				</el-button-group>
 			</div> -->
-			<div id="jl3ddevicerepir" class="repirbutton" v-show="repirShow" @click="devicerepir"></div>
-			<div id="jl3ddevicerepir" class="gousuobutton1" v-show="gousuoShow" @click="gousuoDingWei"></div>
-			<div id="jl3ddevicerepir" class="gousuobutton2" v-show="gousuoShow" @click="gousuoFanWei"></div>
+			<div id="jl3ddevicerepir" class="repirbutton"
+			:style="{'background-image': 'url('+localStatic+'/texture/xiuli.png)'}"
+			v-show="repirShow" @click="devicerepir"></div>
+			<div id="jl3ddevicerepir" class="gousuobutton1"
+			:style="{'background-image': 'url('+localStatic+'/texture/gousuodingwei.png)'}"
+			v-show="gousuoShow" @click="gousuoDingWei"></div>
+			<div id="jl3ddevicerepir" class="gousuobutton2"
+			:style="{'background-image': 'url('+localStatic+'/texture/gousuofanwei.png)'}"
+			v-show="gousuoShow" @click="gousuoFanWei"></div>
 
-			<div id="jl3dclose" class="backbutton" @click="close3ddeviceview"></div>
+			<div id="jl3dclose" class="backbutton"
+			:style="{'background-image': 'url('+localStatic+'/texture/xx.png)'}"
+			@click="close3ddeviceview"></div>
 			<Jl3ddevice-Msg v-show="isswitch">
 	    </Jl3ddevice-Msg>
 	    <Jl3ddevice-List v-show="isswitch" :devicelist="equiplist"  @sdevice="sdevice">
@@ -53,6 +61,7 @@
 		},
 		data() {
 			return {
+				localStatic:JL3D_LOCAL_STATIC,
 				datastatus:"",
 				jl3d: null,
 				windowstatus:false,
@@ -344,7 +353,6 @@
 		position: absolute;
 		right:15px;
 		bottom:5px;
-		background-image:url(JL3D_LOCAL_STATIC+"/texture/xiuli.png");
 		background-repeat:no-repeat;
 		background-size:100%;
 	}
@@ -355,7 +363,6 @@
 		position: absolute;
 		right:345px;
 		bottom:5px;
-		background-image:url(JL3D_LOCAL_STATIC+"/texture/gousuodingwei.png");
 		background-repeat:no-repeat;
 		background-size:100%;
 	}
@@ -366,7 +373,6 @@
 		position: absolute;
 		right:180px;
 		bottom:5px;
-		background-image:url(JL3D_LOCAL_STATIC+"/texture/gousuofanwei.png");
 		background-repeat:no-repeat;
 		background-size:100%;
 	}
@@ -376,7 +382,6 @@
 		position: absolute;
 		right:125px;
 		top:5px;
-		background-image:url(JL3D_LOCAL_STATIC+"/texture/xx.png");
 		background-repeat:no-repeat;
 		background-size:100%;
 	}
diff --git a/src/views/jlmap3d/passflow/jl3dpassflow.vue b/src/views/jlmap3d/passflow/jl3dpassflow.vue
index 30ac425db..0b18a3335 100644
--- a/src/views/jlmap3d/passflow/jl3dpassflow.vue
+++ b/src/views/jlmap3d/passflow/jl3dpassflow.vue
@@ -146,21 +146,21 @@ export default {
             if (this.renderswitch == true) {
                 this.rendermode = '退出监控';
                 this.renderswitch = false;
-                this.jl3d.switchviews('auto');
+                this.jl3d.switchviews('freeview');
             } else {
                 this.rendermode = '监控视角';
                 this.renderswitch = true;
-                this.jl3d.switchviews(4);
+                this.jl3d.switchviews('4views');
             }
         },
         switch4view() {
-            this.jl3d.switchviews(4);
+            this.jl3d.switchviews('4views');
         },
         switch2view() {
-            this.jl3d.switchviews(2);
+            this.jl3d.switchviews('2views');
         },
         switchauto() {
-            this.jl3d.switchviews('auto');
+            this.jl3d.switchviews('freeview');
         },
         updatestationlist(list) {
             // console.log(list);
@@ -255,7 +255,7 @@ export default {
 		border-radius:10px;
 	}
 	.listmenu{
-		top:50%;
+		/* top:50%; */
 	}
 	.menutop{
 		top:0;
diff --git a/src/views/jsxt/apply/index.vue b/src/views/jsxt/apply/index.vue
deleted file mode 100644
index f688805ad..000000000
--- a/src/views/jsxt/apply/index.vue
+++ /dev/null
@@ -1,555 +0,0 @@
-<template>
-  <div class="dictionary_box">
-    <template v-if="applyFlag">
-      <h2 style="text-align: center;">报名系统</h2>
-      <div class="joylink-card">
-        <data-form ref="dataform" :form="form" :form-model="formModel" :rules="rules" />
-        <span class="dialog-footer" style="margin: 0 auto; display: table;">
-          <el-button type="primary" @click="handleApply">报名</el-button>
-        </span>
-        <el-dialog title="请先登陆" custom-class="dialog-apply" :visible.sync="dialogVisible" width="740px" :close-on-press-escape="false" :show-close="false" :close-on-click-modal="false" :modal="true">
-          <div class="content-box">
-            <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">使用手机微信扫码登录</span>
-              </div>
-            </div>
-            <el-form ref="loginForm" 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>
-              <el-form-item>
-                <el-button type="primary" style="width:100%;" :loading="loading" @click.native.prevent="handleLogin">登陆</el-button>
-              </el-form-item>
-            </el-form>
-          </div>
-        </el-dialog>
-      </div>
-    </template>
-    <template v-else>
-      <div v-if="flag" class="apply_box">
-        <div class="img_box"><img :src="SAFS" alt=""></div>
-        <div style="width: 100%;text-align:center;margin-top:120px;"><i class="el-icon-success" style="color: green; font-size: 100px;" /></div>
-        <div style="width: 100%;margin-top: 25px;">
-          <div class="apply_box_title">报名成功!<br> 您的赛事信息如下:
-            <br>竞赛名称：{{ compition.name }}
-            <br>竞赛时间：{{ compition.startDate }}
-            <br>姓名：{{ formModel.name }}
-            <br>公司：{{ formModel.company }}
-            <br>部门：{{ formModel.department }}
-            <br>职位：{{ formModel.job }}
-            <br>电话：{{ formModel.phone.replace(/^(\d{3})\d{4}(\d+)/,"$1****$2") }}
-          </div>
-        </div>
-      </div>
-      <div v-if="!flag" class="applyAready_box">
-        <div class="img_box"><img :src="SAFS" alt=""></div>
-        <div style="width: 100%;text-align:center;margin-top:120px;"><img :src="applyAlready" class="applyAlready"></div>
-        <div style="width: 100%;margin-top: 25px;">
-          <div class="apply_box_title">
-            您的赛事信息如下:
-            <br>竞赛名称：{{ compition.name }}
-            <br>竞赛时间：{{ compition.startDate }}
-            <br>姓名：{{ formModel.name }}
-            <br>公司：{{ formModel.organization }}
-            <br>部门：{{ formModel.department }}
-            <br>职位：{{ formModel.position }}
-            <br>电话：{{ formModel.mobile.replace(/^(\d{3})\d{4}(\d+)/,"$1****$2") }}
-          </div>
-        </div>
-      </div>
-    </template>
-  </div>
-</template>
-
-<script>
-import { getToken } from '@/utils/auth';
-import { getLoginWmurl, checkLoginStatus } from '@/api/login';
-import { LoginParams } from '@/utils/login';
-import md5 from 'js-md5';
-import Cookies from 'js-cookie';
-import QrcodeVue from 'qrcode.vue';
-import { getUserinfoMobileCode } from '@/api/management/user';
-import { postSignUp, getRaceUserById, getRaceById } from '@/api/competition';
-import applyAlready from '@/assets/applyAlready.png';
-import SAFS from '@/assets/SAFS.png';
-
-export default {
-    name: '',
-    components: { QrcodeVue },
-    data() {
-        const validateUsername = (rule, value, callback) => {
-            if (value.length < 5 && !this.project.endsWith('gzb')) {
-                callback(new Error(this.$t('login.enterTheCorrectUserName')));
-            } else {
-                callback();
-            }
-        };
-        const validatePass = (rule, value, callback) => {
-            if (value.length < 5) {
-                callback(new Error(this.$t('login.passwordHint')));
-            } else {
-                callback();
-            }
-        };
-        return {
-            SAFS: SAFS,
-            dialogVisible: false,
-            applyAlready:applyAlready,
-            applyFlag: true,
-            flag: true,
-            loginClient: 'Design',
-            checkLogin: null,
-            sessionId: '',
-            userId: '',
-            loading: false,
-            loadingCode: false,
-            pwdDisplay: true,
-            loginUrl: '',
-            pwdType: 'password',
-            qrcodeClassName: 'login-qrcode',
-            cookiesName: 'UserName',
-            cookiesToken: 'UserToken',
-            loginForm: {
-                username: '',
-                password: ''
-            },
-            loginRules: {
-                username: [{ required: true, trigger: 'blur', validator: validateUsername }],
-                password: [{ required: true, trigger: 'blur', validator: validatePass }]
-            },
-            mobileCodeTime: 0,
-            formModel: {
-                name: '',
-                numberId: '',
-                company: '', // 公司
-                job: '', // 职位
-                department: '', // 部门
-                phone: '', // 电话
-                phoneCode: '' // 验证码
-            },
-            compition:{
-                name:'',
-                startDate:''
-            }
-        };
-    },
-    computed: {
-        form() {
-            const form = {
-                labelWidth: '100px',
-                items: [
-                    { prop: 'name', label: '名字', type: 'text' },
-                    { prop: 'numberId', label: '身份证号', type: 'text' },
-                    { prop: 'phone', propCode: 'phoneCode', mobileCodeTime: this.mobileCodeTime, label: '电话', type: 'tel', buttonClick: this.getTelCode, required: true },
-                    { prop: 'company', label: '公司', type: 'text' },
-                    { prop: 'department', label: '部门', type: 'text' },
-                    { prop: 'job', label: '职位', type: 'text' }
-                ]
-            };
-            return form;
-        },
-        rules() {
-            return {
-                name: [
-                    { required: true, message: '请填写名字', trigger: 'blur' }
-                ],
-                numberId: [
-                    { required: true, message: '请填写身份证号', trigger: 'blur' },
-                    { validator: this.validateNumberId, trigger: 'blur' }
-                ],
-                phone:[
-                    { required: true, message: '请填写电话', trigger: 'blur' }
-                ],
-                phoneCode:[
-                    { required: true, message: '请填写验证码', trigger: 'blur' }
-                ],
-                company:[
-                    { required: true, message: '请填写公司名称', trigger: 'blur' }
-                ],
-                job:[
-                    { required: true, message: '请填写职位', trigger: 'blur' }
-                ],
-                department: [
-                    { required: true, message: '请填写部门', trigger: 'blur' }
-                ]
-            };
-        }
-    },
-    mounted() {
-        this.getUserInfo();
-    },
-    methods: {
-        getUserInfo() {
-            if (getToken()) {
-                this.$store.dispatch('GetInfo', getToken()).then(res => {
-                    this.userId = res.id;
-                    if (this.checkLogin) {
-                        this.clearTimer(this.checkLogin);
-                    }
-                    getRaceUserById(this.$route.query.raceId).then(res => {
-                        if (res.data) {
-                            // 已经报名过
-                            getRaceById(this.$route.query.raceId).then(res=>{
-                                this.compition = res.data;
-                            });
-                            this.formModel = res.data;
-                            this.applyFlag = false;
-                            this.flag = false;
-                        }
-                    });
-                    this.dialogVisible = false;
-                });
-            } else {
-                this.dialogVisible = true;
-                this.applyFlag = true;
-                this.loginRefresh();
-            }
-        },
-        goToNext() {
-            if (this.loginForm.username.length < 5) {
-                return;
-            } else {
-                this.$refs['password'].focus();
-            }
-        },
-        showPwd() {
-            if (this.pwdType === 'password') {
-                this.pwdDisplay = false;
-                this.pwdType = '';
-            } else {
-                this.pwdType = 'password';
-                this.pwdDisplay = true;
-            }
-        },
-        handleLogin() {
-            this.$refs.loginForm.validate(valid => {
-                if (valid) {
-                    const model = Object.assign({}, this.loginForm);
-                    model.password = md5(model.password);
-                    model.type = this.modelType;
-                    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.getUserInfo();
-                    }).catch(error => {
-                        if (error.code === '30001') {
-                            this.tipsMsg = this.$t('login.accountOrPasswordIsIncorrect');
-                        } else {
-                            this.tipsMsg = error.message;
-                        }
-                        this.loading = false;
-                        setTimeout(() => { this.tipsMsg = ''; }, 5000);
-                    });
-                } else {
-                    console.log('error submit!!');
-                    return false;
-                }
-            });
-        },
-        loginRefresh() {
-            this.loadingCode = true;
-            getLoginWmurl(LoginParams[this.loginClient]).then(response => {
-                this.sessionId = response.data.sessionId;
-                this.loginUrl = response.data.url;
-                this.loadingCode = false;
-                this.checkLoginStatus();
-            }).catch((error) => {
-                console.log(error);
-                this.loadingCode = false;
-                this.$messageBox(this.$t('login.getLoginQrCode'));
-            });
-        },
-        checkLoginStatus() {
-            // 销毁则不再定时
-            if (this && this._isDestroyed) {
-                return;
-            }
-            // 清空已存在的定时器
-            // 设置定时器检测
-            this.clearTimer(this.checkLogin);
-            this.checkLogin = setTimeout(() => {
-                checkLoginStatus(this.sessionId).then(response => {
-                    // 设置扫码登录
-                    this.$store.dispatch('QrLoginSetting', { key: 'SET_TOKEN', value: response.data.token, type: this.modelType }).then(() => {
-                        // 清除定时器，设置路由
-                        this.clearTimer(this.checkLogin);
-                        this.getUserInfo();
-                    });
-                }).catch(() => {
-                    this.checkLoginStatus();
-                });
-            }, 3000);
-        },
-        clearTimer(timer) {
-            if (timer) {
-                clearTimeout(timer);
-                timer = null;
-            }
-        },
-        validateNumberId(rule, value, callback) {
-            var regIdCard = /^(^[1-9]\d{7}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])\d{3}$)|(^[1-9]\d{5}[1-9]\d{3}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])((\d{4})|\d{3}[Xx])$)$/; // 如果通过该验证，说明身份证格式正确，但准确性还需计算
-            if (regIdCard.test(value)) {
-                if (value.length == 18) {
-                    var idCardWi = [7, 9, 10, 5, 8, 4, 2, 1, 6, 3, 7, 9, 10, 5, 8, 4, 2]; // 将前17位加权因子保存在数组里
-                    var idCardY = [1, 0, 10, 9, 8, 7, 6, 5, 4, 3, 2]; // 这是除以11后，可能产生的11位余数、验证码，也保存成数组
-                    var idCardWiSum = 0; // 用来保存前17位各自乖以加权因子后的总和
-                    for (var i = 0; i < 17; i++) {
-                        idCardWiSum += value.substring(i, i + 1) * idCardWi[i];
-                    }
-                    var idCardMod = idCardWiSum % 11;// 计算出校验码所在数组的位置
-                    var idCardLast = value.substring(17);// 得到最后一位身份证号码
-                    // 如果等于2，则说明校验码是10，身份证号码最后一位应该是X
-                    if (idCardMod == 2) {
-                        if (idCardLast == 'X' || idCardLast == 'x') {
-                            callback();
-                        } else {
-                            callback(new Error('身份证号码错误'));
-                        }
-                    } else {
-                        // 用计算出的验证码与最后一位身份证号码匹配，如果一致，说明通过，否则是无效的身份证号码
-                        if (idCardLast == idCardY[idCardMod]) {
-                            callback();
-                        } else {
-                            callback(new Error('身份证号码错误'));
-                        }
-                    }
-                }
-            } else {
-                callback(new Error('身份证格式不正确'));
-            }
-        },
-        handleApply() {
-            this.$refs.dataform.validateForm(() => {
-                const param = {
-                    department: this.formModel.department,
-                    idNumber: this.formModel.numberId,
-                    mobile: this.formModel.phone,
-                    name: this.formModel.name,
-                    organization: this.formModel.company,
-                    position: this.formModel.job,
-                    vdCode: this.formModel.phoneCode,
-                    type: 'DISPATCHER'
-                };
-                if (this.$route.query.raceId) {
-                    postSignUp(this.$route.query.raceId, param).then(res => {
-                        // this.$messageBox('报名成功！');
-                        getRaceById(this.$route.query.raceId).then(res=>{
-                            this.compition = res.data;
-                        });
-                        this.applyFlag = false;
-                        this.flag = true;
-                    }).catch(error => {
-                        console.log(error);
-                        this.$messageBox(error.message);
-                    });
-                } else {
-                    this.$messageBox('报名地址有问题，请检查');
-                }
-            });
-        },
-        async getTelCode() {
-            const random = Math.floor(Math.random() * 10000 + 1);
-            const timeCount = Date.parse(new Date()) / 1000;
-            const pass = `${timeCount}86${this.formModel.phone}${random}`;
-            const param = {
-                mobile: this.formModel.phone,
-                nationCode: '86',
-                rd: random,
-                time: timeCount,
-                token: md5(pass)
-            };
-            try {
-
-                const res = await getUserinfoMobileCode(param);
-                if (res.code == 200) {
-                    this.mobileCodeTime = 30;
-                    this.mobileTime = setInterval(() => {
-                        this.mobileCodeTime--;
-                        if (this.mobileCodeTime <= 0) {
-                            this.mobileCodeTime = 0;
-                            clearInterval(this.mobileTime);
-                            this.mobileTime = null;
-                        }
-                    }, 1000);
-                }
-            } catch (error) {
-                this.$message.info(this.$t('global.codeFaile'));
-            }
-        }
-    }
-};
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-	$bg:#f0f0f0;
-    $qrbg:#fff;
-    $dark_gray:#889aa4;
-    $light_gray:#eee;
-    $qrcodeSize: 270px;
-    .applyAlready{
-        width:150px;
-    }
-	.applyAready_box{
-	}
-	.dictionary_box{
-		.joylink-card{
-			width: 800px;
-			margin: 0 auto 20px;
-			padding: 24px;
-			border: 1px solid #EBEEF5;
-			background-color: #FFF;
-			color: #303133;
-			transition: .3s;
-			box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1);
-		}
-	}
-	.img_box{
-		width: 100%;
-		height: 80px;
-		img{
-			width: 100%;
-			height: 100%;
-		}
-	}
-	.apply_box{
-		// display: flex;
-		// justify-content: center;
-		// align-items: center;
-		font-size: 25px;
-	}
-    .apply_box_title{
-			font-size: 22px;
-            line-height: 35px;
-            margin-left: 50%;
-            transform: translateX(-50%);
-            display: inline-block;
-		}
-	/deep/{
-		.dialog-apply{
-			.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 #fff inset !important;
-						}
-					}
-				}
-			}
-		}
-		.login-form {
-			width: 440px;
-			padding: 0 50px;
-		}
-		.content-box{
-			width: 100%;
-			display: flex;
-			align-items: center;
-			justify-content: center;
-			background: #fff;
-			box-sizing: border-box;
-			position: relative;
-		}
-
-		.item_form_box {
-			border: 1px solid #ccc;
-			border-radius: 5px;
-			color: #454545;
-			padding: 0px 10px;
-		}
-
-		.item_form_password{
-			margin-bottom: 20px;
-		}
-
-		.tip-message {
-			color: #F56C61;
-			padding: 5px;
-			font-size: 12px;
-			height: 23px;
-			margin-bottom: 10px;
-		}
-		.popover_box {
-			position: absolute;
-			right: 80px;
-			bottom: 106px;
-			cursor: pointer;
-			color: #225592;
-			font-size: 14px;
-		}
-		.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/jsxt/competition/demonList.vue b/src/views/jsxt/competition/demonList.vue
deleted file mode 100644
index 790fc26b8..000000000
--- a/src/views/jsxt/competition/demonList.vue
+++ /dev/null
@@ -1,120 +0,0 @@
-<template>
-  <div v-loading="loading" class="joylink-card map-list-main">
-    <div class="clearfix">
-      <span>{{ $t('global.mapList') }}</span>
-    </div>
-    <div class="left-map-list">
-      <div style="height: calc(100% - 76px); overflow: auto;">
-        <el-tree
-          ref="tree"
-          :data="treeList"
-          node-key="key"
-          :props="defaultProps"
-          highlight-current
-          :span="22"
-          :filter-node-method="filterNode"
-          :default-expanded-keys="expandList"
-          @node-click="clickEvent"
-        >
-          <span slot-scope="{ node }">
-            <span class="el-icon-tickets" />
-            <span>&nbsp;{{ node.data.name }}</span>
-          </span>
-        </el-tree>
-      </div>
-    </div>
-  </div>
-</template>
-<script>
-import { getSessionStorage } from '@/utils/auth';
-
-export default {
-    name: 'DemonList',
-    data() {
-        return {
-            loading: false,
-            treeList: [
-                {name: '西安考试地图', id: '13', type: 'Map', children: [
-                    {name: '理论竞赛', type: 'theory'},
-                    {name: '实操竞赛', type: 'operation'}
-                ]}
-            ],
-            defaultProps: {
-                children: 'children',
-                label: 'name'
-            },
-            mapId: '',
-            expandList: []
-        };
-    },
-    computed: {
-        userId() {
-            return this.$store.state.user.id;
-        },
-        project() {
-            return getSessionStorage('project');
-        }
-    },
-    watch: {
-    },
-    beforeDestroy () {
-    },
-    mounted() {
-
-    },
-    methods: {
-        filterNode(value, data) {
-            if (!value) return true;
-            return data.name.indexOf(value) !== -1;
-        },
-        clickEvent(obj, data, ele) {
-            if (obj.type === 'Map') {
-                this.mapId = obj.id;
-                this.$router.push({ path: `/jsxt/home`, query:{raceId:this.$route.query.raceId}});
-            } else if (obj.type === 'theory') {
-                const query = {type: 'theory', mapId: this.mapId, raceId:this.$route.query.raceId};
-                this.$router.push({path: `/jsxt/examDetail`, query: query});
-            } else if (obj.type === 'operation') {
-                const query = {type: 'operation', mapId: this.mapId, raceId:this.$route.query.raceId};
-                this.$router.push({path: `/jsxt/examDetail`, query: query});
-            }
-        }
-    }
-};
-</script>
-<style rel="stylesheet/scss" lang="scss" scoped>
-    .clearfix{
-        width:100%;
-        height: 47px;
-        line-height: 47px;
-        padding-left: 17px;
-        position:absolute;
-    }
-    .back-home {
-        float: right;
-        cursor: pointer;
-
-    &:hover {
-         color: #3ea726;
-     }
-    }
-    .left-map-list{
-        width: 100%;
-        height: 100%;
-        padding-top: 47px;
-    }
-    .map-list-main{
-        text-align:left;
-        height: 100%;
-        position: relative;
-    }
-</style>
-<style>
-    .el-tree {
-        overflow-x: hidden;
-    }
-
-    .el-tree-node.is-current>.el-tree-node__content {
-        background-color: #e4e3e3 !important;
-    }
-</style>
diff --git a/src/views/jsxt/competition/examDetail.vue b/src/views/jsxt/competition/examDetail.vue
deleted file mode 100644
index 1a02efe47..000000000
--- a/src/views/jsxt/competition/examDetail.vue
+++ /dev/null
@@ -1,194 +0,0 @@
-<template>
-  <div class="joylink-card">
-    <template v-if="resultFlag">
-      <b class="title-name">{{ examType }}</b>
-      <!-- <img class="img_box" :src="applyImg" alt=""> -->
-      <div class="btn-start">
-        <el-button :disabled="disabled" type="primary" @click="exmaStart">{{ $t('exam.startTheExam') }}</el-button>
-      </div>
-    </template>
-  </div>
-</template>
-<script>
-import { mapGetters } from 'vuex';
-import { getPublishMapInfo } from '@/api/jmap/map';
-import {getRaceUserById} from '@/api/competition';
-import { participantCreatTrainingRoom, getPracticalQuestion, getTheoryQuestion } from '@/api/competition';
-import {getRaceById } from '@/api/competition';
-
-export default {
-    name: 'ExamDetailView',
-    data() {
-        return {
-            disabled: false,
-            resultFlag: false,
-            lineCode: '' // 线路对应的皮肤
-        };
-    },
-    computed: {
-        ...mapGetters('trainingList', [
-            'trainingList'
-        ]),
-        examType() {
-            return this.$route.query.type === 'operation' ? '实操竞赛' : '理论竞赛';
-        }
-    },
-    watch: {
-        $route() {
-            this.getUserStatus();
-        }
-    },
-    async mounted() {
-        this.getUserStatus();
-    },
-    methods: {
-        async getUserStatus() {
-            this.resultFlag = false;
-            const res = await getRaceUserById(this.$route.query.raceId);
-            if (this.$route.query.type == 'theory' && (res.data.status == 4 || res.data.status == 5)) {
-                // this.$router.replace({ path: `/jsxt/result`, query: { type: 'theory', raceId:this.$route.query.raceId } });
-                this.$router.replace({ path: `/jsxt/theory/result?raceId=${this.$route.query.raceId}` });
-            } else if (this.$route.query.type == 'operation' && (res.data.status == 4 || res.data.status == 6)) {
-                // this.resultFlag = true;
-                this.$router.replace({ path: `/jsxt/result`, query: { subSystem: this.$route.query.subSystem, mapId: this.$route.query.mapId, type: 'operate', raceId:this.$route.query.raceId } });
-            } else {
-                this.resultFlag = true;
-            }
-        },
-        async exmaStart() {
-            if (this.$route.query.type == 'theory') {
-                getTheoryQuestion(this.$route.query.raceId).then((resp)=>{
-                    if (resp.data) {
-                        this.$router.push(`/jsxt/theory/detail?raceId=${this.$route.query.raceId}`);
-                    } else {
-                        this.$messageBox('试卷还没被加载');
-                    }
-
-                }).catch(()=>{
-                    this.$messageBox('试卷还没被加载');
-                });
-            } else {
-                const mapIdData = await getRaceById(this.$route.query.raceId);
-                const lineCodeData = await getPublishMapInfo(mapIdData.data.mapId);
-                getPracticalQuestion(this.$route.query.raceId).then((responese)=>{
-                    if (responese.data) {
-                        participantCreatTrainingRoom(this.$route.query.raceId, {mapId: mapIdData.data.mapId, prdType: '03'}).then(resp => {
-                            const query = { lineCode: lineCodeData.data.lineCode, mapId: mapIdData.data.mapId, group: resp.data, raceId: this.$route.query.raceId};
-                            this.$router.replace({ path: `/jointTrainingNew`, query: query});
-                        }).catch(() => {
-                            this.$message.error('进入实操竞赛房间失败！');
-                        });
-                    } else {
-                        this.$messageBox('试卷还没被加载');
-                    }
-                }).catch(()=>{
-                    this.$messageBox('试卷还没被加载');
-                });
-            }
-        }
-    }
-};
-</script>
-<style rel="stylesheet/scss" lang="scss" scoped>
-	@import "src/styles/mixin.scss";
-	.joylink-card{
-		height: 100%;
-		overflow: hidden;
-		position: relative;
-		.card-title{
-			height: 47px;
-			line-height: 47px;
-			text-align: center;
-			border-bottom: 1px solid #e6e6e6;
-		}
-		.card_content{
-			padding:50px;
-			padding-right: 0;
-			height: 100%;
-		}
-		.title-name{
-			// position: absolute;
-			// left: 50%;
-			// top: 66px;
-			// transform: translateX(-80px);
-			font-size: 30px;
-			text-align: center;
-			width: 100%;
-			margin-top: 50px;
-			display: block;
-		}
-	}
-	.img_box{
-		width: 400px;
-		margin: 0 auto;
-		display: block;
-	}
-
-	.menu li {
-		border-right: solid white 1px;
-	}
-
-	ul {
-		line-height: 22px;
-		margin: 5px;
-	}
-
-	.noList {
-		text-align: center;
-		padding-top: 20px;
-		font-size: 20px;
-	}
-
-	.btn-buy {
-		width: 100%;
-		display: flex;
-		justify-content: center;
-		padding-right: 50px;
-		transform: translateY(-30px);
-	}
-
-	::-webkit-scrollbar {
-		width: 10px;
-		height: 10px;
-	}
-
-	/deep/ {
-		.el-table__footer-wrapper {
-			.is-leaf:nth-child(3) {
-				font-size: 0;
-			}
-		}
-	}
-
-	.title {
-		font-weight: bold
-	}
-
-	.list-item {
-		font-size: 16px;
-		margin-bottom: 20px;
-	}
-
-	.list-label {
-		display: -moz-inline-box;
-		display: inline-block;
-		text-align: right;
-		width: 120px;
-	}
-
-	.list-table {
-		padding-top: 10px;
-		padding-left: 120px;
-		width: calc(100% - 80px);
-	}
-
-	.list-elem {
-		color: #808080 !important;
-	}
-
-	.btn-start {
-		text-align: center;
-		margin-bottom: 20px;
-		margin-top: 50px;
-	}
-</style>
diff --git a/src/views/jsxt/competition/home.vue b/src/views/jsxt/competition/home.vue
deleted file mode 100644
index 23e368aeb..000000000
--- a/src/views/jsxt/competition/home.vue
+++ /dev/null
@@ -1,85 +0,0 @@
-<template>
-  <div class="joylink-card">
-    <el-scrollbar wrap-class="scrollbar-wrapper">
-      <div class="content_box">
-        <h1 class="title">城市轨道交通竞赛平台</h1>
-        <div class="card-box">
-          <el-carousel :interval="4000" type="card" height="380px">
-            <el-carousel-item v-for="(item, index) in listImg" :key="index">
-              <img :src="item.src" alt="" height="100%" width="100%">
-            </el-carousel-item>
-          </el-carousel>
-        </div>
-        <div class="brief-box">{{ $t('demonstration.simulationSystemDescription') }}</div>
-      </div>
-    </el-scrollbar>
-  </div>
-</template>
-
-<script>
-import home1 from '@/assets/home/home1.png';
-import home2 from '@/assets/home/home2.png';
-import home3 from '@/assets/home/script.png';
-
-export default {
-    name: 'Home',
-    data() {
-        return {
-            listImg: [
-                { src: home1 },
-                { src: home2 },
-                { src: home3 }
-            ]
-        };
-    },
-    mounted() {
-    }
-};
-</script>
-<style rel="stylesheet/scss" lang="scss" scoped>
-    @import "src/styles/mixin.scss";
-
-    /deep/ .el-carousel {
-        overflow: hidden;
-        width:100%;
-    }
-    .joylink-card{
-        height: 100%;
-        font-family: 'Microsoft YaHei';
-        overflow: hidden;
-        .content_box{
-            padding: 0 100px 15px;
-        }
-        .title {
-            font-size: 35px;
-            width: 100%;
-            text-align: center;
-            font-weight: 400;
-            margin-top: 55px;
-            border-bottom: 2px dashed #333;
-            padding-bottom: 15px;
-            margin-bottom: 70px;
-            position: relative;
-
-            .logo-img {
-                position: absolute;
-                right: 0;
-                top: 0;
-                width: 55px;
-            }
-        }
-
-        .card-box {
-            width: 100%;
-            padding: 0 50px;
-        }
-
-        .brief-box {
-            font-size: 18px;
-            text-indent: 2em;
-            line-height: 32px;
-            padding: 40px 20px 0;
-            font-family: unset;
-        }
-    }
-</style>
diff --git a/src/views/jsxt/competition/index.vue b/src/views/jsxt/competition/index.vue
deleted file mode 100644
index 829c64b7c..000000000
--- a/src/views/jsxt/competition/index.vue
+++ /dev/null
@@ -1,69 +0,0 @@
-<template>
-  <div class="app-wrapper">
-    <div class="examList" :style="{width: widthLeft+'px'}">
-      <demon-list ref="demonList" />
-    </div>
-    <drap-left :width-left="widthLeft" @drapWidth="drapWidth" />
-    <transition>
-      <router-view :product-list="productList" />
-    </transition>
-  </div>
-</template>
-
-<script>
-import demonList from './demonList';
-import drapLeft from '@/views/components/drapLeft/index';
-import localStore from 'storejs';
-
-export default {
-    name: 'TrainingPlatform',
-    components: {
-        demonList,
-        drapLeft
-    },
-    data() {
-        return {
-            widthLeft: 450,
-            productList: []
-        };
-    },
-    computed: {
-        width() {
-            return this.$store.state.app.width;
-        },
-        userId() {
-            return this.$store.state.user.id;
-        }
-    },
-    mounted() {
-        this.widthLeft = Number(localStore.get('LeftWidth')) ? Number(localStore.get('LeftWidth')) : 450;
-    },
-    methods: {
-        drapWidth(width) {
-            this.widthLeft = Number(width);
-        }
-    }
-};
-</script>
-<style rel="stylesheet/scss" lang="scss" scoped>
-    @import "src/styles/mixin.scss";
-
-    .app-wrapper {
-    @include clearfix;
-        position: relative;
-        height: 100%;
-        width: 100%;
-        overflow: hidden;
-    }
-
-    .examList {
-        height: 100%;
-        float: left;
-    }
-	/deep/ .scrollbar-wrapper{
-		overflow-x: hidden;
-	}
-	/deep/ .el-scrollbar__bar.is-horizontal {
-		display: none;
-	}
-</style>
diff --git a/src/views/jsxt/competition/result.vue b/src/views/jsxt/competition/result.vue
deleted file mode 100644
index 311c96b31..000000000
--- a/src/views/jsxt/competition/result.vue
+++ /dev/null
@@ -1,185 +0,0 @@
-<template>
-  <div v-loading="loading" class="joylink-card paper">
-    <div class="card-title">
-      <span style="font-weight:bold ">{{ $t('exam.examResultsDetails') }}</span>
-    </div>
-    <div class="context">
-      <!--<div>{{ `得分：${operateScoreData}分` }}</div>-->
-      <!-- <el-form ref="form" :model="resultModel" size="mini">
-        <el-form-item :label="this.$t('exam.testScores')+':'" prop="score">
-          <span>{{ resultModel.score + ' '+ $t('exam.points') }}</span>
-        </el-form-item>
-        <el-form-item :label="this.$t('exam.examTime')+':'" prop="detail">
-          <span>{{ Math.ceil((resultModel.usedTime || 0)/60) + ' '+ $t('global.minutes') }}</span>
-        </el-form-item>
-      </el-form> -->
-      <el-table :data="operateScoreData" border style="width: 100%; min-height: 200px;" :summary-method="getSummaries" show-summary>
-        <el-table-column prop="name" label="题目" />
-        <el-table-column prop="description" label="描述" />
-        <el-table-column prop="totalScore" label="分值" />
-        <el-table-column prop="score" label="得分" />
-        <!--<el-table-column v-if="this.$route.query.type ==='theory'" prop="correctAnswer" label="答题结果" />-->
-        <!--<el-table-column v-if="this.$route.query.type ==='theory'" prop="explain" label="说明" />-->
-        <!--<el-table-column v-if="this.$route.query.type ==='operate'" prop="scoringPointIndex" label="得分点">-->
-        <!--<template slot-scope="scope">-->
-        <!--<span>{{ '得分点'+scope.row.scoringPointIndex }}</span>-->
-        <!--</template>-->
-        <!--</el-table-column>-->
-        <!--<el-table-column v-if="this.$route.query.type ==='operate'" prop="scoringPointScore" label="得分点分值" />-->
-        <!--<el-table-column v-if="this.$route.query.type ==='operate'" prop="scoringPointGoal" label="得分点得分" />-->
-        <!--<el-table-column v-if="this.$route.query.type ==='operate'" prop="scoringPointExplain" label="得分点说明" />-->
-      </el-table>
-    </div>
-    <div class="draf_box">
-      <el-button type="primary " @click="back">返回首页</el-button>
-    </div>
-  </div>
-</template>
-<script>
-// import { submitExam } from '@/api/management/userexam';
-// import { UrlConfig } from '@/scripts/ConstDic';
-import { getCompetitionDetail, getPracticalCompetitionResult } from '@/api/competition';
-
-export default {
-    name: 'ExamResult',
-    props: {
-        examDetails: {
-            type: Object,
-            default: null
-        }
-    },
-    data() {
-        return {
-            resultModel: {
-                trainingName: '',
-                score: 0
-            },
-            theoryData: [
-                { title: '1', score: '2', goal: '0', correctAnswer: 'A', explain: '这是说明原因，所有A为正确答案' },
-                { title: '2', score: '2', goal: '0', correctAnswer: 'B', explain: '这是说明原因，所有B为正确答案' },
-                { title: '3', score: '2', goal: '0', correctAnswer: 'C', explain: '这是说明原因，所有C为正确答案' },
-                { title: '4', score: '2', goal: '0', correctAnswer: 'D', explain: '这是说明原因，所有D为正确答案' }
-            ],
-            operateData: [
-                { title: '1', score: '25', goal: '0', scoringPoints: [{score: '10', goal: '0', explain: '这是说明原因1'}, {score: '10', goal: '0', explain: '这是说明原因2'}, {score: '5', goal: '0', explain: '这是说明原因3'}] },
-                { title: '2', score: '25', goal: '0', scoringPoints: [{score: '10', goal: '0', explain: '这是说明原因1'}, {score: '10', goal: '0', explain: '这是说明原因2'}, {score: '5', goal: '0', explain: '这是说明原因3'}] },
-                { title: '3', score: '25', goal: '0', scoringPoints: [{score: '10', goal: '0', explain: '这是说明原因1'}, {score: '10', goal: '0', explain: '这是说明原因2'}, {score: '5', goal: '0', explain: '这是说明原因3'}] },
-                { title: '4', score: '25', goal: '0', scoringPoints: [{score: '10', goal: '0', explain: '这是说明原因1'}, {score: '10', goal: '0', explain: '这是说明原因2'}, {score: '5', goal: '0', explain: '这是说明原因3'}] }
-            ],
-            loading: true,
-            tableData: [],
-            operateScoreData: []
-        };
-    },
-    computed: {
-        height() {
-            return this.$store.state.app.height - 50;
-        }
-    },
-    created() {
-        this.submitExamData();
-    },
-    methods: {
-        getSummaries(param) { // 计算总分
-            const { columns, data } = param;
-            const sums = [];
-            columns.forEach((column, index) => {
-                if (index === 0) {
-                    sums[index] = this.$t('exam.totalScore');
-                    return;
-                }
-                if (column.property === 'score' || column.property === 'totalScore') {
-                    const values = data.map(item => Number(item[column.property]));
-                    if (!values.every(value => isNaN(value))) {
-                        sums[index] = values.reduce((prev, curr) => {
-                            const value = Number(curr);
-                            if (!isNaN(value)) {
-                                return prev + curr;
-                            } else {
-                                return prev;
-                            }
-                        }, 0);
-                        sums[index] += this.$t('exam.points');
-                    } else {
-                        sums[index] = '';
-                    }
-                }
-            });
-            return sums;
-        },
-        submitExamData() {
-            this.loading = false;
-            if (this.$route.query.type == 'theory') {
-                getCompetitionDetail(this.$route.query.raceId).then(res => {
-                    this.tableData = [];
-                    res.data.forEach(item => {
-                        this.tableData.push({
-                            title: item.topic,
-                            score: item.totalScore,
-                            goal: item.score,
-                            correctAnswer: item.correct ? '正确' : '错误',
-                            explain: item.remarks
-                        });
-                    });
-                });
-            } else if (this.$route.query.type == 'operate') {
-                this.tableData = [];
-                getPracticalCompetitionResult(this.$route.query.raceId).then(res => {
-                    this.operateScoreData = res.data;
-                });
-                // this.operateData.forEach(item => {
-                //     if (item.scoringPoints && item.scoringPoints.length) {
-                //         item.scoringPoints.forEach((elem, index) => {
-                //             this.tableData.push({
-                //                 title: item.title, score: index ? 0 : item.score, goal: index ? 0 : item.goal, scoringPointLength: item.scoringPoints.length, scoringPointIndex: index + 1, scoringPointScore: elem.score, scoringPointGoal: elem.goal, scoringPointExplain: elem.explain
-                //             });
-                //         });
-                //     }
-                // });
-            }
-        },
-        back() {
-            const query = {type: 'operation', mapId: this.$route.query.mapId, raceId:this.$route.query.raceId};
-            this.$router.push({path: `/jsxt/home`, query: query });
-        },
-        objectSpanMethod({ row, column, rowIndex, columnIndex }) {
-            if ((columnIndex === 0 || columnIndex === 1 || columnIndex === 2) && row.scoringPointLength) {
-                if (row.scoringPointIndex === 1) {
-                    return {
-                        rowspan: row.scoringPointLength,
-                        colspan: 1
-                    };
-                } else {
-                    return {
-                        rowspan: 0,
-                        colspan: 0
-                    };
-                }
-            }
-        }
-    }
-};
-</script>
-<style rel="stylesheet/scss" lang="scss" scoped>
-    .paper {
-        height: 100%;
-        overflow: hidden;
-        .card-title{
-            height: 47px;
-            line-height: 47px;
-            border-bottom: 1px solid #e6e6e6;
-            text-align: center;
-        }
-
-        .context {
-            padding: 30px 60px;
-            height: calc(100% - 107px);
-            overflow: auto;
-        }
-    }
-
-    .draf_box{
-        padding: 10px 0;
-        text-align: center;
-    }
-</style>
diff --git a/src/views/jsxt/competition/theory/question.vue b/src/views/jsxt/competition/theory/question.vue
deleted file mode 100644
index 207115cd3..000000000
--- a/src/views/jsxt/competition/theory/question.vue
+++ /dev/null
@@ -1,116 +0,0 @@
-<template>
-  <div class="question">
-    <div class="ql-editor" v-html="appendIndex($escapeHTML(`${option.topic}`), $vnode.key, option)" />
-    <template v-if="checkType(option, 'judge')">
-      <el-radio-group v-model="answer" disabled :class="{'select-box': option.rightAnswer != option.answer}" @change="onChnage">
-        <el-radio v-for="(el,i) in option.optionList" :key="i" :label="$str2number(el.id)" style="display: inline">
-          <span>{{ el.content }}</span>
-        </el-radio>
-      </el-radio-group>
-    </template>
-    <template v-else-if="checkType(option, 'select')">
-      <el-radio-group v-model="answer" disabled :class="{'select-box': option.rightAnswer != option.answer}" @change="onChnage">
-        <el-radio v-for="(el,i) in option.optionList" :key="i" :label="$str2number(el.id)" style="display: block">
-          <span>{{ $asc2chart(i+65) }}. </span>
-          <div class="ql-editor" style="display: inline; padding: 0" v-html="$escapeHTML(el.content)" />
-        </el-radio>
-      </el-radio-group>
-    </template>
-  </div>
-</template>
-
-<script>
-
-export default {
-    props: {
-        value: {
-            type: String,
-            default: ''
-        },
-        option: {
-            type: Object,
-            required: true
-        }
-    },
-    data() {
-        return {
-            answer: 0
-        };
-    },
-    watch: {
-        value(val) {
-            this.changeValue();
-        }
-    },
-    mounted() {
-        this.changeValue();
-    },
-    methods: {
-        changeValue() {
-            this.answer = parseInt(this.value);
-        },
-        checkType(option, type) {
-            return option.type == type;
-        },
-        appendIndex(str, index, option) {
-            let result = '';
-            const i = option.optionList.findIndex(ele => ele.correct);
-            if (option.type === 'select') {
-                if (option.answer == option.optionList[i].id) {
-                    result = `<span style="color: green;margin-left: 10px;">(正确 得分: ${option.score})</span>`;
-                } else {
-                    result = `<span style="color: red;margin-left: 10px;">(错误 正确答案: ${this.$asc2chart(i + 65)})</span>`;
-                }
-            } else if (option.type === 'judge') {
-                if (option.answer == option.optionList[i].id) {
-                    result = `<span style="color: green;margin-left: 10px;">(正确 得分: ${option.score})</span>`;
-                } else {
-                    result = `<span style="color: red;margin-left: 10px;">(错误 正确答案: ${option.optionList[i].content})</span>`;
-                }
-            }
-            this.$set(option, 'rightAnswer', option.optionList[i].id);
-            // 判断是否选择正确 来显示不同内容
-            return `${index + 1}. ${str} ${result}`;
-        },
-        onChnage(e) {
-            const answer = `${e}`;
-            this.$emit('input', answer);
-            this.$emit('save', {userExamQuestionId: this.option.id, answer: answer});
-        }
-    }
-};
-
-</script>
-<style lang="scss" scoped>
-	.rich-text {
-		padding: 0;
-		display: inline;
-	}
-
-	.question {
-		/deep/ {
-			.ql-editor {
-				line-height: 26px;
-				padding: 0;
-			}
-
-			.el-radio  {
-				color: #000;
-			}
-
-			.el-radio__label {
-				font-size: 16px;
-				line-height: 26px;
-			}
-
-			.el-radio-group .is-disabled .el-radio__label{
-				color: #333;
-			}
-
-			.select-box.el-radio-group .is-checked.is-disabled .el-radio__label{
-				color: red;
-			}
-
-        }
-	}
-</style>
diff --git a/src/views/jsxt/competition/theory/quiz/index.vue b/src/views/jsxt/competition/theory/quiz/index.vue
deleted file mode 100644
index 7a1b8af89..000000000
--- a/src/views/jsxt/competition/theory/quiz/index.vue
+++ /dev/null
@@ -1,285 +0,0 @@
-<template>
-  <el-container class="quiz">
-    <el-container class="quiz__container">
-      <el-header class="quiz__container-header layer-center">
-        <div class="title">{{ formModel.name }}</div>
-        <div class="notes">{{ formModel.description }}</div>
-      </el-header>
-      <el-main class="quiz__container-main layer-center">
-        <div v-for="(el,i) in sortedList" :id="'anchor__lst-'+i" :key="i" class="section">
-          <template v-if="el.children.length">
-            <div class="caption">{{ index2UnicodeList[i] }}、{{ el.title }} </div>
-            <question v-for="(item,j) in el.children" :id="'anchor__lst-'+item.type+'-'+item.index" :key="j" v-model="item.answer" class="context" :option="item" @save="onSave" />
-          </template>
-        </div>
-      </el-main>
-      <el-footer class="quiz__container-footer layer-center" @click="returnTop">
-        <div style="display: inline-block;position: relative;bottom: 20px;height: 40px;line-height: 40px;float: left;color:#F00;font-size: 12px;">温馨提示：考试过程中请退出或关闭本页面不会终止计时！</div>
-        <div style="display: inline-block;position: relative;bottom: 20px;height: 40px;line-height: 40px;margin-right: 10px;font-weight:bold;">{{ '剩余时间:'+countdownTime }}</div>
-        <el-button-group class="buttons">
-          <el-button v-loading="loading" type="primary" @click="commit">提 交</el-button>
-        </el-button-group>
-      </el-footer>
-    </el-container>
-  </el-container>
-</template>
-
-<script>
-// import { commitExam, getExamInfo, getUserExam, saveExamAnswer } from '@/api/exam.js';
-// import WindowResizeHandler from '@/mixin/WindowResizeHandler';
-import Question from './question';
-import localStore from 'storejs';
-import { postCompetitionTheory, getTheoryQuestion, quitCurrentRace } from '@/api/competition';
-import { computationTime } from '@/utils/date';
-
-export default {
-    components: {
-        Question
-    },
-    mixins: [
-        // WindowResizeHandler
-    ],
-    data() {
-        return {
-            index: 0,
-            height: 0,
-            loading: false,
-            formModel: {
-                description: '',
-                duration: 10,
-                name: '',
-                status: '',
-                totalScore: 0,
-                passScore: 10
-            },
-            examQuestions: [],
-            theoryAnswersMap: {},
-            countdownTime: '00:00:00',
-            theoryExamTime: 0,
-            countdown: null
-        };
-    },
-    computed: {
-        examId() {
-            return this.$route.params.examId;
-        },
-        userExamId() {
-            return this.$route.params.userExamId;
-        },
-        question() {
-            return this.examQuestions[this.index] || {};
-        },
-        index2UnicodeList() {
-            return ['一', '二', '三', '四'];
-        },
-        sortedList() {
-            return [
-                {
-                    title: '判断题',
-                    children: this.examQuestions.filter(el => { return el.type === 'judge'; })
-                },
-                {
-                    title: '选择题',
-                    children: this.examQuestions.filter(el => { return el.type === 'select'; })
-                }
-            ];
-        }
-    },
-    watch: {
-        '$router': function() {
-            this.loadInitData();
-        }
-    },
-    created() {
-        this.loadInitData();
-    },
-    beforeDestroy() {
-        quitCurrentRace(this.$route.query.raceId, {}).then(res=>{
-        });
-        if (this.countdown) {
-            clearInterval(this.countdown);
-        }
-    },
-    methods: {
-        loadInitData() {
-            // this.theoryAnswers = [];
-            this.theoryAnswersMap = {};
-            getTheoryQuestion(this.$route.query.raceId).then((resp)=>{
-                const storeAnswersKey = this.$store.state.user.id + '' + this.$route.query.raceId + 'theoryAnswers';
-                const storeAnswers = localStore.get(storeAnswersKey);
-                if (storeAnswers) {
-                    this.theoryAnswersMap = storeAnswers;
-                }
-                if (resp.data) {
-                    this.examQuestions = resp.data.questions.map((el, i) => {
-                        el.index = i;
-                        el.answer = this.theoryAnswersMap[el.id];
-                        return el;
-                    });
-                    const storeKey = this.$store.state.user.id + '' + this.$route.query.raceId + 'theory';
-                    const startTime = localStore.get(storeKey);
-                    if (startTime) {
-                        const dt = new Date().getTime() - startTime;
-                        this.theoryExamTime = resp.data.theoryExamTime * 60 - Math.floor(dt / 1000);
-                    } else {
-                        this.theoryExamTime = resp.data.theoryExamTime * 60;
-                        const storeValue = new Date().getTime();
-                        localStore.set(storeKey, storeValue);
-                    }
-                    this.countdownTime = computationTime(this.theoryExamTime);
-
-                    this.countdown = setInterval(() => {
-                        if (this.theoryExamTime <= 0) {
-                            if (this.countdown) {
-                                clearInterval(this.countdown);
-                            }
-                            this.commit();
-                        }
-                        this.theoryExamTime--;
-                        this.countdownTime = computationTime(this.theoryExamTime);
-                    }, 1000);
-                }
-            }).catch(error => { this.$message.error(`加载考试详情失败：${error.message}`); });
-        },
-        resizeHandler() {
-            this.height = this._clientHeight;
-        },
-        appendIndex(str, index) {
-            return `${index + 1}. ${str}`;
-        },
-        goAnchor(selector) {
-            const anchor = this.$el.querySelector(selector);
-            const el = this.$el.querySelector('.el-main');
-            if (anchor && el) {
-                el.scrollTop = anchor.offsetTop;
-            }
-        },
-        returnTop() {
-            document.querySelector('.el-header').scrollIntoView(true);
-        },
-        commit() {
-            let isFinish = true;
-            this.examQuestions.forEach(el => {
-                if (!el.answer) { isFinish = false; }
-            });
-
-            if (isFinish || this.theoryExamTime <= 0) {
-                this.doEnd();
-            } else {
-                this.$confirm('存在试题未完成，是否继续？', '提 示', {
-                    confirmButtonText: '确 定',
-                    cancelButtonText: '取 消',
-                    type: 'warning'
-                }).then(() => {
-                    this.doEnd();
-                }).catch( () => { });
-            }
-        },
-        doEnd() {
-            const theoryAnswers = [];
-            for (const key in this.theoryAnswersMap) {
-                theoryAnswers.push({questionId: key, answerOptionId: this.theoryAnswersMap[key]});
-            }
-            const params = {
-                competitionId: this.$route.query.raceId,
-                theoryAnswers: theoryAnswers
-            };
-            postCompetitionTheory(params).then(()=>{
-                const storeKey = this.$store.state.user.id + '' + this.$route.query.raceId + 'theory';
-                localStore.remove(storeKey);
-                this.$router.push({ path: `/jsxt/theory/result?raceId=${this.$route.query.raceId}` });
-            });
-        },
-        onSave(data) {
-            // this.theoryAnswers.push({
-            //     answerOptionId: data.answer,
-            //     questionId: data.userExamQuestionId
-            // });
-            this.theoryAnswersMap[data.userExamQuestionId] = data.answer;
-            // console.log(data, '问答题', this.theoryAnswers, this.theoryAnswersMap);
-            const storeKey = this.$store.state.user.id + '' + this.$route.query.raceId + 'theoryAnswers';
-            localStore.set(storeKey, this.theoryAnswersMap);
-
-        }
-    }
-};
-
-</script>
-<style lang="scss" scoped>
-
-	.layer-center {
-		width: 900px;
-		height: 100%;
-		margin: auto;
-		background: #fff;
-	}
-
-	.quiz {
-		background: #eee;
-		height: 100%;
-
-		&::-webkit-scrollbar {
-			display:none
-		}
-
-		&__card {
-			height: 100%;
-			.dir-item {
-				padding-left: 25px;
-			}
-
-			.dir-caption {
-				padding-left: 10px;
-				line-height: 26px;
-				background: #f1f1f1;
-			}
-
-		}
-
-		&__container {
-			height: 100%;
-
-			&-header {
-				height: auto !important;
-
-				.title {
-					font-size: 24px;
-					line-height: 60px;
-					font-weight: bold;
-					text-align: center;
-				}
-
-				.notes {
-					color:#606266;
-					white-space: nowrap;
-					overflow: hidden;
-					text-overflow: ellipsis;
-					margin:  0 20px;
-				}
-			}
-
-			&-main {
-				.section {
-					padding: 5px 20px;
-					.caption {
-						line-height: 26px;
-					}
-					.context {
-					}
-				}
-			}
-
-			&-footer {
-				text-align: right;
-				position: sticky;
-				bottom: 0px;
-				padding: 40px ;
-				.buttons {
-					position: relative;
-					bottom: 20px;
-				}
-			}
-		}
-	}
-
-</style>
diff --git a/src/views/jsxt/competition/theory/quiz/question.vue b/src/views/jsxt/competition/theory/quiz/question.vue
deleted file mode 100644
index 8871b1b61..000000000
--- a/src/views/jsxt/competition/theory/quiz/question.vue
+++ /dev/null
@@ -1,91 +0,0 @@
-<template>
-  <div class="question">
-    <div class="ql-editor" v-html="appendIndex($escapeHTML(`${option.topic}`), $vnode.key)" />
-    <template v-if="checkType(option, 'judge')">
-      <el-radio-group v-model="answer" @change="onChnage">
-        <el-radio v-for="(el,i) in option.optionList" :key="i" :label="$str2number(el.id)" style="display: inline">
-          <span>{{ el.content }}</span>
-        </el-radio>
-      </el-radio-group>
-    </template>
-    <template v-else-if="checkType(option, 'select')">
-      <el-radio-group v-model="answer" @change="onChnage">
-        <el-radio v-for="(el,i) in option.optionList" :key="i" :label="$str2number(el.id)" style="display: block">
-          <span>{{ $asc2chart(i+65) }}. </span>
-          <div class="ql-editor" style="display: inline; padding: 0" v-html="$escapeHTML(el.content)" />
-        </el-radio>
-      </el-radio-group>
-    </template>
-  </div>
-</template>
-
-<script>
-
-export default {
-    props: {
-        value: {
-            type: String,
-            default: ''
-        },
-        option: {
-            type: Object,
-            required: true
-        }
-    },
-    data() {
-        return {
-            answer: 0
-        };
-    },
-    watch: {
-        value(val) {
-            this.changeValue();
-        }
-    },
-    mounted() {
-        this.changeValue();
-    },
-    methods: {
-        changeValue() {
-            this.answer = parseInt(this.value);
-        },
-        checkType(option, type) {
-            return option.type == type;
-        },
-        appendIndex(str, index) {
-            return `${index + 1}. ${str}`;
-        },
-        onChnage(e) {
-            const answer = `${e}`;
-            this.$emit('input', answer);
-            this.$emit('save', {userExamQuestionId: this.option.id, answer: answer});
-        }
-    }
-};
-
-</script>
-<style lang="scss" scoped>
-	.rich-text {
-		padding: 0;
-		display: inline;
-	}
-
-	.question {
-		/deep/ {
-			.ql-editor {
-				line-height: 26px;
-				padding: 0;
-			}
-
-			.el-radio  {
-				color: #000;
-			}
-
-			.el-radio__label {
-				font-size: 16px;
-				line-height: 26px;
-			}
-
-        }
-	}
-</style>
diff --git a/src/views/jsxt/competition/theory/result.vue b/src/views/jsxt/competition/theory/result.vue
deleted file mode 100644
index 2b572fd33..000000000
--- a/src/views/jsxt/competition/theory/result.vue
+++ /dev/null
@@ -1,200 +0,0 @@
-<template>
-  <el-container class="quiz">
-    <el-container class="quiz__container">
-      <el-header class="quiz__container-header layer-center">
-        <div class="titles">考试结果</div>
-      </el-header>
-      <el-main class="quiz__container-main layer-center">
-        <div v-for="(el,i) in sortedList" :id="'anchor__lst-'+i" :key="i" class="section">
-          <template v-if="el.children.length">
-            <div class="caption">{{ index2UnicodeList[i] }}、{{ el.title }}</div>
-            <question v-for="(item,j) in el.children" :id="'anchor__lst-'+item.type+'-'+item.index" :key="j" v-model="item.answer" class="context" :option="item" />
-          </template>
-        </div>
-        <div style="padding-left: 20px;margin-top: 20px;">
-          <span>考试总分: </span>
-          <span style="font-size: 20px">{{ totalScore }}分</span>
-        </div>
-      </el-main>
-      <el-footer class="quiz__container-footer layer-center" @click="returnTop">
-        <el-button-group class="buttons">
-          <el-button v-loading="loading" type="primary" @click="commit">返回首页</el-button>
-        </el-button-group>
-      </el-footer>
-    </el-container>
-  </el-container>
-</template>
-
-<script>
-// import { commitExam, getExamInfo, getUserExam, saveExamAnswer } from '@/api/exam.js';
-// import WindowResizeHandler from '@/mixin/WindowResizeHandler';
-import Question from './question';
-// import { getTheoryQuestion } from '@/api/competition';
-import { getCompetitionDetail } from '@/api/competition';
-
-export default {
-    components: {
-        Question
-    },
-    mixins: [
-        // WindowResizeHandler
-    ],
-    data() {
-        return {
-            index: 0,
-            height: 0,
-            loading: false,
-            formModel: {
-                description: '',
-                duration: 10,
-                name: '',
-                status: '',
-                totalScore: 0,
-                passScore: 10
-            },
-            totalScore: 0,
-            examQuestions: []
-        };
-    },
-    computed: {
-        examId() {
-            return this.$route.params.examId;
-        },
-        userExamId() {
-            return this.$route.params.userExamId;
-        },
-        question() {
-            return this.examQuestions[this.index] || {};
-        },
-        index2UnicodeList() {
-            return ['一', '二', '三', '四'];
-        },
-        sortedList() {
-            return [
-                {
-                    title: '判断题',
-                    children: this.examQuestions.filter(el => { return el.type === 'judge'; })
-                },
-                {
-                    title: '选择题',
-                    children: this.examQuestions.filter(el => { return el.type === 'select'; })
-                }
-            ];
-        }
-    },
-    watch: {
-        '$router': function() {
-            this.loadInitData();
-        }
-    },
-    created() {
-        this.loadInitData();
-    },
-    methods: {
-        loadInitData() {
-            getCompetitionDetail(this.$route.query.raceId).then((resp)=>{
-                if (resp.data) {
-                    resp.data.forEach((item, i) => {
-                        this.examQuestions.push({...item.question, ...{answer: String(item.answerOptionId), score: item.score, index: i}});
-                    });
-                    this.totalScore = resp.data.reduce((pre, ver) => pre + ver.score, 0);
-                }
-            }).catch(error => { this.$message.error(`加载考试详情失败：${error.message}`); });
-        },
-        returnTop() {
-            document.querySelector('.el-header').scrollIntoView(true);
-        },
-        commit() {
-            if (this.$route.query.result) {
-                const query = { raceId:this.$route.query.raceId };
-                this.$router.push({path: `/refereeJsxt/home`, query: query });
-            } else {
-                const query = { raceId:this.$route.query.raceId };
-                this.$router.push({path: `/jsxt/home`, query: query });
-            }
-
-        }
-    }
-};
-
-</script>
-<style lang="scss" scoped>
-
-	.layer-center {
-		width: 900px;
-		height: 100%;
-		margin: auto;
-		background: #fff;
-		padding-top: 0;
-	}
-
-	.quiz {
-		background: #eee;
-		height: 100%;
-
-		&::-webkit-scrollbar {
-			display:none
-		}
-
-		&__card {
-			height: 100%;
-			.dir-item {
-				padding-left: 25px;
-			}
-
-			.dir-caption {
-				padding-left: 10px;
-				line-height: 26px;
-				background: #f1f1f1;
-			}
-
-		}
-
-		&__container {
-			height: 100%;
-
-			&-header {
-				height: auto !important;
-
-				.titles {
-					font-size: 24px;
-					line-height: 60px;
-					font-weight: bold;
-					text-align: center;
-					margin: 0 auto;
-				}
-
-				.notes {
-					color:#606266;
-					white-space: nowrap;
-					overflow: hidden;
-					text-overflow: ellipsis;
-					margin:  0 20px;
-				}
-			}
-
-			&-main {
-				.section {
-					padding: 5px 20px;
-					.caption {
-						line-height: 26px;
-					}
-					.context {
-					}
-				}
-			}
-
-			&-footer {
-				text-align: right;
-				position: sticky;
-				bottom: 0px;
-				padding: 40px ;
-				.buttons {
-					position: relative;
-					bottom: 20px;
-				}
-			}
-		}
-	}
-
-</style>
diff --git a/src/views/jsxt/refereeList/display.vue b/src/views/jsxt/refereeList/display.vue
deleted file mode 100644
index 1cad3d742..000000000
--- a/src/views/jsxt/refereeList/display.vue
+++ /dev/null
@@ -1,232 +0,0 @@
-<template>
-  <div class="main" style="overflow:hidden;width:auto;height:100%;">
-    <div class="map-view" style="width:auto;overflow:hidden;height:100%;">
-      <jlmap-visual ref="jlmapVisual" @onMenu="onContextmenu" />
-      <pop-menu ref="popMenu" :menu="menu" />
-    </div>
-    <menu-replay ref="menuReplay" />
-  </div>
-</template>
-<script>
-import JlmapVisual from '@/views/newMap/jlmapNew/index';
-import PopMenu from '@/components/PopMenu';
-import { loadNewMapDataByMapId } from '@/utils/loaddata';
-import { mapGetters } from 'vuex';
-import { checkLoginLine } from '@/api/login';
-import { EventBus } from '@/scripts/event-bus';
-import MenuReplay from './menuReplay';
-import { getToken } from '@/utils/auth';
-import { getDeviceMenuByDeviceType } from '@/scripts/ConstDic';
-import { creatSubscribe, clearSubscribe, displayTopic} from '@/utils/stomp';
-export default {
-    name:'RefereeDisplay',
-    components: {
-        JlmapVisual,
-        PopMenu,
-        MenuReplay
-    },
-    data() {
-        return {
-            checkLine: null,
-            menu: [],
-            menuNormal: []
-        };
-    },
-    computed: {
-        ...mapGetters([
-            'canvasWidth'
-        ]),
-        mapId() {
-            return this.$route.query.mapId;
-        },
-        ...mapGetters('map', [
-            'stationList'
-        ]),
-        ...mapGetters('training', [
-            'offsetStationCode'
-        ]),
-        ...mapGetters('config', [
-            'canvasId'
-        ]),
-        width() {
-            return this.$store.state.app.width;
-        },
-        height() {
-            return this.$store.state.app.height;
-        },
-        group() {
-            return this.$route.query.group;
-        }
-    },
-    watch: {
-        '$store.state.map.mapViewLoadedCount': function (val) { // 地图视图加载完成标识 开始加载默认状态
-            this.subscribe();
-            // this.mapBoxP = document.getElementById(this.canvasId).children[0];
-            // this.mapBoxP.style.cursor = '';
-        },
-        '$store.state.socket.equipmentStatus': function (val) {
-            if (val.length) {
-                this.statusMessage(val);
-            }
-        },
-        // '$store.state.socket.simulationError': function (val) {
-        //     if (val) {
-        //         this.simulationError(val);
-        //     }
-        // },
-        '$store.state.socket.simulationReset': function (val) {
-            if (val) {
-                this.simulationReset(val);
-            }
-        },
-        '$store.state.app.windowSizeCount': function() {
-            this.setWindowSize();
-        }
-    },
-
-    async mounted() {
-        window.onbeforeunload = this.clearSubscribe;
-        await this.setWindowSize();
-        await this.initLoadData();
-    },
-    async beforeDestroy() {
-        this.clearSubscribe();
-        await this.clearAllTimer();
-        await this.quit();
-        await this.$store.dispatch('training/reset');
-        await this.$store.dispatch('map/mapClear');
-    },
-    methods:{
-        // 仿真错误时，被动退出时调用
-        async back() {
-            // await this.$refs.menuScript.back();
-        },
-        clearSubscribe() {
-            clearSubscribe(`${displayTopic}\/${this.group}`);
-        },
-        async subscribe() {
-            this.clearSubscribe();
-            const header = { group: this.group || '', 'X-Token': getToken() };
-            creatSubscribe(`${displayTopic}\/${this.group}`, header);
-
-            await this.$store.dispatch('training/setHasSubscribed');
-        },
-        async statusMessage(list) {
-            await this.$store.dispatch('training/updateMapState', list);
-            await this.$store.dispatch('socket/setEquipmentStatus');
-        },
-        async simulationReset() {
-            await this.$store.dispatch('map/clearJlmapTrainView');
-            await this.$store.dispatch('map/setTrainWindowShow', false);
-            await this.$store.dispatch('training/over');
-            await this.$store.dispatch('socket/setSimulationReset');
-            await this.$store.dispatch('socket/setSimulationStart');
-            await this.$store.dispatch('training/setMapDefaultState');
-        },
-        // async simulationError() {
-        //     await this.$store.dispatch('map/clearJlmapTrainView');
-        //     await this.$store.dispatch('map/setTrainWindowShow', false);
-        //     await this.$store.dispatch('socket/setSimulationError');
-        //     await this.$store.dispatch('training/setMapDefaultState');
-        //     this.clearSubscribe();
-        //     this.$confirm(this.$t('tip.getMapStateDataException'), this.$t('tip.hint'), {
-        //         confirmButtonText: this.$t('global.confirm'),
-        //         showCancelButton: false,
-        //         type: 'warning'
-        //     }).then(() => {
-        //         this.$emit('back');
-        //     }).catch(() => {
-        //     });
-        // },
-        // 加载数据
-        async initLoadData() {
-            this.$store.dispatch('training/reset');
-            try {
-                await this.initLoadRecordData();
-                this.checkLoginLineTimer();
-            } catch (error) {
-                this.$messageBox(`初始化失败: ${error.message}`);
-                this.endViewLoading();
-            }
-        },
-        onContextmenu(em) {
-            this.point = {
-                x: em.clientX,
-                y: em.clientY
-            };
-            if (!em.deviceType) {
-                var menu = getDeviceMenuByDeviceType('Cancel');
-                this.$store.dispatch('menuOperation/setPopMenu', { position: this.point, menu: menu });
-            }
-        },
-        // 清除检查在线定时器
-        clearAllTimer() {
-            if (this.checkLine) {
-                clearTimeout(this.checkLine);
-                this.checkLine = null;
-            }
-        },
-        // 销毁仿真
-        async quit() {
-            await this.$store.dispatch('training/over');
-        },
-        // 设置检查在线定时器
-        checkLoginLineTimer() {
-            if (this.checkLine) {
-                clearTimeout(this.checkLine);
-            }
-            this.checkLine = setInterval(() => {
-                checkLoginLine();
-            }, 5000 * 60);
-        },
-        // 加载地图数据
-        async initLoadRecordData() {
-            this.switchMode('01');
-            if (parseInt(this.mapId)) {
-                await this.loadNewMapDataById(this.mapId);
-            } else {
-                this.endViewLoading();
-            }
-        },
-        // 结束加载状态
-        endViewLoading(isSuccess) {
-            if (!isSuccess) {
-                this.$store.dispatch('map/mapClear');
-            }
-            this.$nextTick(() => {
-                EventBus.$emit('viewLoading', false);
-            });
-        },
-        switchMode(prdType) {
-            this.$store.dispatch('training/setPrdType', prdType);
-        },
-        async loadNewMapDataById(mapId) {
-            try {
-                await loadNewMapDataByMapId(mapId);
-                await this.$store.dispatch('training/setMapDefaultState');
-            } catch (error) {
-                this.$messageBox(`获取地图数据失败: ${error.message}`);
-                this.endViewLoading();
-            }
-        },
-        setWindowSize() {
-            this.$nextTick(() => {
-                const width = this.width;
-                const height = this.height;
-                this.$store.dispatch('config/resize', { width, height });
-                this.$store.dispatch('training/updateOffsetStationCode', { offsetStationCode: this.offsetStationCode });
-            });
-        }
-    }
-};
-</script>
-<style rel="stylesheet/scss" lang="scss" scoped>
-	/deep/ {
-		.menu-item{
-			background: #f1ecec;
-			.pop-menu {
-				background: #5F9EA0;
-			}
-		}
-	}
-</style>
diff --git a/src/views/jsxt/refereeList/editScore.vue b/src/views/jsxt/refereeList/editScore.vue
deleted file mode 100644
index fad2dd07f..000000000
--- a/src/views/jsxt/refereeList/editScore.vue
+++ /dev/null
@@ -1,127 +0,0 @@
-<template>
-  <el-dialog v-dialogDrag title="修改分数" :visible.sync="show" top="150px" width="500px" :before-do-close="doClose" :close-on-click-modal="false">
-    <el-form ref="form" :model="info" :rules="rules" label-width="150px" class="demo-ruleForm">
-      <el-form-item :label="'理论分数('+ theoryScore +')'" prop="theoryScore">
-        <el-input v-model="info.theoryScore" style="width: 200px" />
-        <!-- <span style="font-size: 12px;margin-left: 10px;">(总分 {{ theoryScore }})</span> -->
-      </el-form-item>
-      <el-form-item :label="'实操分数('+ practicalScore +')'" prop="practiceScore">
-        <el-input v-model="info.practiceScore" style="width: 200px" />
-        <!-- <span style="font-size: 12px;margin-left: 10px;">(总分 {{ practicalScore }})</span> -->
-      </el-form-item>
-    </el-form>
-    <div class="edit_score">
-      <el-button type="primary" size="medium" :loading="loading" @click="editScore">修改</el-button>
-      <el-button size="medium" @click="doClose">取消</el-button>
-    </div>
-  </el-dialog>
-</template>
-<script>
-import { putRefereeScoring, getTestPaperDatail } from '@/api/competition';
-
-export default {
-    name:'EditScore',
-    data() {
-        return {
-            show: false,
-            loading:false,
-            info: {
-                raceId: 0,
-                userId: 0,
-                theoryScore: 0,
-                practiceScore: 0
-            },
-            theoryScore: 0,
-            practicalScore: 0
-        };
-    },
-    computed: {
-        rules() {
-            return {
-                theoryScore: [
-                    { required: true, message: '请输入理论分数', trigger: 'blur' },
-                    { validator: this.validatorNumber1 }
-                ],
-                practiceScore: [
-                    { required: true, message: '请输入实操分数', trigger: 'blur' },
-                    { validator: this.validatorNumber2 }
-                ]
-            };
-        }
-    },
-    methods: {
-        doShow(data) {
-            this.show = true;
-            this.reloadInfo(data);
-        },
-        reloadInfo(data) {
-            getTestPaperDatail(data.raceId).then(res => {
-                this.theoryScore = res.data.theoryScore;
-                this.practicalScore = res.data.practicalScore;
-                console.log(data);
-                this.info = {
-                    raceId: data.raceId,
-                    userId: data.userId,
-                    theoryScore: data.artificialTheoryScore || data.theoryScore,
-                    practiceScore: data.artificialPracticeScore || data.practiceScore
-                };
-            });
-        },
-        doClose() {
-            this.show = false;
-        },
-        editScore() {
-            this.$refs['form'].validate(valid => {
-                if (valid) {
-                    const data = {
-                        raceId: this.info.raceId,
-                        userId: this.info.userId,
-                        artificialTheoryScore: Number(this.info.theoryScore),
-                        artificialPracticeScore: Number(this.info.practiceScore)
-                    };
-                    putRefereeScoring(data).then(res => {
-                        this.doClose();
-                        this.$message.success('修改分数成功');
-                    }).catch(() => {
-                        this.doClose();
-                        this.$message.error('修改分数失败');
-                    });
-                }
-            });
-        },
-        validatorNumber1(rule, value, callback) {
-            if (Number(value) < 0) {
-                callback(new Error('输入分数不能小于0'));
-            } else if (Number(value) > 0 && Number(value) <= this.theoryScore) {
-                callback();
-            } else if (Number(value) > this.theoryScore) {
-                callback(new Error('输入分数大于当前试题分值'));
-            } else {
-                callback(new Error('请输入正确的分数'));
-            }
-        },
-        validatorNumber2(rule, value, callback) {
-            if (Number(value) < 0) {
-                callback(new Error('输入分数不能小于0'));
-            } else if (Number(value) > 0 && Number(value) <= this.practicalScore) {
-                callback();
-            } else if (Number(value) > this.practicalScore) {
-                callback(new Error('输入分数大于当前试题分值'));
-            } else {
-                callback(new Error('请输入正确的分数'));
-            }
-        }
-    }
-};
-</script>
-<style lang="scss" scoped>
-.edit_score{
-    text-align:center;
-    margin-top:20px;
-}
-/deep/{
-	.el-dialog__body{
-		padding-top: 10px;
-	}
-}
-</style>
diff --git a/src/views/jsxt/refereeList/index.vue b/src/views/jsxt/refereeList/index.vue
deleted file mode 100644
index 94c1b04fe..000000000
--- a/src/views/jsxt/refereeList/index.vue
+++ /dev/null
@@ -1,276 +0,0 @@
-<template>
-  <div class="refereeList">
-    <div class="raceName">{{ raceName }}竞赛</div>
-    <QueryListPage ref="queryListPage" :pager-config="pagerConfig" :query-form="queryForm" :query-list="queryList" />
-    <edit-score ref="editScore" />
-    <theory-result ref="theoryResult" />
-  </div>
-</template>
-
-<script>
-import { refereeEnterSimulation, loadingPaper, getRaceUserList, getRaceById, playBackReady } from '@/api/competition';
-import { getPublishMapInfo } from '@/api/jmap/map';
-import editScore from './editScore';
-import TheoryResult from './theoryResult';
-
-export default {
-    name: 'RefereeList',
-    components:{
-        editScore,
-        TheoryResult
-    },
-    data() {
-        return {
-            pagerConfig: {
-                pageSize: 'pageSize',
-                pageIndex: 'pageNum'
-            },
-            queryForm: {
-                labelWidth: '80px',
-                reset: true,
-                queryObject: {
-                    name: {
-                        type: 'text',
-                        label: '名字'
-                    },
-                    organization: {
-                        type: 'text',
-                        label: '公司'
-                    }
-                }
-            },
-            queryList: {
-                paginationHiden:true,
-                query: this.queryFunction,
-                selectCheckShow: false,
-                indexShow: true,
-                columns: [
-                    {
-                        title: '名字',
-                        prop: 'name',
-                        width:200
-                    },
-                    {
-                        title: '手机号',
-                        prop: 'mobile',
-                        width:140
-                    },
-                    {
-                        title: '公司',
-                        prop: 'organization',
-                        width:180
-                    },
-                    {
-                        title: '部门',
-                        prop: 'department'
-                    },
-                    {
-                        title: '报名时间',
-                        prop: 'time',
-                        width:180
-                    },
-                    {
-                        title: '状态',
-                        prop: 'status',
-                        width:100,
-                        type: 'tag',
-                        columnValue: (row) => { return this.covertStatus(row.status); },
-                        tagType: (row) => { return 'success'; }
-                    },
-                    {
-                        title: '理论分数',
-                        prop: 'theoryScore',
-                        width:100,
-                        type: 'tag',
-                        columnValue: (row) => { return row.artificialTheoryScore ? `${row.theoryScore}(${row.artificialTheoryScore})` : this.covert(row.theoryScore); },
-                        tagType: (row) => { return 'success'; }
-                    },
-                    {
-                        title: '实操分数',
-                        prop: 'practiceScore',
-                        width:100,
-                        type: 'tag',
-                        columnValue: (row) => { return row.artificialPracticeScore ? `${row.practiceScore}(${row.artificialPracticeScore})` : this.covert(row.practiceScore); },
-                        tagType: (row) => { return 'success'; }
-                    },
-                    {
-                        title: '总分',
-                        prop: 'totalScore',
-                        width:100
-                    },
-                    // {
-                    //     title: '竞赛名称',
-                    //     prop: 'raceId',
-                    //     type: 'tag',
-                    //     columnValue: (row) => { return this.$convertField(row.raceId, this.raceList, ['value', 'label']); },
-                    //     tagType: (row) => { return 'success'; }
-                    // },
-                    {
-                        type: 'button',
-                        title: this.$t('global.operate'),
-                        buttons: [
-                            {
-                                name: '进入',
-                                handleClick: this.handleClick,
-                                type: '',
-                                showControl: (row) => { return row.status == '3'; }
-                            },
-                            {
-                                name: '理论结果',
-                                handleClick: this.handleTheoryResult,
-                                type: '',
-                                showControl: (row) => { return row.status == '5' || row.status == '4' || row.theoryScore != undefined; }
-                            },
-                            {
-                                name: '实操回放',
-                                handleClick: this.playBack,
-                                type: '',
-                                showControl: (row) => { return row.status == '4' || row.status == '6' || row.practiceScore != undefined; }
-                            },
-                            {
-                                name: '修改',
-                                handleClick: this.gradeScore,
-                                type: 'success',
-                                showControl: (row) => { return row.status == '4'; }
-                            }
-                        ]
-                    }
-                ],
-                actions: [
-                    { text: '导入试题', handler: this.handleAdd, fileType: 'file' }
-                ]
-            },
-            isLeaving:false,
-            inter:null,
-            mapId:'',
-            raceName:''
-        };
-    },
-    computed: {
-    },
-    created() {
-    },
-    mounted() {
-        this.getData();
-        getRaceById(this.$route.query.raceId).then(res=>{
-            this.mapId = res.data.mapId;
-            this.raceName = res.data.name;
-        });
-    },
-    beforeDestroy() {
-        this.isLeaving = true;
-    },
-    methods: {
-        covertStatus(status) {
-            const statusDict = {'0':'尚未参赛', '1':'进入赛场', '2':'理论赛场', '3':'实操赛场', '4':'完成比赛', '5':'完成理论', '6':'完成实操'};
-            return statusDict[status];
-        },
-        getData() {
-            const formModel = this.$refs.queryListPage.getFormModel();
-            const params = {raceId:this.$route.query.raceId, pageSize:999, pageNum:1, name: formModel ? formModel.name : '', organization: formModel ? formModel.organization : ''};
-            getRaceUserList(params).then(response=>{
-                this.queryList.data = response.data.list;
-                this.refresh();
-                clearTimeout(this.inter);
-                this.inter = setTimeout(() => {
-                    if (!this.isLeaving) {
-                        this.getData();
-                    }
-                }, 2000);
-            });
-        },
-        handleTheoryResult(index, row) {
-            this.$refs.theoryResult.doShow({row:row, raceId:this.$route.query.raceId});
-            // this.$router.replace({ path: `/jsxt/theory/result?raceId=${this.$route.query.raceId}&result=true` });
-        },
-        covert(data) {
-            if (data != undefined) {
-                if (data > 0) {
-                    return data;
-                } else {
-                    return '0';
-                }
-            } else {
-                return '';
-            }
-        },
-        handleAdd() {
-            const loading = this.$loading({
-                lock: true,
-                text: '正在导入中...',
-                spinner: 'el-icon-loading',
-                background: 'rgba(0, 0, 0, 0.7)'
-            });
-            setTimeout(() => {
-                const obj = document.getElementById('queryFormFilesInput');
-                if (!obj.files) return;
-                const f = obj.files[0];
-                const reader = new FileReader();
-                const that = this;
-                reader.readAsText(f, 'utf-8');
-                reader.onload = function(e) {
-                    const data = e.target.result;
-                    // console.log(JSON.parse(data));
-                    loadingPaper(that.$route.query.raceId, JSON.parse(data)).then(res => {
-                        that.$message.success('试题加载成功');
-                        loading.close();
-                    }).catch(error => {
-                        loading.close();
-                        that.$message.error('试题加载失败' + error.message);
-                    });
-                    obj.value = '';
-                };
-            });
-        },
-        // 查询函数
-        queryFunction(params) {
-            if (this.$route.query.raceId) {
-                params['raceId'] = this.$route.query.raceId;
-                params['pageSize'] = 999;
-            }
-            return getRaceUserList(params);
-        },
-        handleClick(index, row) {
-            const group = row.group;
-            getPublishMapInfo(this.mapId).then(resp=>{
-                refereeEnterSimulation(group).then(response=>{
-                    const query = { lineCode: resp.data.lineCode, mapId: this.mapId, group: group, raceId: this.$route.query.raceId};
-                    this.$router.push({ path: `/jointTrainingNew`, query: query});
-                });
-            });
-        },
-        playBack(index, row) {
-            const group = row.group;
-            getPublishMapInfo(this.mapId).then(resp=>{
-                playBackReady({group:group}).then(res=>{
-                    if (res.data) {
-                        const query = { lineCode: resp.data.lineCode, mapId: this.mapId, group: group, raceId: this.$route.query.raceId, userName:row.name};
-                        this.$router.push({ path: `/refereeJsxtDisplay`, query: query});
-                    } else {
-                        this.$messageBox('回放数据出错！');
-                    }
-
-                });
-            });
-        },
-        gradeScore(index, row) { // 裁判打分
-            this.$refs.editScore.doShow(row);
-        },
-        refresh() {
-            this.$refs.queryListPage.refresh(false);
-        }
-        // loadQuestions() {
-        //     this.$refs.questionList.doShow();
-        // }
-    }
-};
-</script>
-<style rel="stylesheet/scss" lang="scss" scoped>
-.raceName{
-    padding: 15px 0px;
-    font-size: 18px;
-    background: #fff;
-    text-align: center;
-    color: #409eff;
-}
-</style>
diff --git a/src/views/jsxt/refereeList/menuReplay.vue b/src/views/jsxt/refereeList/menuReplay.vue
deleted file mode 100644
index 280dd53ac..000000000
--- a/src/views/jsxt/refereeList/menuReplay.vue
+++ /dev/null
@@ -1,204 +0,0 @@
-<template>
-  <div>
-    <div class="menuReplay">
-      <div class="replay" @click="startPlaying">
-        <span v-if="isPlaying" class="ToPause" style="padding: 3px 0px">||</span>
-        <span v-else class="el-icon-caret-right" />
-      </div>
-      <div class="playSpeedGroup">
-        <div class="speedAdd" :style="isAddDisabled?'cursor:no-drop;':''" @click="addSpeed">
-          <span class="el-icon-plus" />
-        </div>
-        <div class="speedNum">{{ playSpeedList[playSpeedIndex].name }}</div>
-        <div class="speedMinus" :style="isMinusDisabled?'cursor:no-drop;':''" @click="minusSpeed">
-          <span class="el-icon-minus" />
-        </div>
-      </div>
-    </div>
-    <div class="comercialName">{{ userName }}的实操回放</div>
-    <el-button type="primary" class="back" @click="back">返回</el-button>
-    <chat-box :group="group" :user-role="userRole" />
-  </div>
-</template>
-<script>
-import { Notification } from 'element-ui';
-import ChatBox from '@/views/newMap/chatView/chatBox';
-import {setPlaySpeed, startPlaying, playingPause, endPlaying, fromPauseToPlay} from '@/api/competition';
-export default {
-    name:'MenuPlay',
-    components:{
-        ChatBox
-    },
-    data() {
-        return {
-            playSpeedIndex:5,
-            playSpeedList:[
-                {level:'-5', name:'-5X'},
-                {level:'-4', name:'-4X'},
-                {level:'-3', name:'-3X'},
-                {level:'-2', name:'-2X'},
-                {level:'-1', name:'-1X'},
-                {level:'1', name:'1X'},
-                {level:'2', name:'2X'},
-                {level:'3', name:'3X'},
-                {level:'4', name:'4X'},
-                {level:'5', name:'5X'}
-            ],
-            userRole:'AUDIENCE',
-            isFirstPlay:true,
-            isPlaying:false
-
-        };
-    },
-    computed:{
-        userName() {
-            return this.$route.query.userName;
-        },
-        group() {
-            return this.$route.query.group;
-        },
-        isAddDisabled() {
-            return this.playSpeedIndex >= this.playSpeedList.length - 1;
-        },
-        isMinusDisabled() {
-            return this.playSpeedIndex <= 0;
-        }
-    },
-    watch: {
-        '$store.state.socket.playBackFinish':function() {
-            this.isPlaying = false;
-            this.isFirstPlay = true;
-        }
-    },
-    beforeDestroy() {
-        // if (this.isPlaying) {
-        endPlaying({}).then(res=>{
-        });
-        // }
-    },
-    methods:{
-        back() {
-            this.$store.dispatch('training/over').then(() => {
-                history.go(-1);
-                Notification.closeAll();
-            });
-        },
-        addSpeed() {
-            if (this.playSpeedIndex < this.playSpeedList.length - 1) {
-                this.playSpeedIndex++;
-                // if (this.isPlaying) {
-                //     // 暂停播放
-                //     playingPause({}).then(res=>{
-                //         this.isPlaying = false;
-                //         setPlaySpeed({level:this.playSpeedList[this.playSpeedIndex].level}).then(res=>{
-                //         });
-                //     });
-
-                // } else {
-                setPlaySpeed({level:this.playSpeedList[this.playSpeedIndex].level}).then(res=>{
-                });
-                // }
-
-            }
-        },
-        minusSpeed() {
-            if (this.playSpeedIndex > 0) {
-                this.playSpeedIndex--;
-                // if (this.isPlaying) {
-                //     // 暂停播放
-                //     playingPause({}).then(res=>{
-                //         this.isPlaying = false;
-                //         setPlaySpeed({level:this.playSpeedList[this.playSpeedIndex].level}).then(res=>{
-                //         });
-                //     });
-                // } else {
-                setPlaySpeed({level:this.playSpeedList[this.playSpeedIndex].level}).then(res=>{
-                });
-                // }
-
-            }
-        },
-        startPlaying() {
-            if (this.isPlaying) {
-                // 暂停播放
-                playingPause({}).then(res=>{
-                    this.isPlaying = false;
-                });
-            } else {
-                if (this.isFirstPlay) {
-                // 第一次播放
-                    startPlaying({}).then(res=>{
-                        this.isPlaying = true;
-                        this.isFirstPlay = false;
-                    });
-                } else {
-                    // 从暂停中播放
-                    fromPauseToPlay({}).then(res=>{
-                        this.isPlaying = true;
-                    });
-                }
-            }
-        }
-    }
-};
-</script>
-<style lang="scss" scoped>
-.ToPause{
-    display: inline-block;
-}
-.menuReplay{
-    position: absolute;
-    width: 215px;
-    height: 40px;
-    right: 20px;
-    top: 15px;
-    z-index: 2;
-    background: #fff;
-    border-radius: 4px;
-    font-size: 0px;
-}
-.replay,.speedAdd,.speedMinus{
-    display: inline-block;
-    width: 40px;
-    text-align: center;
-    background: #409EFF;
-    border-radius: 5px;
-    margin-left: 9px;
-    margin-top: 8px;
-    cursor: pointer;
-    color: #fff;
-}
-.replay span,.speedAdd span,.speedMinus span{
-    font-size: 16px;
-    padding: 4px 0px;
-}
-.playSpeedGroup{display: inline-block;font-size:0px;}
-.speedNum{
-    display: inline-block;
-    width: 50px;
-    text-align: center;
-    border: 1px #dedede solid;
-    padding: 3px 0px;
-    margin-left: 9px;
-    font-size: 15px;
-    height: 24px;
-    vertical-align: bottom;
-}
-.back{
-    position: absolute;
-    right: 20px;
-    bottom: 15px;
-}
-.comercialName{
-    position: absolute;
-    left: 50%;
-    top: 0px;
-    padding: 10px 30px;
-    color: #000;
-    font-size: 18px;
-    -webkit-transform: translateX(-50%);
-    transform: translateX(-50%);
-    background: #fff;
-    border-radius: 0px 0px 10px 10px;
-}
-</style>
diff --git a/src/views/jsxt/refereeList/theoryResult.vue b/src/views/jsxt/refereeList/theoryResult.vue
deleted file mode 100644
index e9f9e6630..000000000
--- a/src/views/jsxt/refereeList/theoryResult.vue
+++ /dev/null
@@ -1,81 +0,0 @@
-<template>
-  <el-dialog v-dialogDrag :title="title" :visible.sync="show" class="TheroyResult" top="150px" width="900px" :before-do-close="doClose" :close-on-click-modal="false">
-    <div style="max-height:500px;overflow:auto;">
-      <div v-for="(el,i) in sortedList" :id="'anchor__lst-'+i" :key="i" class="section">
-        <template v-if="el.children.length">
-          <div class="caption">{{ index2UnicodeList[i] }}、{{ el.title }}</div>
-          <question v-for="(item,j) in el.children" :id="'anchor__lst-'+item.type+'-'+item.index" :key="j" v-model="item.answer" class="context" :option="item" />
-        </template>
-      </div>
-    </div>
-    <div style="padding-left: 20px;margin-top: 20px;">
-      <span>考试总分: </span>
-      <span style="font-size: 20px">{{ totalScore }}分</span>
-    </div>
-  </el-dialog>
-</template>
-<script>
-import Question from '@/views/jsxt/competition/theory/question';
-import { getTheroyCompetitionResult } from '@/api/competition';
-export default {
-    name:'TheroyResult',
-    components:{
-        Question
-    },
-    data() {
-        return {
-            title:'',
-            show: false,
-            loading:false,
-            totalScore: 0,
-            examQuestions: []
-        };
-    },
-    computed: {
-        question() {
-            return this.examQuestions[this.index] || {};
-        },
-        index2UnicodeList() {
-            return ['一', '二', '三', '四'];
-        },
-        sortedList() {
-            return [
-                {
-                    title: '判断题',
-                    children: this.examQuestions.filter(el => { return el.type === 'judge'; })
-                },
-                {
-                    title: '选择题',
-                    children: this.examQuestions.filter(el => { return el.type === 'select'; })
-                }
-            ];
-        }
-    },
-    methods:{
-        doShow({row, raceId}) {
-            this.loadInitData(raceId, row.id);
-            this.show = true;
-            this.title = '【' + row.organization + '】' + row.name + ' 理论结果';
-        },
-        doClose() {
-            this.show = false;
-        },
-        loadInitData(raceId, userId) {
-            this.examQuestions = [];
-            getTheroyCompetitionResult(raceId, userId).then((resp)=>{
-                if (resp.data) {
-                    resp.data.forEach((item, i) => {
-                        this.examQuestions.push({...item.question, ...{answer: String(item.answerOptionId), score: item.score, index: i}});
-                    });
-                    this.totalScore = resp.data.reduce((pre, ver) => pre + ver.score, 0);
-                }
-            }).catch(error => { this.$message.error(`加载考试详情失败：${error.message}`); });
-        }
-    }
-};
-</script>
-<style lang="scss">
-.TheroyResult .el-dialog .el-dialog__body{
-    padding-top:10px !important;
-}
-</style>
diff --git a/src/views/lesson/details.vue b/src/views/lesson/details.vue
index 819d73408..52e4e5c0c 100644
--- a/src/views/lesson/details.vue
+++ b/src/views/lesson/details.vue
@@ -86,13 +86,13 @@ export default {
             return data.name.indexOf(value) !== -1;
         },
         editLesson() {
-            this.$router.push( {path: `/design/lesson/details/edit/lessonEdit`, query: {id: this.lessonId, cityCode: this.$route.query.cityCode, mapId: this.$route.query.mapId, drawWay: this.$route.query.drawWay, lineCode:this.$route.query.lineCode}} );
+            this.$router.push( {path: `/design/lesson/details/edit/lessonEdit`, query: {id: this.lessonId, cityCode: this.$route.query.cityCode, mapId: this.$route.query.mapId, lineCode:this.$route.query.lineCode}} );
         },
         createChapte(node) {
-            this.$router.push({path: `/design/lesson/details/edit/chapterCreate`, query: {id: node.data.id, type:node.data.type, lessonId: this.lessonId, cityCode: this.$route.query.cityCode, mapId: this.$route.query.mapId, drawWay: this.$route.query.drawWay, lineCode:this.$route.query.lineCode}});
+            this.$router.push({path: `/design/lesson/details/edit/chapterCreate`, query: {id: node.data.id, type:node.data.type, lessonId: this.lessonId, cityCode: this.$route.query.cityCode, mapId: this.$route.query.mapId, lineCode:this.$route.query.lineCode}});
         },
         updateChapte(node) {
-            this.$router.push( {path: `/design/lesson/details/edit/chapterEdit`, query: {id: node.data.id, type:node.data.type, lessonId: this.lessonId, cityCode: this.$route.query.cityCode, mapId: this.$route.query.mapId, drawWay: this.$route.query.drawWay, lineCode:this.$route.query.lineCode}});
+            this.$router.push( {path: `/design/lesson/details/edit/chapterEdit`, query: {id: node.data.id, type:node.data.type, lessonId: this.lessonId, cityCode: this.$route.query.cityCode, mapId: this.$route.query.mapId, lineCode:this.$route.query.lineCode}});
         },
         showContextMenu(e, obj, node, vueElem) {
             if (obj && obj.type === 'Lesson' || obj.type === 'Chapter') {
diff --git a/src/views/lesson/home.vue b/src/views/lesson/home.vue
index 38ba9f500..5722f2deb 100644
--- a/src/views/lesson/home.vue
+++ b/src/views/lesson/home.vue
@@ -175,7 +175,7 @@ export default {
             this.$refs.queryListPage.refresh(true);
         },
         lessonCreate() {
-            this.$router.push({ path: `${UrlConfig.design.lessonEdit}/lessonCreate`, query: {mapId: this.$route.params.mapId, cityCode: this.$route.query.cityCode, drawWay: this.$route.query.drawWay, lineCode: this.$route.query.lineCode} });
+            this.$router.push({ path: `${UrlConfig.design.lessonEdit}/lessonCreate`, query: {mapId: this.$route.params.mapId, cityCode: this.$route.query.cityCode, lineCode: this.$route.query.lineCode} });
         },
         lessonCreateByPublish() {
             this.$nextTick(() => {
@@ -204,14 +204,10 @@ export default {
             this.$router.push({path: `${UrlConfig.design.taskManage}`, query: {mapId: this.$route.params.mapId}});
         },
         trainingManage() {
-            if (this.$route.query.drawWay + '' === 'true') {
-                this.$router.push({path: `${UrlConfig.design.trainingManage}`, query: {mapId: this.$route.params.mapId, drawWay: this.$route.query.drawWay, lineCode: this.$route.query.lineCode}});
-            } else {
-                this.$router.push({path: `${UrlConfig.design.trainingManageOld}`, query: {mapId: this.$route.params.mapId, drawWay: this.$route.query.drawWay, lineCode: this.$route.query.lineCode}});
-            }
+            this.$router.push({path: `${UrlConfig.design.trainingManage}`, query: {mapId: this.$route.params.mapId, lineCode: this.$route.query.lineCode}});
         },
         operationManage() {
-            this.$router.push({path: `${UrlConfig.design.trainingRule}`, query: {mapId: this.$route.params.mapId, lineCode: this.$route.query.lineCode, drawWay: this.$route.query.drawWay}});
+            this.$router.push({path: `${UrlConfig.design.trainingRule}`, query: {mapId: this.$route.params.mapId, lineCode: this.$route.query.lineCode}});
         },
         revertLesson(index, row) {
             this.$confirm(this.$t('tip.cancelCoursePublicationHint'), this.$t('global.tips'), {
@@ -234,7 +230,7 @@ export default {
             this.$refs.lessonDetail.show(row.id);
         },
         goDetail(index, row) {
-            this.$router.push({path: `/design/lesson/details`, query: {lessonId: row.id, lineCode: this.$route.query.lineCode, cityCode: this.$route.query.cityCode, mapId: this.$route.params.mapId, drawWay: this.$route.query.drawWay}});
+            this.$router.push({path: `/design/lesson/details`, query: {lessonId: row.id, lineCode: this.$route.query.lineCode, cityCode: this.$route.query.cityCode, mapId: this.$route.params.mapId}});
         }
     }
 };
diff --git a/src/views/lesson/lessoncategory/edit/chapter/index.vue b/src/views/lesson/lessoncategory/edit/chapter/index.vue
index 0c6b49d82..e0dab1a76 100644
--- a/src/views/lesson/lessoncategory/edit/chapter/index.vue
+++ b/src/views/lesson/lessoncategory/edit/chapter/index.vue
@@ -217,7 +217,7 @@ export default {
             });
         },
         back() {
-            this.$router.push({ path: `${UrlConfig.design.lessonHome}/${this.$route.query.mapId}`, query: {cityCode: this.$route.query.cityCode, drawWay: this.$route.query.drawWay, lineCode: this.$route.query.lineCode} });
+            this.$router.push({ path: `${UrlConfig.design.lessonHome}/${this.$route.query.mapId}`, query: {cityCode: this.$route.query.cityCode, lineCode: this.$route.query.lineCode} });
         }
     }
 };
diff --git a/src/views/lesson/lessoncategory/edit/chapter/list.vue b/src/views/lesson/lessoncategory/edit/chapter/list.vue
index 1726a4553..3447e06b9 100644
--- a/src/views/lesson/lessoncategory/edit/chapter/list.vue
+++ b/src/views/lesson/lessoncategory/edit/chapter/list.vue
@@ -15,7 +15,7 @@
 <script>
 import ConstConfig from '@/scripts/ConstConfig';
 import Cookies from 'js-cookie';
-import { pageQueryTraining, pageQueryTrainingNew } from '@/api/jmap/training';
+import { pageQueryTrainingNew } from '@/api/jmap/training';
 import { getPublishMapListOnline } from '@/api/jmap/map';
 import localStore from 'storejs';
 import { getCmdList } from '@/api/management/dictionary';
@@ -158,11 +158,7 @@ export default {
             params['mapId'] = this.detail.mapId;
             params['prdType'] = this.detail.prdType;
             let res = '';
-            if ((this.$route.query.drawWay + '') === 'true') {
-                res = await pageQueryTrainingNew(params);
-            } else {
-                res = await pageQueryTraining(params);
-            }
+            res = await pageQueryTrainingNew(params);
             res.data.list.forEach(item => {
                 item.isShow = false;
                 this.trainings.forEach(ele => {
@@ -179,103 +175,40 @@ export default {
             getPublishMapListOnline().then(response => {
                 this.mapIdList = response.data;
             });
-            if (this.$route.query.drawWay + '' === 'true') {
-                this.trainingOperateTypeMap = getTrainingOperateTypeMap();
-                const lineCode = this.$route.query.lineCode;
-                const res = await getCmdList(lineCode, {});
-                const trainingOperateList = [];
-                const trainingOperateConfigList = [];
-                const operateTypeMap = {
-                    Switch: [],
-                    Section: [],
-                    Signal: [],
-                    Stand: [],
-                    Station: [],
-                    ControlConvertMenu: [],
-                    TrainWindow: [],
-                    LimitControl: [],
-                    Driver: []
-                };
-                if (res && res.code === 200) {
-                    res.data.forEach(item => {
-                        (this.trainingOperateTypeMap[item.operateObject] || []).forEach(ele => {
-                            if (ele.value == item.operate && !operateTypeMap[item.operateObject].includes(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.trainingOperateTypeMap = getTrainingOperateTypeMap();
+            const lineCode = this.$route.query.lineCode;
+            const res = await getCmdList(lineCode, {});
+            const trainingOperateList = [];
+            const trainingOperateConfigList = [];
+            const operateTypeMap = {
+                Switch: [],
+                Section: [],
+                Signal: [],
+                Stand: [],
+                Station: [],
+                ControlConvertMenu: [],
+                TrainWindow: [],
+                LimitControl: [],
+                Driver: []
+            };
+            if (res && res.code === 200) {
+                res.data.forEach(item => {
+                    (this.trainingOperateTypeMap[item.operateObject] || []).forEach(ele => {
+                        if (ele.value == item.operate && !operateTypeMap[item.operateObject].includes(ele)) {
+                            operateTypeMap[item.operateObject].push(ele);
                         }
                     });
-                    this.queryForm.queryObject.type.config.data = trainingOperateConfigList;
-                    this.trainingTypeList = trainingOperateConfigList;
-                    this.trainingOperateTypeMap = operateTypeMap;
-                } else {
-                    this.$message.error(this.$t('error.failedToObtainTrainingType'));
-                }
+                    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.trainingOperateTypeMap = operateTypeMap;
             } else {
-                this.trainingOperateTypeMap = {};
-                this.$Dictionary.stationControl().then(list => {
-                    this.trainingOperateTypeMap['01'] = []; // 控制权实训
-                    list.forEach(item => {
-                        this.trainingOperateTypeMap['01'].push({value: item.code, label: item.name});
-                    });
-                });
-                this.$Dictionary.signalOperation().then(list => {
-                    this.trainingOperateTypeMap['02'] = []; // 信号机实训
-                    list.forEach(item => {
-                        this.trainingOperateTypeMap['02'].push({value: item.code, label: item.name});
-                    });
-                });
-                this.$Dictionary.switchOperation().then(list => {
-                    this.trainingOperateTypeMap['03'] = []; // 道岔实训
-                    list.forEach(item => {
-                        this.trainingOperateTypeMap['03'].push({value: item.code, label: item.name});
-                    });
-                });
-                this.$Dictionary.sectionOperation().then(list => {
-                    this.trainingOperateTypeMap['04'] = []; // 区段实训
-                    list.forEach(item => {
-                        this.trainingOperateTypeMap['04'].push({value: item.code, label: item.name});
-                    });
-                });
-                this.$Dictionary.stationStandOperation().then(list => {
-                    this.trainingOperateTypeMap['05'] = []; // 站台实训
-                    list.forEach(item => {
-                        this.trainingOperateTypeMap['05'].push({value: item.code, label: item.name});
-                    });
-                });
-                this.$Dictionary.trainPlanOperation().then(list => {
-                    this.trainingOperateTypeMap['06'] = []; // 行车计划实训
-                    list.forEach(item => {
-                        this.trainingOperateTypeMap['06'].push({value: item.code, label: item.name});
-                    });
-                });
-                this.$Dictionary.trainOperation().then(list => {
-                    this.trainingOperateTypeMap['07'] = []; // 列车实训
-                    list.forEach(item => {
-                        this.trainingOperateTypeMap['07'].push({value: item.code, label: item.name});
-                    });
-                });
-                this.$Dictionary.limitOperation().then(list => {
-                    this.trainingOperateTypeMap['08'] = []; // 限速实训
-                    list.forEach(item => {
-                        this.trainingOperateTypeMap['08'].push({value: item.code, label: item.name});
-                    });
-                });
-                // 获取实训类型
-                this.trainingTypeList = [];
-                this.$Dictionary.trainingType().then(list => {
-                    this.trainingTypeList = list;
-                    list.forEach(elem => {
-                        this.queryForm.queryObject.type.config.data.push({
-                            value: elem.code,
-                            label: elem.name
-                        });
-                    });
-                });
+                this.$message.error(this.$t('error.failedToObtainTrainingType'));
             }
             const json = localStore.get(this.$route.path);
             if (json && json.type) {
diff --git a/src/views/lesson/lessoncategory/edit/lesson/index.vue b/src/views/lesson/lessoncategory/edit/lesson/index.vue
index 4f6460801..012db9d59 100644
--- a/src/views/lesson/lessoncategory/edit/lesson/index.vue
+++ b/src/views/lesson/lessoncategory/edit/lesson/index.vue
@@ -189,7 +189,7 @@ export default {
             }
         },
         back() {
-            this.$router.push({ path: `${UrlConfig.design.lessonHome}/${this.$route.query.mapId}`, query: {cityCode: this.$route.query.cityCode, lineCode: this.$route.query.lineCode, drawWay: this.$route.query.drawWay} });
+            this.$router.push({ path: `${UrlConfig.design.lessonHome}/${this.$route.query.mapId}`, query: {cityCode: this.$route.query.cityCode, lineCode: this.$route.query.lineCode} });
         }
     }
 };
diff --git a/src/views/lesson/trainingRule/detail/index.vue b/src/views/lesson/trainingRule/detail/index.vue
index 8b9ada380..56a14f506 100644
--- a/src/views/lesson/trainingRule/detail/index.vue
+++ b/src/views/lesson/trainingRule/detail/index.vue
@@ -12,7 +12,6 @@
 </template>
 
 <script>
-// import { list, create, del } from '@/api/management/dictionaryDetail';
 import { getOperateStepDataList, deleteOperateStepData, getPlaceholderList } from '@/api/management/operation';
 import TrainingDetailEdit from './edit';
 export default {
diff --git a/src/views/lesson/trainingRule/list.vue b/src/views/lesson/trainingRule/list.vue
index 2e1f18357..dbe44562f 100644
--- a/src/views/lesson/trainingRule/list.vue
+++ b/src/views/lesson/trainingRule/list.vue
@@ -14,11 +14,7 @@
 </template>
 
 <script>
-import {
-    getTrainingRulesList,
-    deleteTrainingRulesData,
-    getPlaceholderList
-} from '@/api/management/operation';
+import { getTrainingRulesList, deleteTrainingRulesData, getPlaceholderList } from '@/api/management/operation';
 import TrainingEdit from './addEdit';
 import AddBatch from './addBatch';
 import SaveAs from './saveAs.vue';
@@ -160,77 +156,13 @@ export default {
     },
     methods: {
         init() {
-            if (this.$route.query.drawWay + '' === 'true') {
-                this.trainingOperateTypeMap = getTrainingOperateTypeMap();
-                let val;
-                const trainingDeviceTypeList = ConstConfig.ConstSelect.trainingDeviceType || {};
-                for (val in trainingDeviceTypeList) {
-                    this.trainingTypeList.push({code: val, name: Cookies.get('user_lang') == 'en' ? trainingDeviceTypeList[val].enlabel : trainingDeviceTypeList[val].label});
-                    this.queryForm.queryObject.trainingType.config.data.push({value: val, label: Cookies.get('user_lang') == 'en' ? trainingDeviceTypeList[val].enlabel : trainingDeviceTypeList[val].label});
-                }
-            } else {
-                this.trainingOperateTypeMap = {};
-                this.$Dictionary.stationControl().then(list => {
-                    this.trainingOperateTypeMap['01'] = []; // 控制权实训
-                    list.forEach(item => {
-                        this.trainingOperateTypeMap['01'].push({value: item.code, label: item.name});
-                    });
-                });
-                this.$Dictionary.signalOperation().then(list => {
-                    this.trainingOperateTypeMap['02'] = []; // 信号机实训
-                    list.forEach(item => {
-                        this.trainingOperateTypeMap['02'].push({value: item.code, label: item.name});
-                    });
-                });
-                this.$Dictionary.switchOperation().then(list => {
-                    this.trainingOperateTypeMap['03'] = []; // 道岔实训
-                    list.forEach(item => {
-                        this.trainingOperateTypeMap['03'].push({value: item.code, label: item.name});
-                    });
-                });
-                this.$Dictionary.sectionOperation().then(list => {
-                    this.trainingOperateTypeMap['04'] = []; // 区段实训
-                    list.forEach(item => {
-                        this.trainingOperateTypeMap['04'].push({value: item.code, label: item.name});
-                    });
-                });
-                this.$Dictionary.stationStandOperation().then(list => {
-                    this.trainingOperateTypeMap['05'] = []; // 站台实训
-                    list.forEach(item => {
-                        this.trainingOperateTypeMap['05'].push({value: item.code, label: item.name});
-                    });
-                });
-                this.$Dictionary.trainPlanOperation().then(list => {
-                    this.trainingOperateTypeMap['06'] = []; // 行车计划实训
-                    list.forEach(item => {
-                        this.trainingOperateTypeMap['06'].push({value: item.code, label: item.name});
-                    });
-                });
-                this.$Dictionary.trainOperation().then(list => {
-                    this.trainingOperateTypeMap['07'] = []; // 列车实训
-                    list.forEach(item => {
-                        this.trainingOperateTypeMap['07'].push({value: item.code, label: item.name});
-                    });
-                });
-                this.$Dictionary.limitOperation().then(list => {
-                    this.trainingOperateTypeMap['08'] = []; // 限速实训
-                    list.forEach(item => {
-                        this.trainingOperateTypeMap['08'].push({value: item.code, label: item.name});
-                    });
-                });
-                // 获取实训类型
-                this.trainingTypeList = [];
-                this.$Dictionary.trainingType().then(list => {
-                    this.trainingTypeList = list;
-                    list.forEach(elem => {
-                        this.queryForm.queryObject.trainingType.config.data.push({
-                            value: elem.code,
-                            label: elem.name
-                        });
-                    });
-                });
+            this.trainingOperateTypeMap = getTrainingOperateTypeMap();
+            let val;
+            const trainingDeviceTypeList = ConstConfig.ConstSelect.trainingDeviceType || {};
+            for (val in trainingDeviceTypeList) {
+                this.trainingTypeList.push({code: val, name: Cookies.get('user_lang') == 'en' ? trainingDeviceTypeList[val].enlabel : trainingDeviceTypeList[val].label});
+                this.queryForm.queryObject.trainingType.config.data.push({value: val, label: Cookies.get('user_lang') == 'en' ? trainingDeviceTypeList[val].enlabel : trainingDeviceTypeList[val].label});
             }
-
             this.placeholderMap = {};
             getPlaceholderList({ trainingType: '' }).then(res => {
                 res.data.forEach(item => {
diff --git a/src/views/lesson/trainingmanage/draft.vue b/src/views/lesson/trainingmanage/draft.vue
index 00494fbc3..03b72505f 100644
--- a/src/views/lesson/trainingmanage/draft.vue
+++ b/src/views/lesson/trainingmanage/draft.vue
@@ -5,7 +5,7 @@
         <el-input v-model="operateModel.name" style="width: 300px" />
       </el-form-item>
       <el-form-item :label="this.$t('lesson.mapName') + ':'" prop="mapId">
-        <el-select v-model="operateModel.mapId" style="width: 300px" :disabled="this.disable">
+        <el-select v-model="operateModel.mapId" style="width: 300px" :disabled="disable">
           <el-option
             v-for="option in mapIdList"
             :key="option.code"
@@ -65,7 +65,7 @@
 <script>
 import ConstConfig from '@/scripts/ConstConfig';
 import Cookies from 'js-cookie';
-import { addAutoTraining, updateAutoTraining, deleteAutoTraining, addTraining, addAutoTrainingNew, updateAutoTrainingNew, deleteAutoTrainingNew, addTrainingNew } from '@/api/jmap/training';
+import { addAutoTrainingNew, updateAutoTrainingNew, deleteAutoTrainingNew, addTrainingNew } from '@/api/jmap/training';
 import { getOperateTrainingList } from '@/api/management/operation';
 
 export default {
@@ -270,17 +270,10 @@ export default {
             let updateAutoTrainingFunction = '';
             let deleteAutoTrainingFunction = '';
             let addTrainingFunction = '';
-            if ((this.$route.query.drawWay + '') === 'true') {
-                addAutoTrainingFunction = addAutoTrainingNew;
-                updateAutoTrainingFunction = updateAutoTrainingNew;
-                deleteAutoTrainingFunction = deleteAutoTrainingNew;
-                addTrainingFunction = addTrainingNew;
-            } else {
-                addAutoTrainingFunction = addAutoTraining;
-                updateAutoTrainingFunction = updateAutoTraining;
-                deleteAutoTrainingFunction = deleteAutoTraining;
-                addTrainingFunction = addTraining;
-            }
+            addAutoTrainingFunction = addAutoTrainingNew;
+            updateAutoTrainingFunction = updateAutoTrainingNew;
+            deleteAutoTrainingFunction = deleteAutoTrainingNew;
+            addTrainingFunction = addTrainingNew;
             this.$refs.form.validate((valid) => {
                 if (valid) {
                     this.loading = true;
diff --git a/src/views/lesson/trainingmanage/index.vue b/src/views/lesson/trainingmanage/index.vue
index be4556b4d..7e98478e3 100644
--- a/src/views/lesson/trainingmanage/index.vue
+++ b/src/views/lesson/trainingmanage/index.vue
@@ -12,8 +12,8 @@
 <script>
 import ConstConfig from '@/scripts/ConstConfig';
 import Cookies from 'js-cookie';
-import { pageQueryTraining, pageQueryTrainingNew, createAllTrainingList } from '@/api/jmap/training';
-import { trainingNotify, trainingNotifyNew } from '@/api/simulation';
+import { pageQueryTrainingNew, createAllTrainingList } from '@/api/jmap/training';
+import { trainingNotifyNew } from '@/api/simulation';
 import { launchFullscreen } from '@/utils/screen';
 import { getPublishMapListOnline } from '@/api/jmap/map';
 import { getCmdList } from '@/api/management/dictionary';
@@ -148,9 +148,6 @@ export default {
                 ? productTypeList.map(elem => { return { value: elem.value, label: elem.enlabel }; })
                 : productTypeList.map(elem => { return { value: elem.value, label: elem.label }; });
         },
-        drawWay() {
-            return this.$route.query.drawWay + '';
-        },
         project() {
             return getSessionStorage('project');
         }
@@ -304,29 +301,17 @@ export default {
         //     this.$refs.draftTrain.show({ event: '03', title: this.$t('lesson.deleteAutoGeneratedTraining') });
         // },
         demoDisplay(index, node) {
-            if (this.drawWay === 'true') {
-                trainingNotifyNew({ trainingId: node.id }).then(resp => {
-                    /** 区分演示和正式，需要在演示时设置lessonId为0*/
-                    if (this.loadingProjectList.includes(this.project)) {
-                        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 });
-                    launchFullscreen();
-                }).catch(error => {
-                    this.$messageBox(this.$t('error.createSimulationFailed') + error.message);
-                });
-            } else {
-                trainingNotify({ trainingId: node.id }).then(resp => {
-                    /** 区分演示和正式，需要在演示时设置lessonId为0*/
-                    const query = { group: resp.data, trainingId: node.id, lessonId: 0, mapId: this.$route.query.mapId };
-                    this.$router.push({ path: `${UrlConfig.display}/manage`, query: query });
-                    launchFullscreen();
-                }).catch(error => {
-                    this.$messageBox(this.$t('error.createSimulationFailed') + error.message);
-                });
-            }
-
+            trainingNotifyNew({ trainingId: node.id }).then(resp => {
+                /** 区分演示和正式，需要在演示时设置lessonId为0*/
+                if (this.loadingProjectList.includes(this.project)) {
+                    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 });
+                launchFullscreen();
+            }).catch(error => {
+                this.$messageBox(this.$t('error.createSimulationFailed') + error.message);
+            });
         },
         reloadTable() {
             this.queryList.reload();
@@ -335,30 +320,16 @@ export default {
             this.$router.go(-1);
         },
         trainingRecord(index, node) {
-            if (this.drawWay === 'true') {
-                trainingNotifyNew({ trainingId: node.id }).then(resp => {
-                    this.group = resp.data;
-                    this.$router.push({ path: `${UrlConfig.design.trainingRecord}/${node.id}/${node.name}`, query: { group: resp.data } });
-                }).catch(error => {
-                    this.$messageBox(`${this.$t('error.createSimulationFailed')}: ${error.message}`);
-                });
-            } else {
-                trainingNotify({ trainingId: node.id }).then(resp => {
-                    this.group = resp.data;
-                    this.$router.push({ path: `${UrlConfig.design.trainingRecord}/${node.id}/${node.name}`, query: { group: resp.data } });
-                }).catch(error => {
-                    this.$messageBox(`${this.$t('error.createSimulationFailed')}: ${error.message}`);
-                });
-            }
-
+            trainingNotifyNew({ trainingId: node.id }).then(resp => {
+                this.group = resp.data;
+                this.$router.push({ path: `${UrlConfig.design.trainingRecord}/${node.id}/${node.name}`, query: { group: resp.data } });
+            }).catch(error => {
+                this.$messageBox(`${this.$t('error.createSimulationFailed')}: ${error.message}`);
+            });
         },
         queryFunction(params) {
             params['mapId'] = this.$route.query.mapId;
-            if (this.drawWay === 'true') {
-                return pageQueryTrainingNew(params);
-            } else {
-                return pageQueryTraining(params);
-            }
+            return pageQueryTrainingNew(params);
         }
     }
 };
diff --git a/src/views/lesson/trainingmanage/oldMap.vue b/src/views/lesson/trainingmanage/oldMap.vue
deleted file mode 100644
index 5b69d6a12..000000000
--- a/src/views/lesson/trainingmanage/oldMap.vue
+++ /dev/null
@@ -1,381 +0,0 @@
-<template>
-  <div style="height: 100%; overflow-y: auto;">
-    <QueryListPage ref="queryListPage" :pager-config="pagerConfig" :query-form="queryForm" :query-list="queryList" style="width: 98%;margin-left:1%;margin-top:20px;" />
-    <!-- <training-draft
-              ref="draftTrain"
-              :map-id-list="mapIdList"
-              :training-type-list="trainingTypeList"
-              :training-operate-type-map="trainingOperateTypeMap"
-              @refresh="reloadTable"
-            /> -->
-    <div class="draft">
-      <el-button-group>
-        <el-button type="primary" @click="turnback">{{ $t('global.back') }}</el-button>
-      </el-button-group>
-    </div>
-  </div>
-</template>
-
-<script>
-import ConstConfig from '@/scripts/ConstConfig';
-import Cookies from 'js-cookie';
-import { pageQueryTraining, pageQueryTrainingNew, createAllTrainingList } from '@/api/jmap/training';
-import { trainingNotify, trainingNotifyNew } from '@/api/simulation';
-import { launchFullscreen } from '@/utils/screen';
-import { getPublishMapListOnline } from '@/api/jmap/map';
-import { getOperateTrainingList } from '@/api/management/operation';
-import { UrlConfig } from '@/scripts/ConstDic';
-// import TrainingDraft from './draft';
-import localStore from 'storejs';
-
-export default {
-    name: 'TrainingGeneration',
-    components: {
-        // TrainingDraft
-    },
-    data() {
-        return {
-            mapIdList: [],
-            trainingTypeList: [],
-            trainingOperateTypeMap: {},
-            trainingTypeMap: {},
-            pagerConfig: {
-                pageSize: 'pageSize',
-                pageIndex: 'pageNum'
-            },
-            queryForm: {
-                labelWidth: '120px',
-                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, ['code', 'name']); },
-                        tagType: (row) => { return 'success'; }
-                    },
-                    {
-                        title: this.$t('lesson.operationType'),
-                        prop: 'operateType',
-                        type: 'tag',
-                        columnValue: (row) => { return this.$convertField(row.operateType, this.trainingOperateTypeMap[row.type], ['code', 'name']); },
-                        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: this.$t('lesson.demonstration'),
-                                handleClick: this.demoDisplay,
-                                type: ''
-                            }
-                            /* {
-                                        name: this.$t('lesson.trainingRecord'),
-                                        handleClick: this.trainingRecord,
-                                        type: ''
-                                    }*/
-                        ]
-                    }
-                ],
-                actions: [
-                    { text: this.$t('lesson.generateTraining'), btnCode: 'employee_auto', handler: this.autoMaticTrainging }
-                    // { text: this.$t('lesson.updateTraining'), btnCode: 'employee_edit', handler: this.editTrainingByType, type: 'warning'},
-                    // { text: this.$t('lesson.deleteTraining'), btnCode: 'employee_delete', handler: this.delAutoMaticTrainging, type: 'danger'}
-                ]
-            },
-
-            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 }; });
-        },
-        drawWay() {
-            return this.$route.query.drawWay + '';
-        }
-    },
-    async created() {
-        const json = localStore.get(this.$route.path);
-        await this.loadInitData(json);
-        this.typeChoose(json);
-    },
-    mounted() {
-        this.interCheckGenerateStatus();
-    },
-    beforeDestroy() {
-        this.isLeaving = true;
-    },
-    methods: {
-        async loadInitData(queryData) {
-            this.mapIdList = [];
-            this.queryForm.queryObject.prdType.config.data = [];
-            getPublishMapListOnline().then(response => {
-                this.mapIdList = response.data;
-            });
-            this.queryForm.queryObject.prdType.config.data = this.prdTypeList;
-
-            // 获取实训类型
-            this.trainingTypeList = [];
-            this.$Dictionary.trainingType().then(list => {
-                this.trainingTypeList = list;
-            });
-            this.trainingOperateTypeMap = {};
-            const list01 = await this.$Dictionary.stationControl();
-            this.trainingOperateTypeMap['01'] = list01; // 控制权实训
-            const list02 = await this.$Dictionary.signalOperation();
-            this.trainingOperateTypeMap['02'] = list02; // 信号机实训
-            const list03 = await this.$Dictionary.switchOperation();
-            this.trainingOperateTypeMap['03'] = list03; // 道岔实训
-            const list04 = await this.$Dictionary.sectionOperation();
-            this.trainingOperateTypeMap['04'] = list04; // 区段实训
-            const list05 = await this.$Dictionary.stationStandOperation();
-            this.trainingOperateTypeMap['05'] = list05; // 站台实训
-            const list06 = await this.$Dictionary.trainPlanOperation();
-            this.trainingOperateTypeMap['06'] = list06; // 行车计划实训
-            const list07 = await this.$Dictionary.trainOperation();
-            this.trainingOperateTypeMap['07'] = list07; // 列车实训
-            const list08 = await this.$Dictionary.limitOperation();
-            this.trainingOperateTypeMap['08'] = list08; // 限速实训
-            await this.prdChoose(queryData);
-
-            this.reloadTable();
-        },
-        interCheckGenerateStatus() {
-            createAllTrainingList(this.$route.query.mapId, false).then((data)=>{
-                if (data.data) {
-                    this.queryList.actions.pop();
-                    this.queryList.actions.push({ text: this.$t('lesson.trainingGenerating'), btnCode: 'employee_auto', handler: this.autoMaticTrainging, disabled:true });
-                } else {
-                    this.queryList.actions.pop();
-                    this.queryList.actions.push({ text: this.$t('lesson.generateTraining'), btnCode: 'employee_auto', handler: this.autoMaticTrainging, disabled:false });
-                }
-                setTimeout(() => {
-                    if (!this.isLeaving) {
-                        this.interCheckGenerateStatus(this.$route.query.mapId, false);
-                    }
-                }, 15000);
-            }).catch(()=>{
-                setTimeout(() => {
-                    if (!this.isLeaving) {
-                        this.interCheckGenerateStatus(this.$route.query.mapId, false);
-                    }
-                }, 15000);
-            });
-        },
-        async prdChoose(queryData) {
-            this.trainingTypeMap = {};
-            const mapId = this.$route.query.mapId;
-            const res = await getOperateTrainingList({ mapId: mapId, productType: queryData.prdType });
-            if (res && res.code == 200) {
-                const trainingTypeLists = res.data;
-                this.trainingTypeList.forEach(elem => {
-                    trainingTypeLists.forEach(item => {
-                        if (item.id == elem.code) {
-                            item.label = elem.name;
-                            item.value = elem.code;
-                        }
-                        if (this.trainingOperateTypeMap[item.id].length) {
-                            this.trainingOperateTypeMap[item.id].forEach(i => {
-                                item.children.forEach(v => {
-                                    if (i.code == v.id) {
-                                        v.name = i.name;
-                                        v.code = i.code;
-                                    }
-                                });
-                            });
-                        }
-                    });
-                });
-                trainingTypeLists.forEach(item => {
-                    item.children.forEach(v => {
-                        if (!this.trainingTypeMap[item.id]) {
-                            this.trainingTypeMap[item.id] = [];
-                        }
-
-                        this.trainingTypeMap[item.id].push({
-                            label: v.name,
-                            value: v.code
-                        });
-                    });
-                });
-                this.queryForm.queryObject.type.config.data = trainingTypeLists;
-            }
-        },
-        typeChoose(form) {
-            this.queryForm.queryObject.operateType.config.data = [];
-            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 });
-                });
-            }
-        },
-        autoMaticTrainging() {
-            this.$confirm('您确定是否生成所有实训，此操作会删除之前已生成好的实训!', this.$t('global.tips'), {
-                confirmButtonText: this.$t('global.confirm'),
-                cancelButtonText: this.$t('global.cancel'),
-                type: 'warning',
-                beforeClose: async (action, instance, done) => {
-                    if (action === 'confirm') {
-                        instance.confirmButtonLoading = true;
-                        // instance.confirmButtonText = '生成中...';
-                        this.queryList.actions.pop();
-                        this.queryList.actions.push({ text: this.$t('lesson.trainingGenerating'), btnCode: 'employee_auto', handler: this.autoMaticTrainging, disabled:true });
-                        try {
-                            const data = await createAllTrainingList(this.$route.query.mapId, true);
-                            this.$message.success('实训生成中...');
-                            instance.confirmButtonLoading = false;
-                            if (!data.data) {
-                                this.queryList.actions.pop();
-                                this.queryList.actions.push({ text: this.$t('lesson.generateTraining'), btnCode: 'employee_auto', handler: this.autoMaticTrainging, disabled:false });
-                            }
-                            done();
-                        } catch (error) {
-                            instance.confirmButtonLoading = false;
-                            this.$message.error(`生成实训失败: ${error.message}`);
-                            this.queryList.actions.pop();
-                            this.queryList.actions.push({ text: this.$t('lesson.generateTraining'), btnCode: 'employee_auto', handler: this.autoMaticTrainging, disabled:false });
-                        }
-                    } else {
-                        instance.confirmButtonLoading = false;
-                        done();
-                    }
-                }
-            }
-            ).then(async (action) => {
-                // done();
-            });
-            // this.$refs.draftTrain.show({ event: '01', title: this.$t('lesson.automaticGenerationOfTraining') });
-        },
-        // editTrainingByType() {
-        //     this.$refs.draftTrain.show({ event: '02', title: this.$t('lesson.modifyTrainingByCategory') });
-        // },
-        // delAutoMaticTrainging() {
-        //     this.$refs.draftTrain.show({ event: '03', title: this.$t('lesson.deleteAutoGeneratedTraining') });
-        // },
-        demoDisplay(index, node) {
-            if (this.drawWay === 'true') {
-                trainingNotifyNew({ trainingId: node.id }).then(resp => {
-                    /** 区分演示和正式，需要在演示时设置lessonId为0*/
-                    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 });
-                    launchFullscreen();
-                }).catch(error => {
-                    this.$messageBox(this.$t('error.createSimulationFailed') + error.message);
-                });
-            } else {
-                trainingNotify({ trainingId: node.id }).then(resp => {
-                    /** 区分演示和正式，需要在演示时设置lessonId为0*/
-                    const query = { group: resp.data, trainingId: node.id, lessonId: 0, mapId: this.$route.query.mapId };
-                    this.$router.push({ path: `${UrlConfig.display}/manage`, query: query });
-                    launchFullscreen();
-                }).catch(error => {
-                    this.$messageBox(this.$t('error.createSimulationFailed') + error.message);
-                });
-            }
-
-        },
-        reloadTable() {
-            this.queryList.reload();
-        },
-        turnback() {
-            this.$router.go(-1);
-        },
-        trainingRecord(index, node) {
-            if (this.drawWay === 'true') {
-                trainingNotifyNew({ trainingId: node.id }).then(resp => {
-                    this.group = resp.data;
-                    this.$router.push({ path: `${UrlConfig.design.trainingRecord}/${node.id}/${node.name}`, query: { group: resp.data } });
-                }).catch(error => {
-                    this.$messageBox(`${this.$t('error.createSimulationFailed')}: ${error.message}`);
-                });
-            } else {
-                trainingNotify({ trainingId: node.id }).then(resp => {
-                    this.group = resp.data;
-                    this.$router.push({ path: `${UrlConfig.design.trainingRecord}/${node.id}/${node.name}`, query: { group: resp.data } });
-                }).catch(error => {
-                    this.$messageBox(`${this.$t('error.createSimulationFailed')}: ${error.message}`);
-                });
-            }
-
-        },
-        queryFunction(params) {
-            params['mapId'] = this.$route.query.mapId;
-            if (this.drawWay === 'true') {
-                return pageQueryTrainingNew(params);
-            } else {
-                return pageQueryTraining(params);
-            }
-        }
-    }
-};
-</script>
-<style rel="stylesheet/scss" lang="scss" scoped>
-	.draft {
-		width: 400px;
-		text-align: center;
-		margin: 20px auto;
-	}
-</style>
diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index 922433159..28de988db 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -259,7 +259,7 @@ export default {
         },
         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'];
+            const synchronousLogin = ['VR_IBP', 'LSW', 'CCTV', 'ISCS_LW', 'ISCS_CW', 'VR_PSD', 'SANDBOX', 'ILW'];
             const imgMap = {
                 ISCS_LW: bgIscsImg,
                 ISCS_CW: bgIscsImg,
@@ -267,12 +267,13 @@ export default {
                 CCTV: bgCctvImg,
                 VR_PSD: bgPsdImg,
                 LSW: bgLswImg,
-                SANDBOX: bgLswImg
+                SANDBOX: bgLswImg,
+                ILW: bgLswImg
             };
             return synchronousLogin.includes(this.$route.query.type) ? imgMap[this.$route.query.type] : bgImgAll;
         },
         syncLogin() {
-            const synchronousLogin = ['VR_IBP', 'LSW', 'CCTV', 'ISCS_LW', 'ISCS_CW', 'VR_PSD', 'SANDBOX'];
+            const synchronousLogin = ['VR_IBP', 'LSW', 'CCTV', 'ISCS_LW', 'ISCS_CW', 'VR_PSD', 'SANDBOX', 'ILW'];
             return this.$route.query.type ? synchronousLogin.includes(this.$route.query.type) : false;
         },
         loadingText() {
@@ -282,7 +283,8 @@ export default {
                 VR_IBP: '检测现地工作站登陆中',
                 CCTV: '检测教员机登录中',
                 VR_PSD: '检测教员机登录中',
-                LSW: '检测教员机登录中'
+                LSW: '检测教员机登录中',
+                ILW: '检测教员机登录中'
             };
             return this.$route.query.type ? textMap[this.$route.query.type] : '';
         }
@@ -488,7 +490,6 @@ export default {
                     getSimulationInfoNew(res.data.group).then(resp => {
                         const query = {
                             group: res.data.group,
-                            drawWay: true,
                             mapId: resp.data.map.id,
                             lineCode:resp.data.map.lineCode,
                             projectDevice: this.$route.query.projectDevice,
@@ -542,6 +543,16 @@ export default {
                                 type: this.$route.query.type
                             };
                             this.$router.push({ path: `/jlmap3d/sandbox`, query: sandboxQuery });
+                        } else if (this.$route.query.type === 'ILW') {
+                            // const ilwQuery = {
+                            //     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: `/jointTrainingNew`, query: query });
                         } else {
                             this.$router.push({ path: `/jointTrainingNew`, query: query });
                         }
diff --git a/src/views/newMap/chatView/chatBox.vue b/src/views/newMap/chatView/chatBox.vue
index 6b81d8dfc..e792a0945 100644
--- a/src/views/newMap/chatView/chatBox.vue
+++ b/src/views/newMap/chatView/chatBox.vue
@@ -1,16 +1,18 @@
 <template>
   <div class="chatBox" :class="{'active': drawer}" :style="{'bottom':bottom+'px'}">
     <div class="menuTrainListBtn" @click="clickBtn">
-      <template v-if="userRole == 'DISPATCHER'">
+      <div v-if="userRole == 'DISPATCHER'">
+        <div id="teleName" />
         <p style="margin: 0;">调</p>
         <p style="margin: 0;">度</p>
         <p style="margin: 0;">电</p>
         <p style="margin: 0;">话</p>
-      </template>
-      <template v-if="userRole != 'AUDIENCE' && userRole != 'DISPATCHER'">
+      </div>
+      <div v-if="userRole != 'AUDIENCE' && userRole != 'DISPATCHER'">
+        <div id="teleName" />
         <p style="margin: 0;">电</p>
         <p style="margin: 0;">话</p>
-      </template>
+      </div>
       <template v-if="userRole == 'AUDIENCE'">
         <p style="margin: 0;">通</p>
         <p style="margin: 0;">话</p>
@@ -86,10 +88,10 @@
             </el-button>
           </div>
           <div v-else>
-            <el-button v-if="isButtonShow && !commonConversation" size="mini" type="danger" class="chat-box-footer-create chat-box-footer-quit" :loading="quitLoading" @click="quitConversition()">
+            <el-button v-if="isButtonShow && !commonConversation" size="mini" type="danger" class="chat-box-footer-create chat-box-footer-quit" :disabled="audioPlay" :loading="quitLoading" @click="quitConversition()">
               <i class="el-icon-phone" />
             </el-button>
-            <el-button v-if="isButtonShow && !commonConversation" class="chat-box-footer-create chat-box-footer-send" :class="{'active': recordSending}" size="mini" type="primary" @click="startRecording()">
+            <el-button v-if="isButtonShow && !commonConversation" class="chat-box-footer-create chat-box-footer-send" :class="{'active': recordSending}" :disabled="audioPlay" size="mini" type="primary" @click="startRecording()">
               <el-progress id="record_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="cancleRecording()" />
               <span class="iconfont icon-yuyin">&#xe62b;</span>
@@ -137,11 +139,12 @@
         </div>
       </template>
     </div>
+    <audio id="teleRing" :src="teleRing" preload loop />
     <chat-setting ref="chatSetting" :form="form" @setSetting="setSetting" />
-
   </div>
 </template>
 <script>
+import teleRing from '@/assets/teleRing.mp3';
 import ChatSetting from './chatSetting';
 import ChatContent from './chatContent';
 import ChatMemberList from './chatMemberList';
@@ -174,6 +177,7 @@ export default {
             seconds:0,
             inter:null,
             connectSuccess:false,
+            teleRing:teleRing,
             recorders: null,
             microphone:null,
             createLoading:false,
@@ -200,7 +204,8 @@ export default {
             messageList: [], // 消息列表
             commonMessageList: [],
             conversitionStateMap:{},
-            myMemberId: ''
+            myMemberId: '',
+            audioPlay:false
         };
     },
     computed:{
@@ -286,6 +291,10 @@ export default {
                     item.children[val.creatorId].isInviting = true;
                     const offsetTop = document.getElementById('proper_content_box' + val.creatorId).parentNode.offsetTop;
                     document.querySelector('.chat-box-content').scrollTop = (offsetTop - 40) > 0 ? (offsetTop - 80) : 0;
+                    if (!document.querySelector('#teleName').classList.contains('flash')) {
+                        document.querySelector('#teleName').classList.add('flash');
+                        document.querySelector('#teleRing').play();
+                    }
                 }
             });
         },
@@ -366,6 +375,8 @@ export default {
                         dispatcherList[item.id] = this.memberData[item.id];
                         break;
                     case 'ELECTRIC_DISPATCHER':
+                        this.memberData[item.id].label = '电力调度' + (item.name || '');
+                        this.memberData[item.id].labelName = '电力调度' + (item.name || '');
                         electricDispatcherList[item.id] = this.memberData[item.id];
                         break;
                     case 'DEPOT_DISPATCHER':
@@ -430,8 +441,14 @@ export default {
                     id: 'parentDepartment',
                     type: 'role',
                     children: parentDepartmentList
+                }, {
+                    label: '电力调度',
+                    id: 'electricDispatcher',
+                    type: 'role',
+                    children: electricDispatcherList
                 }];
                 this.initCommonMemberList();
+                this.filterNode();
                 // this.$nextTick(() => {
                 //     if (this.$refs.tree) {
                 //         this.$refs.tree.filter(this.queryMember);
@@ -439,8 +456,10 @@ export default {
                 // });
             }
         },
-        '$store.state.socket.simulationReset': function () {
+        '$store.state.socket.simulationReset': function () { // 仿真重置
             this.conversitionStateMap = {};
+            document.querySelector('#teleName').classList.remove('flash');
+            document.querySelector('#teleRing').pause();
         },
         '$store.state.socket.acceptConversionInvite':function(val) {
             this.conversitionStateMap[val.memberId].connect = true;
@@ -456,8 +475,14 @@ export default {
                     }
                 });
             }
+        },
+        '$store.state.scriptRecord.audioPlay':function(val) {
+            this.audioPlay = val;
         }
     },
+    beforeDestroy() {
+        this.$store.dispatch('scriptRecord/updateAudioPlay', false);
+    },
     mounted() {
         this.firstClick = true;
         this.$nextTick(() => {
@@ -489,6 +514,8 @@ export default {
         acceptUser() {
             acceptConversitionInvite(this.group, this.conversitionId).then(res=>{
                 this.connectSuccess = true;
+                document.querySelector('#teleName').classList.remove('flash');
+                document.querySelector('#teleRing').pause();
                 this.treeData.forEach(data => {
                     if (data.children) {
                         const member = data.children[res.data.creatorId];
@@ -787,6 +814,9 @@ export default {
             this.quitLoading = true;
             this.userString = '';
             overSimulationConversition(this.group, this.conversitionId).then(resp => {
+                if (this.recordSending) {
+                    this.cancleRecording();
+                }
                 this.connectSuccess = false;
                 this.conversitionMemberList = [];
                 this.messageList = [];
@@ -894,6 +924,7 @@ export default {
                     this.conversitionStateMap[member.memberId] && this.conversitionStateMap[member.memberId].privateMessageList.push(data.message);
                 });
             }
+            // console.log(this.commonConversation, this.conversitionId, data.id, this.myMemberId, this.conversitionId === data.id, this.conversitionStateMap, '/////////////////////////');
             if (this.commonConversation) {
                 this.messageList.push(data.message);
             } else if (!this.commonConversation && this.conversitionId === data.id) {
@@ -930,6 +961,7 @@ export default {
             this.commonMessageList = [];
             this.conversitionStateMap = {};
             this.messageList = this.commonMessageList;
+            this.connectSuccess = false;
             this.treeData.forEach(item => {
                 if (item.children) {
                     const memberList = Object.values(item.children);
@@ -1039,7 +1071,7 @@ export default {
     align-items: center;
     text-align: center;
     justify-content: center;
-	padding: 7px 4px;
+    padding: 7px 4px;
 	.el-icon-more{
 		font-size: 20px;
 		margin-top: 9px;
@@ -1210,6 +1242,24 @@ export default {
 .proper_content_box_text{
     position: absolute;
 }
+.flash{
+    opacity: 1;
+    animation: isInviting infinite 1s;
+    -moz-animation: isInviting infinite 1s;	/* Firefox */
+    -webkit-animation: isInviting infinite 1s;	/* Safari 和 Chrome */
+    -o-animation: isInviting infinite 1s;	/* Opera */
+}
+#teleName{
+    background: #6BBE16;
+    position: absolute;
+    width: 100%;
+    height: 100%;
+    left: 0;
+    top: 0;
+    border-radius: 0px 5px 5px 0px;
+    z-index: -1;
+    opacity: 0;
+}
 </style>
 <style lang="scss">
 .isInviting::before{
diff --git a/src/views/newMap/chatView/chatContent.vue b/src/views/newMap/chatView/chatContent.vue
index 92151015e..6134057c4 100644
--- a/src/views/newMap/chatView/chatContent.vue
+++ b/src/views/newMap/chatView/chatContent.vue
@@ -5,12 +5,18 @@
         <div :class="chatContent.memberId == myMemberId?'rightUser':'leftUser'">
           <div class="userHeader">
             <div v-if="!chatContent.self" class="userName">{{ covertName(chatContent.memberId) }}</div>
-            <div :class="chatContent.memberId == myMemberId?'userChatTime textRight':'userChatTime'">{{ chatContent.time }}</div>
+            <div :class="chatContent.memberId == myMemberId?'userChatTime textRight':'userChatTime'">{{ covertTime(chatContent.time) }}</div>
           </div>
-          <div class="userBubble" @click="playAudio(baseUrl+chatContent.src)">
+          <div class="userBubble" @click="playAudio(baseUrl+chatContent.src, chatContent)">
             <div class="userMessage">
               <!-- <span class="el-icon-video-play playicon" /> -->
-              <img :src="yuyin" class="playicon1">
+              <!-- <img :src="yuyin" class="playicon1"> -->
+              <!-- 语音播放 -->
+              <div class="wifi-symbol">
+                <div class="wifi-circle first" />
+                <div class="wifi-circle second" :class="{'second-amit': chatContent.activeAtuo}" />
+                <div class="wifi-circle third" :class="{'third-amit': chatContent.activeAtuo}" />
+              </div>
               <!-- <span class="messageText">{{ chatContent.content }}</span> -->
             </div>
           </div>
@@ -21,7 +27,9 @@
   </div>
 </template>
 <script>
-import yuyin from '@/assets/yuyin.png';
+// import yuyin from '@/assets/yuyin.png';
+import {overConversationMessage} from '@/api/chat';
+// this.time = `${prefixIntrger(date.getHours(), 2)}:${prefixIntrger(date.getMinutes(), 2)}${prefixIntrger(date.getSeconds(), 2)}`;
 export default {
     props:{
         messageList:{
@@ -69,7 +77,7 @@ export default {
         return {
             chatContentList:[],
             currentAudioList:[],
-            yuyin:yuyin,
+            // yuyin:yuyin,
             currentAudioIndex:0,
             isPlay:false,
             baseUrl:process.env.VUE_APP_VOICE_API
@@ -83,22 +91,31 @@ export default {
             this.$emit('changeMessageList', conversationInfo);
             if (this.conversitionId == val.id) {
                 if (member && member.userId != this.$store.state.user.id) {
-                    this.currentAudioList.push(this.baseUrl + '/audio/' + conversationInfo.message.audioPath);
+                    this.currentAudioList.push({audioUrl:this.baseUrl + '/audio/' + conversationInfo.message.audioPath, id:val.message.id});
                     if (!this.isPlay) {
                         this.isPlay = true;
+                        this.$store.dispatch('scriptRecord/updateAudioPlay', true);
                         this.playAllAudio();
+                        //
                     }
                 }
                 this.scrollTop();
             } else if (this.userRole === 'AUDIENCE' || this.commonConversation) {
                 if (member && member.userId != this.$store.state.user.id) {
-                    this.currentAudioList.push(this.baseUrl + '/audio/' + conversationInfo.message.audioPath);
+                    this.currentAudioList.push({audioUrl:this.baseUrl + '/audio/' + conversationInfo.message.audioPath, id:val.message.id});
                     if (!this.isPlay) {
                         this.isPlay = true;
+                        this.$store.dispatch('scriptRecord/updateAudioPlay', true);
                         this.playAllAudio();
                     }
                 }
             }
+        },
+        '$store.state.scriptRecord.audioPlay':function(val) {
+            this.isPlay = val;
+            if (!val) {
+                this.currentAudioList = [];
+            }
         }
     },
     mounted() {
@@ -114,18 +131,31 @@ export default {
         playAllAudio() {
             this.playEachAudio(this.currentAudioList[this.currentAudioIndex]);
         },
-        playEachAudio(audioUrl) {
+        playEachAudio(audioObject) {
             this.$nextTick(function() {
-                document.querySelector('#audioPlay').src = audioUrl;
+                this.messageList.forEach(item => {
+                    if (item.id == audioObject.id) {
+                        this.$set(item, 'activeAtuo', true);
+                    }
+                });
+                document.querySelector('#audioPlay').src = audioObject.audioUrl;
                 document.querySelector('#audioPlay').play();
                 const that = this;
                 document.querySelector('#audioPlay').onended = function() {
-                    that.currentAudioList.shift();
-                    if (that.currentAudioList.length > 0) {
-                        that.playEachAudio(that.currentAudioList[that.currentAudioIndex]);
-                    } else {
-                        that.isPlay = false;
-                    }
+                    that.messageList.forEach(item => {
+                        if (item.id == audioObject.id) {
+                            that.$set(item, 'activeAtuo', false);
+                        }
+                    });
+                    overConversationMessage(that.$route.query.group, audioObject.id).then(res=>{
+                        that.currentAudioList.shift();
+                        if (that.currentAudioList.length > 0) {
+                            that.playEachAudio(that.currentAudioList[that.currentAudioIndex]);
+                        } else {
+                            that.isPlay = false;
+                            that.$store.dispatch('scriptRecord/updateAudioPlay', false);
+                        }
+                    });
                 };
             });
         },
@@ -140,9 +170,29 @@ export default {
             }
             return name;
         },
-        playAudio(audioUrl) {
-            document.querySelector('#audioPlay').src = audioUrl;
-            document.querySelector('#audioPlay').play();
+        covertTime(time) {
+            const date = new Date(time);
+            let hour = date.getHours();
+            let minute = date.getMinutes();
+            let second = date.getSeconds();
+            hour = hour > 9 ? hour : '0' + hour;
+            minute = minute > 9 ? minute : '0' + minute;
+            second = second > 9 ? second : '0' + second;
+            return hour + ':' + minute + ':' + second;
+        },
+        playAudio(audioUrl, data) {
+            this.messageList.forEach(item => {
+                this.$set(item, 'activeAtuo', false);
+            });
+            if (!this.isPlay) {
+                const that = this;
+                document.querySelector('#audioPlay').src = audioUrl;
+                this.$set(data, 'activeAtuo', true);
+                document.querySelector('#audioPlay').play();
+                document.querySelector('#audioPlay').onended = function() {
+                    that.$set(data, 'activeAtuo', false);
+                };
+            }
         },
         conversationChange() {
             this.currentAudioList = [];
@@ -187,16 +237,73 @@ export default {
     border-radius: 5px;
     cursor: pointer;
     display:inline-block;
+	height: 30px;
+    overflow: hidden;
 }
 .playicon{
     font-size: 20px;
     vertical-align: top;
 }
-.playicon1{
-    width:17px;
+// .playicon1{
+//     width:17px;
+// }
+.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*/
+	}
 }
 .textRight{text-align: right;}
-.userMessage{}
+.userMessage{
+	position: relative;
+}
 .messageText{line-height: 20px;}
 .chatContentInClass{
         display: inline-block;
diff --git a/src/views/newMap/chatView/chatMemberList.vue b/src/views/newMap/chatView/chatMemberList.vue
index 5486eeb83..aace22ce2 100644
--- a/src/views/newMap/chatView/chatMemberList.vue
+++ b/src/views/newMap/chatView/chatMemberList.vue
@@ -41,7 +41,7 @@ export default {
         }
     },
     watch:{
-        '$store.state.socket.acceptConversionInvite':function(val) {
+        '$store.state.socket.acceptConversionInvite':function(val) { // 仿真会话成员邀请
             // this.$emit('connectMember', val);
         }
     },
diff --git a/src/views/newMap/displayNew/demon/faultChoose.vue b/src/views/newMap/displayNew/demon/faultChoose.vue
index 9c597dac4..26f6772ae 100644
--- a/src/views/newMap/displayNew/demon/faultChoose.vue
+++ b/src/views/newMap/displayNew/demon/faultChoose.vue
@@ -27,9 +27,9 @@
           </template>
         </el-table-column>
         <!--<el-table-column prop="condition" label="触发状态">-->
-          <!--<template slot-scope="scope">-->
-            <!--<span>{{ formatTriggerStatus(scope.row.condition) }}</span>-->
-          <!--</template>-->
+        <!--<template slot-scope="scope">-->
+        <!--<span>{{ formatTriggerStatus(scope.row.condition) }}</span>-->
+        <!--</template>-->
         <!--</el-table-column>-->
         <el-table-column prop="condition" label="到达区段" width="150">
           <template slot-scope="scope">
@@ -87,15 +87,15 @@
               <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="触发状态">-->
-              <!--&lt;!&ndash; <el-input v-model="faultRule.condition.triggerDeviceStatus" size="small" class="inputModelClass" /> &ndash;&gt;-->
-              <!--<el-select v-model="faultRule.condition.triggerDeviceStatus" placeholder="请选择" class="inputModelClass" size="small" style="width: 200px;">-->
-                <!--<el-option-->
-                  <!--v-for="item in triggerStatusList"-->
-                  <!--:key="item.value"-->
-                  <!--:label="item.label"-->
-                  <!--:value="item.value"-->
-                <!--/>-->
-              <!--</el-select>-->
+            <!--&lt;!&ndash; <el-input v-model="faultRule.condition.triggerDeviceStatus" size="small" class="inputModelClass" /> &ndash;&gt;-->
+            <!--<el-select v-model="faultRule.condition.triggerDeviceStatus" placeholder="请选择" class="inputModelClass" size="small" style="width: 200px;">-->
+            <!--<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" style="width: 240px;" />
@@ -122,7 +122,7 @@
 import { getSimulationFaultRules, setFailureModeNew, deleteFailureRule, cancelFailureModeNew } from '@/api/simulation';
 import ConstConfig from '@/scripts/ConstConfig';
 import { FaultStatusEnum } from '@/scripts/FaultDicNew';
-import ModelType from '@/jmap/constant/deviceType';
+import ModelType from '@/jmapNew/constant/deviceType';
 import { deviceFaultType} from '@/scripts/cmdPlugin/Config';
 
 // 故障列表
@@ -300,7 +300,7 @@ export default {
             if (this.dialogShow) {
                 getSimulationFaultRules(this.$route.query.group).then(resp => {
                     this.faultList = resp.data;
-                }).catch(error => {
+                }).catch(() => {
                     this.$messageBox('获取数据异常');
                 });
             }
diff --git a/src/views/newMap/displayNew/demonChat.vue b/src/views/newMap/displayNew/demonChat.vue
index 2f654d426..42bb23329 100644
--- a/src/views/newMap/displayNew/demonChat.vue
+++ b/src/views/newMap/displayNew/demonChat.vue
@@ -11,7 +11,7 @@
 <script>
 import ChatBox from '../chatView/chatBox.vue';
 import ScriptTip from '@/views/newMap/displayNew/scriptDisplay/component/scriptTip';
-// import {getAllConversition} from '@/api/chat';
+
 export default {
     name:'DemonChat',
     components:{
diff --git a/src/views/newMap/displayNew/demonMenu.vue b/src/views/newMap/displayNew/demonMenu.vue
index b1aeb7bed..3d88e05af 100644
--- a/src/views/newMap/displayNew/demonMenu.vue
+++ b/src/views/newMap/displayNew/demonMenu.vue
@@ -6,16 +6,15 @@
       <el-button-group ref="button_group_box" class="button_group_box" :style="`margin-left:-${btnWidth}px`">
         <!-- 地图错误判断 -->
         <!-- 设备视图 -->
-        <el-button v-if="jl3dmodelShow" size="small" @click="jumpjlmap3dmodel">{{ jl3dmodel }}</el-button>
-        <!-- 三维视图 -->
-        <el-button v-if="jl3dnameShow" size="small" @click="jumpjlmap3d">{{ jl3dname }}</el-button>
+        <el-button v-if="jl3dmodelShow && !isContest" size="small" @click="jumpjlmap3dmodel">{{ jl3dmodel }}</el-button>
+        <!-- 三维视图/数字沙盘 -->
+        <el-button v-if="jl3dnameShow && !isContest" size="small" @click="jumpjlmap3d">{{ jl3dname }}</el-button>
         <!-- cctv视图 -->
-        <el-button v-if="cctvShow" size="small" @click="jumpjl3dpassflow">{{ jl3dpassflow }}</el-button>
-
+        <el-button v-if="cctvShow && !isContest" size="small" @click="jumpjl3dpassflow">{{ jl3dpassflow }}</el-button>
         <!-- 故障设备视图 -->
         <el-button v-if="jlmap3dFaultShow" size="small" @click="jumpjlmap3dFault">故障设备</el-button>
         <!-- 司机视角 -->
-        <el-button v-if="driverShow" size="small" type="jumpjlmap3d" @click="jumpjlmap3dDriver">{{ $t('joinTraining.driverPerspective') }}</el-button>
+        <el-button v-if="driverShow" size="small" type="jumpjlmap3d" @click="jumpjlmap3dDriver">司机视角</el-button>
         <!-- 排班计划 -->
         <el-button v-if="scheduleLoadShow" type="primary" size="small" @click="jumpScheduling">派班计划加载</el-button>
         <el-button v-if="schedulePreviewShow" type="primary" size="small" @click="schedulingView">派班计划预览</el-button>
diff --git a/src/views/newMap/displayNew/dispatherContest/index.vue b/src/views/newMap/displayNew/dispatherContest/index.vue
index da24e692f..525b333c6 100644
--- a/src/views/newMap/displayNew/dispatherContest/index.vue
+++ b/src/views/newMap/displayNew/dispatherContest/index.vue
@@ -98,10 +98,8 @@ import { PermissionType } from '@/scripts/ConstDic';
 import { getCountTime } from '@/utils/index';
 import { prefixIntrger } from '@/utils/date';
 import { ScriptMode, TrainingMode } from '@/scripts/ConstDic';
-// import { quitScriptNew } from '@/api/simulation';
 import SelectRole from '@/views/newMap/displayNew/scriptDisplay/component/selectRole';
 import { setGoodsTryUse } from '@/api/management/goods';
-// import {loadScriptNewMode } from '@/api/simulation';
 
 import {competitionPracticalSceneStart, competitionPracticalSceneExit, competitionPracticalSceneFinish, getEmptyOperationalStatistics} from '@/api/competition';
 import { launchFullscreen } from '@/utils/screen';
@@ -170,7 +168,6 @@ export default {
             scriptMode: ScriptMode.TEACH,
             mapLocation:{},
             playerList:[],
-            actionList:[],
             currentPlayList:[],
             // formatUsedTime:'',
             formatScore:0,
@@ -261,7 +258,6 @@ export default {
             clearTimeout(this.time);
         }
         this.$store.dispatch('scriptRecord/updateSimulationPause', false);
-        this.$store.dispatch('scriptRecord/updateOperationalItemVOs', {});
         this.$store.dispatch('map/resetActiveTrainList', true);
     },
     mounted() {
@@ -396,8 +392,8 @@ export default {
         handleQuitQuest() {
             competitionPracticalSceneExit(this.group).then(resp => {
                 getSimulationInfoNew(this.group).then((res)=>{
+                    this.$store.dispatch('scriptRecord/updateAudioPlay', false);
                     EventBus.$emit('quitScene');
-                    this.$store.dispatch('scriptRecord/updateOperationalItemVOs', {});
                     this.quitQuest();
                     // this.initLoadPage();
                     this.isScriptRun = false;
@@ -454,12 +450,11 @@ export default {
             //     this.$refs.menuScript.initLoadPage();
             // }
         },
-        selectScript({playerList, mapLocation, actionList}) {
+        selectScript({playerList, mapLocation}) {
             this.changeScriptMode(this.scriptMode);
             this.isScriptLoad = true;
             this.playerList = playerList;
             this.mapLocation = mapLocation;
-            this.actionList = actionList;
             this.userRole = 'AUDIENCE';
             this.$store.dispatch('training/setRoles', 'AUDIENCE');
         },
@@ -474,7 +469,7 @@ export default {
             this.showResultData(data);
         },
         showResultData(data) {
-            this.$refs.testResult.doShow({data:data, actionList:this.actionList});
+            this.$refs.testResult.doShow({data:data});
         },
         endTraining() {
             competitionPracticalSceneFinish(this.group, {operationStatisticVO:{}}).then(res=>{
@@ -483,6 +478,7 @@ export default {
                 // this.formatScore = res.data;
                 // this.
                 this.showResultData(res.data);
+                // this.$store.dispatch('scriptRecord/updateAudioPlay', false);
                 // this.$messageBox('得分：' + this.formatScore);
                 // }
                 // this.userRole = 'AUDIENCE';
@@ -493,6 +489,7 @@ export default {
             });
         },
         startTraining() {
+            this.$store.dispatch('scriptRecord/updateAudioPlay', false);
             let userRole = 'AUDIENCE';
             if (this.$route.query.prdType) {
                 if (this.$route.query.prdType == '02') {
diff --git a/src/views/newMap/displayNew/dispatherContest/operationalStatistic.vue b/src/views/newMap/displayNew/dispatherContest/operationalStatistic.vue
index 942abc0d4..bb1170403 100644
--- a/src/views/newMap/displayNew/dispatherContest/operationalStatistic.vue
+++ b/src/views/newMap/displayNew/dispatherContest/operationalStatistic.vue
@@ -46,20 +46,7 @@ export default {
             this.dialogShow = true;
             this.resultData.score = resultData.score;
             this.resultData.itemVOS = resultData.itemVOS;
-            const operationalItemVOs = this.$store.state.scriptRecord.operationalItemVOs;
-            if (JSON.stringify(operationalItemVOs) !== '{}') {
-                this.resultData.itemVOS = operationalItemVOs;
-                const itemVOs = Object.values(operationalItemVOs);
-                itemVOs.forEach((item, index)=>{
-                    if (item.type == 'Time') {
-                        this.dataList.push(item.timeFilledInByUser.slice(0, item.timeFilledInByUser.length - 3));
-                    } else if (item.type == 'Non_Time') {
-                        this.dataList.push(item.userAnswer);
-                    }
-                });
-            } else {
-                this.dataList = [];
-            }
+            this.dataList = [];
         },
         roleDoClose() {
             this.dialogShow = false;
@@ -81,7 +68,6 @@ export default {
                     // this.formatScore = res.data;
                     // this.$messageBox('得分：' + this.formatScore);
                     this.$emit('finishTraining', res.data);
-                    this.$store.dispatch('scriptRecord/updateOperationalItemVOs', this.resultData.itemVOS);
                     this.dialogShow = false;
                 }).catch(error=>{
                     this.$message.error('运营统计数据提交失败：' + error.message);
diff --git a/src/views/newMap/displayNew/dispatherContest/sceneList.vue b/src/views/newMap/displayNew/dispatherContest/sceneList.vue
index cb195b5ca..677990346 100644
--- a/src/views/newMap/displayNew/dispatherContest/sceneList.vue
+++ b/src/views/newMap/displayNew/dispatherContest/sceneList.vue
@@ -1,6 +1,6 @@
 <template>
   <div>
-    <el-dialog v-dialogDrag title="场景列表" :visible.sync="dialogVisible" width="800px" center>
+    <el-dialog v-dialogDrag title="场景列表" :visible.sync="dialogVisible" width="900px" center>
       <el-tabs v-model="activeName" type="card" style="height: 500px;">
         <el-tab-pane label="主场景列表" name="first">
           <el-table :data="mainSceneData" border :span-method="objectSpanMethod" stripe :cell-style="{padding: '8px 0'}">
@@ -9,7 +9,9 @@
             <el-table-column prop="scene" width="350" label="场景" />
             <el-table-column label="操作">
               <template slot-scope="scope">
-                <el-button v-if="scope.row.id" type="primary" size="small" @click="handleLoad(scope.row)">方案一</el-button>
+                <div v-if="scope.row.result">
+                  <el-button v-for="(each,index) in scope.row.result" :key="index" type="primary" size="small" @click="handleLoad(each)">{{ each.name }}</el-button>
+                </div>
               </template>
             </el-table-column>
           </el-table>
@@ -30,7 +32,7 @@
   </div>
 </template>
 <script>
-import { ScriptMode } from '@/scripts/ConstDic';
+// import { ScriptMode } from '@/scripts/ConstDic';
 import { getDraftScriptByGroupNew } from '@/api/script';
 import {loadCompetitionPracticalScene, getCompetitionPracticalScene} from '@/api/competition';
 import { EventBus } from '@/scripts/event-bus';
@@ -51,15 +53,16 @@ export default {
             selectMapLineCode:'',
             // operationType: '',
             mainSceneData: [
-                {type: '车辆故障', scene: '列车救援'},
-                {type: '信号系统故障', scene: '道岔故障'},
-                {type: '信号系统故障', scene: '区域控制器故障'},
-                {type: '信号系统故障', scene: '联锁故障'},
-                {type: '供电系统故障', scene: '接触轨(网)断电'},
-                {type: '供电系统故障', scene: '车站照明熄灭影响乘降'},
-                {type: '车站机电设备故障', scene: '站台门故障'},
-                {type: '限速', scene: '列车限速'},
-                {type: '轨道故障', scene: '线路故障影响列车运行'}
+                {type: '车辆故障', scene: '列车救援', result:[]},
+                {type: '信号系统故障', scene: '道岔故障', result:[]},
+                {type: '信号系统故障', scene: '区域控制器故障', result:[]},
+                {type: '信号系统故障', scene: '联锁故障', result:[]},
+                {type: '供电系统故障', scene: '接触轨(网)断电', result:[]},
+                {type: '供电系统故障', scene: '车站照明熄灭影响乘降', result:[]},
+                {type: '车站机电设备故障', scene: '站台门故障', result:[]},
+                // {type: '车站机电设备故障', scene: '车站照明故障', result:[]},
+                {type: '限速', scene: '列车限速', result:[]},
+                {type: '轨道故障', scene: '线路故障影响列车运行', result:[]}
             ],
             deputySceneData: [
                 { scene: '列车在站停车超时' },
@@ -75,18 +78,19 @@ export default {
         getCompetitionPracticalScene({pageSize:100, pageNum:1}).then(res=>{
             if (res.data.list && res.data.list.length > 0) {
                 res.data.list.forEach(each=>{
-                    if (each.name == '场景1') {
-                        this.mainSceneData[1].id = each.id;
+                    if (each.name == '场景1' || each.name == '场景2' || each.name == '场景3' || each.name == '场景7') {
+                        this.mainSceneData[1].result.push({id:each.id, name:each.name});
                     } else if (each.name == '场景4') {
-                        this.mainSceneData[0].id = each.id;
+                        this.mainSceneData[0].result.push({id:each.id, name:'场景4'});
                     } else if (each.name == '场景5') {
-                        this.mainSceneData[4].id = each.id;
+                        this.mainSceneData[4].result.push({id:each.id, name:'场景5'});
                     } else if (each.name == '场景9') {
-                        this.mainSceneData[6].id = each.id;
+                        this.mainSceneData[6].result.push({id:each.id, name:'场景9'});
+                    } else if (each.name == '场景8') {
+                        this.mainSceneData[5].result.push({id:each.id, name:'场景8'});
                     } else if (each.name == '场景10') {
-                        this.mainSceneData[7].id = each.id;
+                        this.mainSceneData[7].result.push({id:each.id, name:'场景10'});
                     }
-
                 });
             }
         });
@@ -120,7 +124,6 @@ export default {
                     const playerList = [];
                     EventBus.$emit('clearRunSeries');
                     EventBus.$emit('loadScene');
-                    const actionList = {};
                     if (res.data.memberList && res.data.memberList.length > 0) {
                         this.form.type = '';
                         res.data.memberList.sort((a, b) => {
@@ -129,7 +132,6 @@ export default {
                         this.$store.dispatch('training/setMemberList', {memberList:res.data.memberList, userId:this.$store.state.user.id});
                         const activeMemberList = [];
                         res.data.actionList.forEach((activeMember)=>{
-                            actionList[activeMember.id] = activeMember;
                             if (!(activeMemberList.length > 0 && activeMemberList.includes(activeMember.memberId))) {
                                 activeMemberList.push(activeMember.memberId);
                             }
@@ -168,6 +170,10 @@ export default {
                                 member.label = '上级部门' + (member.name ? member.name : '');
                                 break;
                             }
+                            case 'ELECTRIC_DISPATCHER': {
+                                member.label = '电力调度' + (member.name ? member.name : '');
+                                break;
+                            }
                             }
                         // if (member.type === 'DISPATCHER') {
                         //     this.memberId = member.id;
@@ -179,14 +185,14 @@ export default {
                     if (res.data.mapLocation) {
                         this.mapLocation = res.data.mapLocation;
                     }
-                    this.confirm(playerList, actionList);
+                    this.confirm(playerList);
                 }
             }
         },
-        confirm(playerList, actionList) {
+        confirm(playerList) {
             // this.$store.dispatch('training/setScriptOperationType', this.operationType);
             // operationType:ScriptMode[this.operationType]
-            this.$emit('selectScript', {playerList:playerList, mapLocation:this.mapLocation, actionList:actionList});
+            this.$emit('selectScript', {playerList:playerList, mapLocation:this.mapLocation});
             this.doClose();
         },
         objectSpanMethod({ row, column, rowIndex, columnIndex }) {
diff --git a/src/views/newMap/displayNew/dispatherContest/testResult.vue b/src/views/newMap/displayNew/dispatherContest/testResult.vue
index a3772e257..918d0fb6b 100644
--- a/src/views/newMap/displayNew/dispatherContest/testResult.vue
+++ b/src/views/newMap/displayNew/dispatherContest/testResult.vue
@@ -20,7 +20,7 @@
         <!-- height="400" -->
         <el-table-column prop="actionId" label="步骤描述" width="230">
           <template slot-scope="scope">
-            {{ covert(scope.row.actionId) }}
+            {{ covert(scope.row.actionVO) }}
           </template>
         </el-table-column>
         <el-table-column prop="keyWords" label="关键字" width="200">
@@ -59,11 +59,16 @@
       </el-table>
       <div class="OSTSignInfo">
         <span>运营指标信息</span>
-        <span style="margin-left:10px;">{{ '(得分: '+fullScoreOfOperationIndex+' / 满分: '+ userScoreOfOperationIndex+')' }}</span>
+        <span style="margin-left:10px;">{{ '(得分: '+userScoreOfOperationIndex+' / 满分: '+fullScoreOfOperationIndex+')' }}</span>
       </div>
       <div class="OSTSignInfoTips">
         <span class="el-icon-info" style="font-size: 16px;" /> 若竞赛未完成，运营指标不得分
       </div>
+      <div class="OSTSignInfoTips">停运列车信息</div>
+      <el-table :data="finalStoppedRunningStatistics" border class="OSTTable4">
+        <el-table-column prop="groupNumber" label="车组号" width="400" />
+        <el-table-column prop="finalPointsDeducted" label="扣分" width="430" />
+      </el-table>
       <div class="OSTSignInfoTips">晚点列车信息</div>
       <el-table :data="finalLateStatistics" border class="OSTTable1">
         <el-table-column prop="groupNumber" label="车组号" width="300" />
@@ -97,14 +102,15 @@ export default {
     data() {
         return {
             dialogShow:false,
-            operationStaticItemVOs:[],
-            finalLateStatistics:[],
-            finalStopInSectionStatistics:[],
-            commandPublishStatisticVO:[],
-            completed:false,
-            fullScore:'',
-            userScore:'',
-            actionList:[],
+            operationStaticItemVOs:[], // 运营统计信息
+            finalLateStatistics:[], // 晚点列车信息
+            finalStopInSectionStatistics:[], // 区间停车信息
+            commandPublishStatisticVO:[], // 关键步骤信息
+            finalStoppedRunningStatistics:[], // 停运列车列表
+            completed:false, // 竞赛是否已完成
+            fullScore:'', // 总分
+            userScore:'', // 用户得分
+            // actionList:[], // 动作列表
             fullScoreOfCommand:0, // 指令发布部分总分
             userScoreOfCommand:0, // 关键步骤部分用户得分
             fullScoreOfOperationStatistic:0, // 运营统计满分
@@ -114,14 +120,15 @@ export default {
         };
     },
     methods:{
-        doShow({data, actionList}) {
+        doShow({data}) {
             this.dialogShow = true;
             this.completed = data.completed;
             this.operationStaticItemVOs = data.operationStatisticVO.itemVOS;
             this.finalLateStatistics = data.operationIndexStatisticVO.finalLateStatistics;
             this.finalStopInSectionStatistics = data.operationIndexStatisticVO.finalStopInSectionStatistics;
+            this.finalStoppedRunningStatistics = data.operationIndexStatisticVO.finalStoppedRunningStatistics;
             this.commandPublishStatisticVO = data.commandPublishStatisticVO;
-            this.actionList = actionList;
+            // this.actionList = actionList;
             this.fullScore = data.fullScore;
             this.userScore = data.userScore;
             this.fullScoreOfCommand = data.fullScoreOfCommand;
@@ -135,12 +142,9 @@ export default {
             this.dialogShow = false;
         },
         covertTime(time) {
-            return time.slice(0, time.length - 3);
+            return time ? time.slice(0, time.length - 3) : '';
         },
-        covert(actionId) {
-            // return actionId;
-            const element = this.actionList[actionId];
-            // this.$store.state.training.memberData[memberId]
+        covert(element) {
             const member = this.$store.state.training.memberData[element.memberId];
             let resultData = '';
             if (element.type == 'Accept_Conversation_Invitation') {
@@ -225,7 +229,7 @@ export default {
 .OSTTable1,.OSTTable2{
     width:832px;
 }
-.OSTTable3{
+.OSTTable3,.OSTTable4{
     width:832px;
 }
 .OSTcompleted{
diff --git a/src/views/newMap/displayNew/dispatherContest/theoryExam.vue b/src/views/newMap/displayNew/dispatherContest/theoryExam.vue
index 1bda55faf..75d7932c2 100644
--- a/src/views/newMap/displayNew/dispatherContest/theoryExam.vue
+++ b/src/views/newMap/displayNew/dispatherContest/theoryExam.vue
@@ -155,7 +155,7 @@ export default {
                 currentMode = '02';
             }
             this.mode = type;
-            getItemListByProjectCode('drts', {mode:currentMode}).then(res=>{
+            getItemListByProjectCode('DRTS', {mode:currentMode}).then(res=>{
                 this.questionList = res.data;
                 if (this.isTest) {
                     this.questionList.forEach((question, index)=>{
@@ -163,7 +163,7 @@ export default {
                     });
                 }
                 if (this.mode == 'practice') {
-                    getPracticeQuestionProgress('drts').then(res=>{
+                    getPracticeQuestionProgress('DRTS').then(res=>{
                         this.currentQuestionNum = res.data.questionIndex;
                         this.loading = false;
                     }).catch(error=>{
@@ -287,7 +287,7 @@ export default {
         },
         submitConfirmExam(submitData) {
             this.loading = true;
-            submitPracticeQuestionData('drts', {mode:'02', theoryAnswers:submitData}).then(res=>{
+            submitPracticeQuestionData('DRTS', {mode:'02', theoryAnswers:submitData}).then(res=>{
                 this.loading = false;
                 this.isResult = true;
                 this.$message.success('提交成功');
@@ -369,7 +369,7 @@ export default {
                         }
                     }
                     this.isSelect = true;
-                    updatePracticeQuestionProgress('drts', {index:this.currentQuestionNum}).then(res=>{
+                    updatePracticeQuestionProgress('DRTS', {index:this.currentQuestionNum}).then(res=>{
                     }).catch(error=>{
                         console.log(error.message);
                     });
diff --git a/src/views/newMap/displayNew/exam/index.vue b/src/views/newMap/displayNew/exam/index.vue
index 76903fba3..8035738a0 100644
--- a/src/views/newMap/displayNew/exam/index.vue
+++ b/src/views/newMap/displayNew/exam/index.vue
@@ -96,14 +96,14 @@ export default {
             this.startLoading = true;
             if (this.$route.query.trainingId) {
                 this.isDisable = true;
+                this.$store.dispatch('training/setMapDefaultState');
                 startTrainingNew({ id: this.$route.query.trainingId }, this.group).then(response => {
+                    this.$store.dispatch('training/setTrainingStart', true);
                     this.$store.dispatch('training/examModeStart');
                     this.$store.dispatch('exam/start');
                     this.$store.dispatch('map/clearJlmapTrainView').then(() => {
-                        this.$store.dispatch('training/setMapDefaultState').then(() => {
-                            this.$store.dispatch('training/emitTipFresh');
-                            this.$store.dispatch('training/countTime', 'Lesson'); // 开始计时
-                        });
+                        this.$store.dispatch('training/emitTipFresh');
+                        this.$store.dispatch('training/countTime', 'Lesson'); // 开始计时
                     });
                     this.startLoading = false;
                 }).catch(() => {
diff --git a/src/views/newMap/displayNew/exam/tipExamList.vue b/src/views/newMap/displayNew/exam/tipExamList.vue
index 63af43bb4..ba6e09447 100644
--- a/src/views/newMap/displayNew/exam/tipExamList.vue
+++ b/src/views/newMap/displayNew/exam/tipExamList.vue
@@ -1,75 +1,78 @@
 <template>
-  <div v-drag class="reminder-drag">
-    <div ref="drapBox" class="reminder-box" :style="{bottom: offsetBottom + 'px'}">
+  <div v-quickMenuDrag class="reminder-drag" :style="{bottom: offsetBottom + 'px'}">
+    <div ref="drapBox" class="reminder-box">
       <div class="tip-title">
         <i v-show="isShrink" class="icon el-icon-minus" @click="shrink" />
         <i v-show="!isShrink" class="icon el-icon-plus" @click="shrink" />
         <p v-if="!isShrink" style="color: #fff;">
           <span class="time-label">{{ $t('display.exam.examTime') }}</span>
-
           <span class="time-elem">{{ formatRemainTime }}</span>
         </p>
         <p v-if="isShrink" style="color: #fff;">
           <span>{{ examName }}</span>
         </p>
       </div>
-      <div ref="dragBody" class="tip-body-box">
-        <div v-show="detailShow" class="tip-body">
-          <el-scrollbar wrap-class="scrollbar-wrapper">
-            <el-tree
-              ref="treeQuestion"
-              :data="trainingList"
-              node-key="id"
-              highlight-current
-              @node-click="getTrainDetail"
-            >
-              <span slot-scope="{ data }">
-                <span :style="{color: data.usedTime !== undefined ? 'green':''}">&nbsp;{{ trainingList.indexOf(data)+1 }}.{{
-                  data.trainingName }}
+      <div v-if="isShrink" class="reminder-box-content">
+        <div class="zhezhao" />
+        <div ref="dragBody" class="tip-body-box">
+          <div v-show="detailShow" class="tip-body">
+            <el-scrollbar wrap-class="scrollbar-wrapper">
+              <el-tree
+                ref="treeQuestion"
+                style="background:rgba(0,0,0,0)"
+                :data="trainingList"
+                node-key="id"
+                highlight-current
+                @node-click="getTrainDetail"
+              >
+                <span slot-scope="{ data }">
+                  <span :style="{color: data.usedTime !== undefined ? 'green':''}">&nbsp;{{ trainingList.indexOf(data)+1 }}.{{
+                    data.trainingName }}
+                  </span>
                 </span>
-              </span>
-            </el-tree>
-          </el-scrollbar>
-        </div>
-        <div v-show="!detailShow" class="tip-body">
-          <el-scrollbar wrap-class="scrollbar-wrapper">
-            <p class="list-item">
-              <span class="list-label">{{ $t('display.exam.questionTitle') }}</span>
-              <span class="list-elem">{{ courseModel.name }}</span>
-            </p>
-            <p class="list-item">
-              <span class="list-label">{{ $t('display.exam.bestTime') }}</span>
-              <span class="list-elem">{{ courseModel.minDuration }} {{ $t('display.seconds') }} </span>
-            </p>
-            <p class="list-item">
-              <span class="list-label">{{ $t('display.exam.maximumTime') }}</span>
-              <span class="list-elem">{{ courseModel.maxDuration }} {{ $t('display.seconds') }} </span>
-            </p>
-            <p class="list-item">
-              <span class="list-label"> {{ $t('display.exam.trainingInstructions') }}</span>
-              <span class="list-elem">{{ courseModel.remarks }}</span>
-            </p>
-          </el-scrollbar>
-        </div>
-        <div class="tip-foot">
-          <div v-show="!detailShow" class="foot-detail">
-            <el-button class="btn" @click="backList">{{ $t('display.exam.viewQuestions') }}</el-button>
-            <el-button v-if="!isFirst" class="btn" type="primary" @click="lastExam">{{ $t('display.exam.prev') }}</el-button>
-            <el-button v-if="!isLast" class="btn" type="primary" @click="nextExam">{{ $t('display.exam.next') }}</el-button>
-            <el-button v-if="isLast" class="btn" type="primary" @click="overExam">{{ $t('display.exam.submitExaminationPaper') }}</el-button>
+              </el-tree>
+            </el-scrollbar>
           </div>
-          <div v-show="detailShow" class="foot-submit">
-            <el-button class="btn" type="primary" @click="overExam">{{ $t('display.exam.submitExaminationPaper') }}</el-button>
+          <div v-show="!detailShow" class="tip-body">
+            <el-scrollbar wrap-class="scrollbar-wrapper">
+              <p class="list-item">
+                <span class="list-label">{{ $t('display.exam.questionTitle') }}</span>
+                <span class="list-elem">{{ courseModel.name }}</span>
+              </p>
+              <p class="list-item">
+                <span class="list-label">{{ $t('display.exam.bestTime') }}</span>
+                <span class="list-elem">{{ courseModel.minDuration }} {{ $t('display.seconds') }} </span>
+              </p>
+              <p class="list-item">
+                <span class="list-label">{{ $t('display.exam.maximumTime') }}</span>
+                <span class="list-elem">{{ courseModel.maxDuration }} {{ $t('display.seconds') }} </span>
+              </p>
+              <p class="list-item">
+                <span class="list-label"> {{ $t('display.exam.trainingInstructions') }}</span>
+                <span class="list-elem">{{ courseModel.remarks }}</span>
+              </p>
+            </el-scrollbar>
           </div>
-          <p style="color: #000; float: left;">
-            <span class="time-label">{{ $t('display.exam.examTime') }}</span>
-            <span class="time-elem">{{ formatRemainTime }}</span>
-          </p>
+          <div class="tip-foot">
+            <div v-show="!detailShow" class="foot-detail">
+              <el-button class="btn" @click="backList">{{ $t('display.exam.viewQuestions') }}</el-button>
+              <el-button v-if="!isFirst" class="btn" type="primary" @click="lastExam">{{ $t('display.exam.prev') }}</el-button>
+              <el-button v-if="!isLast" class="btn" type="primary" @click="nextExam">{{ $t('display.exam.next') }}</el-button>
+              <el-button v-if="isLast" class="btn" type="primary" @click="overExam">{{ $t('display.exam.submitExaminationPaper') }}</el-button>
+            </div>
+            <div v-show="detailShow" class="foot-submit">
+              <el-button class="btn" type="primary" @click="overExam">{{ $t('display.exam.submitExaminationPaper') }}</el-button>
+            </div>
+            <p style="color: #000; float: left;">
+              <span class="time-label">{{ $t('display.exam.examTime') }}</span>
+              <span class="time-elem">{{ formatRemainTime }}</span>
+            </p>
+          </div>
+          <div class="drag-right" />
+          <div class="drag-left" />
+          <div class="drag-bottom" />
+          <div class="drag-top" />
         </div>
-        <div class="drag-right" />
-        <div class="drag-left" />
-        <div class="drag-bottom" />
-        <div class="drag-top" />
       </div>
     </div>
   </div>
@@ -298,16 +301,22 @@ export default {
             });
         },
         shrink() {
-            const height = this.$refs.dragBody.offsetHeight + 40;
-            const top = this.$refs.drapBox.style.top;
+            // const height = this.$refs.dragBody.offsetHeight + 40;
+            // const top = this.$refs.drapBox.style.top;
             if (this.isShrink) {
-                this.$refs.drapBox.style.height = '40px';
-                this.$refs.drapBox.style.top = '';
+                // this.$refs.drapBox.style.height = '40px';
+                // this.$refs.drapBox.style.top = '';
                 this.isShrink = false;
             } else {
-                this.$refs.drapBox.style.height = height + 'px';
-                this.$refs.drapBox.style.top = top;
+                // this.$refs.drapBox.style.height = height + 'px';
+                // this.$refs.drapBox.style.top = top;
                 this.isShrink = true;
+                this.$nextTick(()=>{
+                    const dragDom = document.querySelector('.reminder-drag').style.bottom;
+                    if (document.body.clientHeight - 470 - parseInt(dragDom.replace('px', '')) < 0) {
+                        document.querySelector('.reminder-drag').style.bottom = `${document.body.clientHeight - 470}px`;
+                    }
+                });
             }
         }
     }
@@ -316,26 +325,46 @@ export default {
 <style rel="stylesheet/scss" lang="scss" scoped>
     @import "src/styles/mixin.scss";
 
+    .reminder-drag{
+        position: absolute;
+        bottom: 0px;
+        left: 15px;
+        z-index: 10;
+    }
+
     .tip-body-box {
         position: relative;
         height: 430px;
+        position: absolute;
+        left: 0;
+        top: 0;
+        width: 100%;
+    }
+
+    .zhezhao{
+        width: 100%;
+        height: 100%;
+        filter: blur(8px);
+        background: rgba(255,255,255,0.9);
+    }
+    .reminder-box-content{
+        width: 500px;
+        height: 430px;
+        left: 0;
+        top: 0;
+        z-index: 2;
+        background: rgba(255,255,255,0.8);
+        position: relative;
     }
 
     .reminder-box {
-        position: absolute;
-        float: left;
-        left: 15px;
-        bottom: 15px;
-        width: 650px;
-        height: 470px;
-        background-color: #fff;
         border-radius: 5px;
         overflow: hidden;
         z-index: 10;
         font-size: 18px;
 
         .tip-title {
-            width: 100%;
+            width: 500px;
             overflow: hidden;
             height: 40px;
             display: flex;
@@ -385,7 +414,7 @@ export default {
         }
 
         .tip-body {
-            height: 366px;
+            height: 370px;
             padding: 10px;
 
             .list-label {
@@ -398,7 +427,6 @@ export default {
             position: absolute;
             right: 0px;
             bottom: 0px;
-            background-color: #fff;
             padding: 10px 0 10px 10px;
 
             .foot-detail {
diff --git a/src/views/newMap/displayNew/index.vue b/src/views/newMap/displayNew/index.vue
index cb9217ac9..3c6b59f50 100644
--- a/src/views/newMap/displayNew/index.vue
+++ b/src/views/newMap/displayNew/index.vue
@@ -1,7 +1,6 @@
 <template>
   <div class="main" :style="{width: canvasWidth+'px',height:'100%',position:'absolute',overflow:'hidden'}">
     <template>
-      <!-- v-show="panelShow" :panelShow="panelShow" -->
       <transition name="el-zoom-in-bottom">
         <map-system-draft ref="mapCanvas" @back="back" />
       </transition>
diff --git a/src/views/newMap/displayNew/lesson/index.vue b/src/views/newMap/displayNew/lesson/index.vue
index ceee81b63..4947fee8d 100644
--- a/src/views/newMap/displayNew/lesson/index.vue
+++ b/src/views/newMap/displayNew/lesson/index.vue
@@ -81,7 +81,6 @@ export default {
     computed: {
         ...mapGetters('training', [
             'score',
-            'started',
             'usedTime',
             'basicInfo'
         ]),
@@ -155,18 +154,17 @@ export default {
         start() {
             // 清空按钮操作
             this.$store.dispatch('menuOperation/setButtonOperation', null);
+            this.$store.dispatch('training/setMapDefaultState');
             this.startLoading = true;
-            // console.log(2222222222222, this.startLoading, this.started, this.trainingObj);
             if (this.trainingObj && this.trainingObj.id) {
                 startTrainingNew(this.trainingObj, this.group).then(response => {
                     this.isDisable = true;
+                    this.$store.dispatch('training/setTrainingStart', true);
                     this.$store.dispatch('map/clearJlmapTrainView').then(() => {
                         this.$store.dispatch('training/teachModeStart', this.demoMode).then(()=>{
                             this.$store.dispatch('training/countTime', 'Lesson'); // 开始计时
-                            this.$store.dispatch('training/setMapDefaultState').then(() => {
-                                this.$store.dispatch('training/emitTipFresh');
-                                this.tipInfo({ color: 'green', message: this.$t('global.pleaseOpearte') });
-                            });
+                            this.$store.dispatch('training/emitTipFresh');
+                            this.tipInfo({ color: 'green', message: this.$t('global.pleaseOpearte') });
                         });
                     });
                     this.startLoading = false;
@@ -192,6 +190,7 @@ export default {
                 this.$store.dispatch('training/judgeFinish', data).then(rsp => {
                     this.$store.dispatch('training/setStopCountTime');
                     this.$store.dispatch('training/emitTipFresh');
+                    this.$store.dispatch('training/setTrainingStart', false);
                 });
             }).catch(() => {
                 this.$messageBox(this.$t('display.lesson.endTrainingError'));
@@ -200,45 +199,42 @@ export default {
         end() {
             // 如果是测试模式需要获取最终的得分
             if (this.trainingObj && this.trainingObj.id) {
-                if (this.started) {
-                    this.isDisable = false;
-                    this.$store.dispatch('training/isStepOver').then((rnt) => {
-                        if (rnt) {
-                            this.endCommit();
-                        } else {
-                            this.backDisable = true;
-                            this.$confirm(this.$t('display.lesson.endTrainingTip'), this.$t('global.tips'), {
-                                cancelButtonText: this.$t('global.cancel'),
-                                confirmButtonText: this.$t('global.confirm'),
-                                type: 'warning',
-                                center: true,
-                                zIndex: 9999
-                            }).then(() => {
-                                this.backDisable = false;
-                                const mode = {
-                                    mode: this.demoMode,
-                                    id: this.trainingObj.id,
-                                    lessonId: this.$route.query.lessonId,
-                                    usedTime: this.usedTime
-                                };
-                                endTrainingNew(mode, this.group).then(response => {
-                                    // const data = response.data;
-                                    this.$store.dispatch('training/end', null);
-                                    this.$store.dispatch('training/setStopCountTime');
-                                    this.$store.dispatch('training/setScore', 0);
-                                    this.$store.dispatch('training/emitTipFresh');
-                                }).catch(() => {
-                                    this.$messageBox(this.$t('display.lesson.endTrainingError'));
-                                });
+                this.isDisable = false;
+                this.$store.dispatch('training/isStepOver').then((rnt) => {
+                    if (rnt) {
+                        this.endCommit();
+                    } else {
+                        this.backDisable = true;
+                        this.$confirm(this.$t('display.lesson.endTrainingTip'), this.$t('global.tips'), {
+                            cancelButtonText: this.$t('global.cancel'),
+                            confirmButtonText: this.$t('global.confirm'),
+                            type: 'warning',
+                            center: true,
+                            zIndex: 9999
+                        }).then(() => {
+                            this.backDisable = false;
+                            const mode = {
+                                mode: this.demoMode,
+                                id: this.trainingObj.id,
+                                lessonId: this.$route.query.lessonId,
+                                usedTime: this.usedTime
+                            };
+                            endTrainingNew(mode, this.group).then(response => {
+                                // const data = response.data;
+                                this.$store.dispatch('training/end', null);
+                                this.$store.dispatch('training/setStopCountTime');
+                                this.$store.dispatch('training/setScore', 0);
+                                this.$store.dispatch('training/emitTipFresh');
+                                this.$store.dispatch('training/setTrainingStart', false);
                             }).catch(() => {
-                                this.isDisable = true;
-                                this.backDisable = false;
+                                this.$messageBox(this.$t('display.lesson.endTrainingError'));
                             });
-                        }
-                    });
-                } else {
-                    this.$messageBox(this.$t('display.lesson.startTrainingTip'));
-                }
+                        }).catch(() => {
+                            this.isDisable = true;
+                            this.backDisable = false;
+                        });
+                    }
+                });
             }
         },
         back() {
diff --git a/src/views/newMap/displayNew/lesson/tipTrainingDetail.vue b/src/views/newMap/displayNew/lesson/tipTrainingDetail.vue
index a299f8a9f..d3f6ad2eb 100644
--- a/src/views/newMap/displayNew/lesson/tipTrainingDetail.vue
+++ b/src/views/newMap/displayNew/lesson/tipTrainingDetail.vue
@@ -1,16 +1,16 @@
 <template>
   <!-- v-drag  拖拽 调整宽高 -->
-  <div v-quickMenuDrag class="reminder-drag">
-    <div ref="drapBox" class="reminder-box" :style="{bottom: offsetBottom + 'px'}">
-      <div class="zhezhao" />
-      <div class="reminder-box-content">
-        <div class="tip-title">
-          <i v-show="isShrink" class="icon el-icon-minus" @click="shrink" />
-          <i v-show="!isShrink" class="icon el-icon-plus" @click="shrink" />
-          <p v-if="isShrink" style="color: #fff;">
-            <span>{{ lessonName }}</span>
-          </p>
-        </div>
+  <div v-quickMenuDrag class="reminder-drag" :style="{bottom: offsetBottom + 'px'}">
+    <div ref="drapBox" class="reminder-box">
+      <div class="tip-title">
+        <i v-show="isShrink" class="icon el-icon-minus" @click="shrink" />
+        <i v-show="!isShrink" class="icon el-icon-plus" @click="shrink" />
+        <p v-if="isShrink" style="color: #fff;">
+          <span>{{ lessonName }}</span>
+        </p>
+      </div>
+      <div v-if="isShrink" class="reminder-box-content">
+        <div class="zhezhao" />
         <div ref="dragBody" class="tip-body-box">
           <div class="tip-body">
             <el-scrollbar wrap-class="scrollbar-wrapper">
@@ -135,16 +135,23 @@ export default {
             launchFullscreen();
         },
         shrink() {
-            const height = this.$refs.dragBody.offsetHeight + 40;
-            const top = this.$refs.drapBox.style.top;
+            // const height = this.$refs.dragBody.offsetHeight + 40;
+            // const top = this.$refs.drapBox.style.top;
             if (this.isShrink) {
-                this.$refs.drapBox.style.height = '40px';
-                this.$refs.drapBox.style.top = '';
+                //
+                // this.$refs.drapBox.style.height = '40px';
+                // this.$refs.drapBox.style.top = '';
                 this.isShrink = false;
             } else {
-                this.$refs.drapBox.style.height = height + 'px';
-                this.$refs.drapBox.style.top = top;
                 this.isShrink = true;
+                this.$nextTick(()=>{
+                    const dragDom = document.querySelector('.reminder-drag').style.bottom;
+                    if (document.body.clientHeight - 300 - parseInt(dragDom.replace('px', '')) < 0) {
+                        document.querySelector('.reminder-drag').style.bottom = `${document.body.clientHeight - 300}px`;
+                    }
+                });
+                // this.$refs.drapBox.style.height = height + 'px';
+                // this.$refs.drapBox.style.top = top;
             }
         }
     }
@@ -156,14 +163,17 @@ export default {
     .tip-body-box {
         position: relative;
         height: 260px;
+        position: absolute;
+        left: 0;
+        top: 0;
+        width: 100%;
     }
 
     .reminder-drag{
         position: absolute;
-        width: 500px;
-        height: 300px;
         bottom: 0px;
-        left: 0px;
+        left: 15px;
+        z-index: 10;
     }
 
     .elem-span{
@@ -175,37 +185,31 @@ export default {
         height: 100%;
         filter: blur(8px);
         background: rgba(255,255,255,0.9);
+        position:absolute;
     }
     .reminder-box-content{
-        position: absolute;
-        width: 100%;
-        height: 100%;
+        width: 500px;
+        height: 260px;
         left: 0;
         top: 0;
         z-index: 2;
         background: rgba(255,255,255,0.8);
+        position: relative;
     }
     .reminder-box {
-        position: absolute;
-        float: left;
-        left: 15px;
-        bottom: 15px;
-        width: 500px;
-        height: 300px;
-        background: transparent;
         border-radius: 5px;
         overflow: hidden;
         z-index: 10;
         font-size: 18px;
 
         .tip-title {
-            width: 100%;
+            width: 500px;
             overflow: hidden;
             height: 40px;
             display: flex;
             align-items: center;
             flex-direction: row-reverse;
-            background-color: rgba(64, 158, 255,0.8);
+            background-color: rgba(64, 158, 255,1);
             border-radius: 5px 5px 0 0;
             justify-content: space-between;
             padding: 0 10px;
@@ -249,7 +253,7 @@ export default {
         }
 
         .tip-body {
-            height: 366px;
+            height: 260px;
             padding: 10px;
 
             .list-label {
diff --git a/src/views/newMap/displayNew/menuDemon.vue b/src/views/newMap/displayNew/menuDemon.vue
index 58078885f..3e957a275 100644
--- a/src/views/newMap/displayNew/menuDemon.vue
+++ b/src/views/newMap/displayNew/menuDemon.vue
@@ -251,7 +251,7 @@ export default {
             }).catch(error => {
                 this.isDisable = false;
                 if (error.code == '5001') {
-                    this.$messageBox(this.$t('error.mapDataError') + '，' + this.$t('error.startSimulationFailed'));
+                    this.$messageBox(this.$t('error.mapDataError') + ',' + this.$t('error.startSimulationFailed'));
                 } else if (error.code == '5002') {
                     this.$messageBox(this.$t('error.runningChartDataError') + ',' + this.$t('error.startSimulationFailed'));
                 } else if (error.code == '5003') {
diff --git a/src/views/newMap/displayNew/menuPractice.vue b/src/views/newMap/displayNew/menuPractice.vue
index 93e69ba4e..5651b55a9 100644
--- a/src/views/newMap/displayNew/menuPractice.vue
+++ b/src/views/newMap/displayNew/menuPractice.vue
@@ -88,7 +88,7 @@ export default {
             }).catch((error) => {
                 this.isDisable = false;
                 if (error.code == '5001') {
-                    this.$messageBox(this.$t('error.mapDataError') + '，' + this.$t('error.startSimulationFailed'));
+                    this.$messageBox(this.$t('error.mapDataError') + ',' + this.$t('error.startSimulationFailed'));
                 } else if (error.code == '5002') {
                     this.$messageBox(this.$t('error.runningChartDataError') + ',' + this.$t('error.startSimulationFailed'));
                 } else if (error.code == '5003') {
diff --git a/src/views/newMap/displayNew/menuSchema.vue b/src/views/newMap/displayNew/menuSchema.vue
index 5f09f28c6..f04438a67 100644
--- a/src/views/newMap/displayNew/menuSchema.vue
+++ b/src/views/newMap/displayNew/menuSchema.vue
@@ -8,8 +8,10 @@
           <!-- 加载剧本 -->
           <el-button v-if="isDemon && !isScheduling && !isContest" size="small" :disabled="viewDisabled" type="success" @click="viewRunQuest">{{ $t('display.schema.loadScript') }}</el-button>
           <!-- 运行图加载 -->
-          <el-button v-if="notScript && running" size="small" :disabled="viewDisabled" @click="viewRunPlan">{{ $t('display.schema.previewRunDiagram') }}</el-button>
-          <el-button v-if="notScript && !running" size="small" type="warning" @click="loadRunPlan">{{ $t('display.schema.loadRunDiagram') }}</el-button>
+          <!-- notScript &&  -->
+          <el-button v-if="running" size="small" :disabled="viewDisabled" @click="viewRunPlan">{{ $t('display.schema.previewRunDiagram') }}</el-button>
+          <!-- notScript &&  -->
+          <el-button v-if="!running" size="small" type="warning" @click="loadRunPlan">{{ $t('display.schema.loadRunDiagram') }}</el-button>
         </el-button-group>
         <el-button v-if="!isScheduling" size="small" :type="faultMode ? '':'primary' " @click="changeOperateMode()">{{ faultMode?'切换到普通模式':'切换到故障模式' }}</el-button>
         <!-- <el-button v-if="!isLocalStation" size="small" :type="faultMode ? 'danger' : ''" @click="changeDirectiveMode()">指令模式</el-button> -->
@@ -91,10 +93,6 @@ export default {
         isLocalStation() {
             return this.$store.state.training.prdType === '01';
         },
-        drawWay() {
-            const drawWay = this.$route.query.drawWay;
-            return drawWay && JSON.parse(drawWay);
-        },
         running() {
             return this.$store.state.training.started;
         },
diff --git a/src/views/newMap/displayNew/scriptDisplay/component/covertOperation.js b/src/views/newMap/displayNew/scriptDisplay/component/covertOperation.js
index 0d1f9b3c5..84c4c0ef3 100644
--- a/src/views/newMap/displayNew/scriptDisplay/component/covertOperation.js
+++ b/src/views/newMap/displayNew/scriptDisplay/component/covertOperation.js
@@ -58,12 +58,34 @@ export const operateEnum = {
         // }
     },
     ControlConvertMenu:{
+        type:'控制模式',
         CM_Apply_For_Station_Control:{
             code:'stationCodes',
             isList:true,
             isDevice:true,
             name:'车站列表',
             function:getStationNameById
+        },
+        CM_Reply_Station_Control:{
+            code:'replyVOList',
+            name:'车站列表',
+            isList:true,
+            isDevice:true,
+            function:getStationResultById
+        },
+        CM_Reply_Center_Control:{
+            code:'replyVOList',
+            name:'车站列表',
+            isList:true,
+            isDevice:true,
+            function:getStationResultById
+        },
+        CM_Apply_For_Center_Control:{
+            code:'stationCodes',
+            isList:true,
+            isDevice:true,
+            name:'车站列表',
+            function:getStationNameById
         }
     },
     Stand:{
@@ -125,7 +147,7 @@ export const operateEnum = {
             params:[
                 {
                     code:'open',
-                    name:'',
+                    name:'状态',
                     result:[
                         {data:true, name:'开', judge:'='},
                         {data:false, name:'关', judge:'='}
@@ -133,13 +155,17 @@ export const operateEnum = {
                 },
                 {
                     code:'right',
-                    name:'',
+                    name:' 方向',
                     result:[
                         {data:true, name:'左门', judge:'='},
                         {data:false, name:'右门', judge:'='}
                     ]
                 }
             ]
+        },
+        Driver_Drive_Mode_Change:{
+            code:'driveMode',
+            name:'模式为'
         }
     },
     TrainWindow:{
@@ -179,13 +205,13 @@ export function covertOperate(operationType, operationParamMap) {
     if (operationType == 'Set_Fault' || operationType == 'Cancel_Fault') {
         let deviceName = '';
         const device = store.getters['map/getDeviceByCode'](operationParamMap.code);
-        if (device._type == 'StationStand') {
+        if (device._type == 'StationStand' || device._type == 'Signal' || device._type == 'Switch') {
             const station = store.getters['map/getDeviceByCode'](device.stationCode);
-            deviceName += '【车站-' + station.name + '】/';
+            deviceName += '【车站-' + station.name + '】 / ' + deviceType[device._type] + device.name;
         } else {
             deviceName = '' + device.name;
         }
-        let tip = '请找到' + deviceType[device._type] + deviceName + ',';
+        let tip = '请找到' + deviceName + ',';
         if (operationType == 'Set_Fault') {
             tip += '设置故障,';
         } else {
@@ -233,31 +259,57 @@ export function covertOperate(operationType, operationParamMap) {
     }
 }
 
-function covertOperation(deviceType, operationParamMap, operationType) {
+function covertDeviceName(deviceInfo, deviceType) {
     let deviceName = '';
+    const device = store.getters['map/getDeviceByCode'](deviceInfo);
+    if (device._type == 'StationStand' || device._type == 'Signal' || device._type == 'Switch') {
+        const station = store.getters['map/getDeviceByCode'](device.stationCode);
+        deviceName += '车站-' + station.name + ' / ';
+    }
+    if (device._type == 'Section') {
+        if (device.parentCode && device.type == '02') {
+            const parentSection = store.getters['map/getDeviceByCode'](device.parentCode);
+            deviceName += operateEnum[deviceType].type + ' ' + parentSection.name + '-' + device.name;
+        } else {
+            deviceName += operateEnum[deviceType].type + device.name;
+        }
+    } else {
+        let deviceNameIn = '';
+        if (device.name) {
+            deviceNameIn = device.name;
+        } else {
+            deviceNameIn = '(车组号:' + device.groupNumber + ')';
+        }
+        deviceName += operateEnum[deviceType].type + ' ' + deviceNameIn;
+    }
+    return deviceName;
+}
+
+function covertOperation(deviceType, operationParamMap, operationType) {
+    let deviceName = '【';
     let paramName = '';
     if (operateEnum[deviceType].code) {
-        const device = store.getters['map/getDeviceByCode'](operationParamMap[operateEnum[deviceType].code]);
-        if (device._type == 'StationStand') {
-            const station = store.getters['map/getDeviceByCode'](device.stationCode);
-            deviceName += '【车站-' + station.name + '】/';
-        }
-        if (device._type == 'Section') {
-            if (device.parentCode && device.type == '02') {
-                const parentSection = store.getters['map/getDeviceByCode'](device.parentCode);
-                deviceName += '【' + operateEnum[deviceType].type + ' ' + parentSection.name + '-' + device.name + '】';
-            } else {
-                deviceName += '【' + operateEnum[deviceType].type + device.name + '】';
-            }
+        const deviceInfo = operationParamMap[operateEnum[deviceType].code];
+        if (deviceInfo) {
+            deviceName += covertDeviceName(deviceInfo, deviceType);
         } else {
-            let deviceNameIn = '';
-            if (device.name) {
-                deviceNameIn = device.name;
-            } else {
-                deviceNameIn = '(车组号:' + device.groupNumber + ')';
-            }
-            deviceName += '【' + operateEnum[deviceType].type + ' ' + deviceNameIn + '】';
+            const deviceCode = operationParamMap[operateEnum[deviceType][operationType].code];
+            const device = store.getters['map/routeList'].find(route=>{ return route.code == deviceCode; });
+            deviceName += covertDeviceName(device.startSignalCode, deviceType);
         }
+        // if (deviceInfo instanceof Array) {
+        //     deviceInfo.forEach((each, index)=>{
+        //         deviceName = +covertDeviceName(each, deviceType);
+        //         if (index != deviceInfo.length - 1) {
+        //             deviceName += '，';
+        //         }
+        //     });
+        // } else {
+
+        // }
+        deviceName += '】';
+    } else if (operateEnum[deviceType].type) {
+        deviceName += operateEnum[deviceType].type + '】';
     }
     const paramInfo = operateEnum[deviceType][operationType];
     if (paramInfo) {
@@ -333,11 +385,17 @@ function getRouteNameById(routeId) {
     const route = routeList.find(route=>{
         return route.code == routeId;
     });
-    if (route) { return route.name; } else { return ''; }
+    if (route) { return route.turnBack ? route.name + '(Z)' : route.name; } else { return ''; }
 }
 
 function getStationNameById(stationId) {
     const station = store.getters['map/getDeviceByCode'](stationId);
     return station.name;
 }
+function getStationResultById(stationResult) {
+    const station = store.getters['map/getDeviceByCode'](stationResult.stationCode);
+    let param = '不同意';
+    if (stationResult.agree) { param = '同意'; }
+    return station.name + ' ' + param;
+}
 
diff --git a/src/views/newMap/displayNew/scriptDisplay/component/scriptTip.vue b/src/views/newMap/displayNew/scriptDisplay/component/scriptTip.vue
index 81eee8fd4..fa2dceb35 100644
--- a/src/views/newMap/displayNew/scriptDisplay/component/scriptTip.vue
+++ b/src/views/newMap/displayNew/scriptDisplay/component/scriptTip.vue
@@ -1,5 +1,5 @@
 <template>
-  <div v-if="scriptTipMessage!=''" class="scriptTipMessage" :style="{top:offset+'px'}">{{ scriptTipMessage }}</div>
+  <div v-if="scriptTipMessage!=''" class="scriptTipMessage" :style="{top:offset + 55 +'px'}">{{ scriptTipMessage }}</div>
 </template>
 <script>
 import {covertOperate} from './covertOperation.js';
@@ -26,8 +26,7 @@ export default {
     watch:{
         // 剧本提示
         '$store.state.socket.simulationScriptTip':function(val, old) {
-            //  && this.$store.state.training.scriptOperationType === 'teach'
-            if (val) {
+            if (val && this.$store.state.training.scriptOperationType === 'teach') {
                 if (val.type == 'Accept_Conversation_Invitation') {
                     this.scriptTipMessage = '请接受会话邀请';
                 } else if (val.type == 'Conversation') {
diff --git a/src/views/newMap/displayNew/scriptDisplay/scriptPreview/index.vue b/src/views/newMap/displayNew/scriptDisplay/scriptPreview/index.vue
index 8f3d308f6..baf2f1a64 100644
--- a/src/views/newMap/displayNew/scriptDisplay/scriptPreview/index.vue
+++ b/src/views/newMap/displayNew/scriptDisplay/scriptPreview/index.vue
@@ -43,7 +43,7 @@ import FaultChoose from '@/views/newMap/displayNew/demon/faultChoose';
 import MenuSystemTime from '@/views/newMap/displayNew/menuSystemTime';
 
 import { mapGetters } from 'vuex';
-import {loadDraftScript, loadDraftScriptNew} from '@/api/designPlatform';
+import { loadDraftScriptNew } from '@/api/designPlatform';
 import Vue from 'vue';
 import ConstConfig from '@/scripts/ConstConfig';
 
@@ -99,10 +99,6 @@ export default {
         },
         prdType() {
             return this.$store.state.training.prdType;
-        },
-        drawWay() {
-            const drawWay = this.$route.query.drawWay;
-            return drawWay && JSON.parse(drawWay);
         }
     },
     watch: {
@@ -131,7 +127,7 @@ export default {
         },
         async selectRole(role) {
             try {
-                const res = this.drawWay ? await loadDraftScriptNew(role.id, this.group) : await loadDraftScript(this.$route.query.scriptId, role.id, this.group);
+                const res = await loadDraftScriptNew(role.id, this.group);
                 if (res && res.code == 200) {
                     if (this.querymapLocation) {
                         const newMapLocation = {'offsetX': this.mapLocation.x, 'offsetY': this.mapLocation.y, 'scaleRate': this.mapLocation.scale};
diff --git a/src/views/newMap/displayNew/scriptDisplay/scriptPreview/scriptButtonGroup.vue b/src/views/newMap/displayNew/scriptDisplay/scriptPreview/scriptButtonGroup.vue
index be85c309d..8e0669a54 100644
--- a/src/views/newMap/displayNew/scriptDisplay/scriptPreview/scriptButtonGroup.vue
+++ b/src/views/newMap/displayNew/scriptDisplay/scriptPreview/scriptButtonGroup.vue
@@ -222,6 +222,12 @@ export default {
                         id: 'parentDepartment',
                         type: 'role',
                         children: result.deviceListData[5]
+                    },
+                    {
+                        label: '电力调度',
+                        id: 'electricDispatcher',
+                        type: 'role',
+                        children: result.deviceListData[6]
                     }];
                     const lastMemberList = result.lastMemberList;
                     this.$emit('setTreeData', treeData);
diff --git a/src/views/newMap/displayNew/scriptDisplay/scriptRecord/index.vue b/src/views/newMap/displayNew/scriptDisplay/scriptRecord/index.vue
index c6ffad1ee..733773e31 100644
--- a/src/views/newMap/displayNew/scriptDisplay/scriptRecord/index.vue
+++ b/src/views/newMap/displayNew/scriptDisplay/scriptRecord/index.vue
@@ -28,15 +28,12 @@
     />
 
     <set-time ref="setTime" @ConfirmSelectBeginTime="start" />
+
     <tip-script-record-new
       ref="tipTaskRecordNew"
       :group="group"
       :offset-bottom="offsetBottom"
       :offset="offset"
-      :tree-data="treeData"
-      :member-list="memberData"
-      @changeTreeData="changeTreeData"
-      @addScriptMember="addScriptMember"
       @resetChat="resetChat"
     />
     <chat-box
@@ -56,7 +53,6 @@ import TipScriptRecordNew from '@/views/scriptManage/tipScriptRecord';
 import SetTime from '@/views/newMap/displayNew/demon/setTime';
 import { Notification } from 'element-ui';
 import { ranAsPlan, exitRunPlan } from '@/api/simulation';
-import {covertMemberData} from '@/views/newMap/displayNew/utils';
 import { getSimulationMemberList} from '@/api/simulation';
 import ChatBox from '@/views/newMap/chatView/chatBox.vue';
 
@@ -101,10 +97,6 @@ export default {
         return {
             isDisable: false,
             isScriptCommand:false,
-            driverList:[],
-            treeData:[],
-            memberData:[],
-            activeTrainList:[],
             userRole:''
         };
     },
@@ -133,82 +125,16 @@ export default {
         '$store.state.scriptRecord.bgSet':function (val) {
             this.isScriptCommand = val;
         },
-        // 按计划行车的列车列表更新(更新司机列表)
-        '$store.state.map.activeTrainListChange': function (val) {
-            // driverList
-            const activeTrainList = this.$store.state.map.activeTrainList;
-            if (this.driverList.length > 0) {
-                const driverList = [];
-                if (activeTrainList && activeTrainList.length) {
-                    activeTrainList.sort();
-                    activeTrainList.forEach(groupNumber => {
-                        const drivers = this.driverList.find(driver=>{
-                            return driver.deviceCode == groupNumber;
-                        });
-                        if (drivers) {
-                            driverList.push(drivers);
-
-                        }
-                    });
-                }
-                // this.memberData = [...this.treeData[0].children, ...this.treeData[1].children, ...this.treeData[2].children, ...this.treeData[3].children, ...this.treeData[4].children];
-                this.treeData[2].children = driverList;
-            } else {
-                this.activeTrainList = activeTrainList;
-            }
-        },
         '$store.state.map.mapViewLoadedCount': function (val) { // 地图视图加载完成标识
             getSimulationMemberList(this.group).then(resp => {
-                // this.$store.dispatch('training/setMemberList', {memberList:resp.data, userId:this.$store.state.user.id});
-                this.driverList = [];
-                this.treeData = [];
-                if (this.$store.state.training.started) {
-                    this.activeTrainList = this.$store.state.map.activeTrainList;
-                }
-                // 获取仿真成员列表
-                const result = covertMemberData(this.activeTrainList, resp.data);
-                this.driverList = result.driverList;
-                this.treeData = [{
-                    label: '行调',
-                    id: 'dispatcher',
-                    type: 'role',
-                    children: result.deviceListData[0]
-                }, {
-                    label: '车站值班员',
-                    id: 'stationSupervisor',
-                    type: 'role',
-                    children: result.deviceListData[2]
-                }, {
-                    label: '司机',
-                    id: 'driver',
-                    type: 'role',
-                    children: result.deviceListData[3]
-                }, {
-                    label: '通号',
-                    id: 'maintainer',
-                    type: 'role',
-                    children: result.deviceListData[1]
-                }, {
-                    label: '车辆段',
-                    id: 'depotDispatcher',
-                    type: 'role',
-                    children: result.deviceListData[4]
-                }, {
-                    label: '上级部门',
-                    id: 'parentDepartment',
-                    type: 'role',
-                    children: result.deviceListData[5]
-                }
-                // PARENT_DEPARTMENT
-                ];
-                this.memberData = result.lastMemberList;
+                this.$store.dispatch('training/setMemberList', {memberList:resp.data, userId:this.$store.state.user.id});
                 // 设置当前角色
                 const member = resp.data.find(mem=>{
                     return mem.userId != '' && mem.userId != undefined;
                 });
                 if (member) {
-                    const memberType = ['STATION_SUPERVISOR', 'DISPATCHER', 'DRIVER', 'MAINTAINER', 'DEPOT_DISPATCHER', 'PARENT_DEPARTMENT'];
-                    const prdTypeList = ['01', '02', '04', '', '', ''];
+                    const memberType = ['STATION_SUPERVISOR', 'DISPATCHER', 'DRIVER', 'MAINTAINER', 'DEPOT_DISPATCHER', 'PARENT_DEPARTMENT', 'ELECTRIC_DISPATCHER'];
+                    const prdTypeList = ['01', '02', '04', '', '05', '', ''];
                     const index = memberType.indexOf(member.type);
                     let prdType;
                     if (index >= 0) {
@@ -223,6 +149,9 @@ export default {
             }).catch(() => {
                 this.$messageBox('获取仿真成员列表失败！');
             });
+        },
+        '$store.state.scriptRecord.userRole':function (val) {
+            this.userRole = val;
         }
     },
     beforeDestroy() {
@@ -305,48 +234,6 @@ export default {
         },
         resetChat() {
             // this.$refs.chatbox.resetCoversition();
-        },
-        changeTreeData({newRole, oldRole}) {
-            const deviceTypeList = ['DISPATCHER', 'STATION_SUPERVISOR', 'DRIVER', 'MAINTAINER', 'DEPOT_DISPATCHER', 'PARENT_DEPARTMENT'];
-            if (oldRole.id) {
-                const oldIndex = deviceTypeList.indexOf(oldRole.type);
-                if (oldIndex >= 0) {
-                    const oldTreeDataIn = this.treeData[oldIndex];
-                    oldTreeDataIn.children.map(device=>{
-                        if (device.id == oldRole.id) {
-                            device.userName = '';
-                            delete device.userId;
-                            device.disabled = false;
-                            device.label = device.type + (device.deviceName ? '- ' + device.deviceName : '') + (device.name ? device.name : '');
-                        }
-                    });
-                    this.treeData[oldIndex] = oldTreeDataIn;
-                }
-            }
-            const newIndex = deviceTypeList.indexOf(newRole.type);
-            if (newIndex >= 0) {
-                const newTreeDataIn = this.treeData[newIndex];
-                newTreeDataIn.children.map(device=>{
-                    if (device.id == newRole.id) {
-                        device.userName = this.$store.state.user.nickname;
-                        device.userId = this.$store.state.user.id;
-                        device.disabled = true;
-                        device.label = device.type + (device.deviceName ? '- ' + device.deviceName : '') + (device.name ? device.name : '') + '-' + device.userName;
-                    }
-                });
-                this.treeData[newIndex] = newTreeDataIn;
-            }
-            this.userRole = newRole.type;
-        },
-        addScriptMember(member) {
-            this.memberData.push(member);
-            const deviceTypeList = ['行调', '行值', '司机', '通号', '车辆段调度', '上级部门'];
-            const index = deviceTypeList.indexOf(member.type);
-            if (index >= 0) {
-                const treeDataIn = this.treeData[index];
-                treeDataIn.children.push(member);
-                this.treeData[index] = treeDataIn;
-            }
         }
     }
 };
diff --git a/src/views/newMap/displayNew/utils.js b/src/views/newMap/displayNew/utils.js
index fd911618e..08fd61ee4 100644
--- a/src/views/newMap/displayNew/utils.js
+++ b/src/views/newMap/displayNew/utils.js
@@ -15,7 +15,7 @@ export function covertMemberData (activeTrainList, resp) {
     lastData = JSON.parse(lastData);
     const lastMemberList = [];
     // const electricDispatcherList = [];
-    const deviceListData = [[], [], [], [], [], []];
+    const deviceListData = [[], [], [], [], [], [], []];
     const driverList = [];
     lastData.forEach((member, index)=>{
         if (member.userId && member.userId == store.state.user.id) {
@@ -37,7 +37,7 @@ export function covertMemberData (activeTrainList, resp) {
             member.label = member.type + name + userName;
             member.normalName = member.type + name;
         }
-        const deviceType = ['行调', '通号', '行值', '司机', '车辆段调度', '上级部门'];
+        const deviceType = ['行调', '通号', '行值', '司机', '车辆段调度', '上级部门', '电力调度'];
         const deviceTypeIndex = deviceType.indexOf(member.type);
         if (deviceTypeIndex >= 0) {
             if (deviceTypeIndex == 3) {
diff --git a/src/views/newMap/jlmapNew/index.vue b/src/views/newMap/jlmapNew/index.vue
index dbe291f31..c6a79908c 100644
--- a/src/views/newMap/jlmapNew/index.vue
+++ b/src/views/newMap/jlmapNew/index.vue
@@ -84,7 +84,6 @@ export default {
     computed: {
         ...mapGetters('training', [
             'mode'
-            // 'offsetStationCode'
         ]),
         canvasId() {
             const canvasId = ['map', (Math.random().toFixed(5)) * 100000].join('_');
@@ -377,7 +376,7 @@ export default {
                     offsetX: this.dataZoom.offsetX,
                     lineCode: lineCode
                 };
-                this.$store.dispatch('map/updateZoom', this.dataZoom);
+                this.$store.commit('map/setDataZoom', this.dataZoom);
                 localStore.set(`scaleRate_${lineCode}`, JSON.stringify(param)); // 保存缩放倍数
             }
 
diff --git a/src/views/newMap/jointTrainingNew/index.vue b/src/views/newMap/jointTrainingNew/index.vue
index 75e35bf8f..c65af1fae 100644
--- a/src/views/newMap/jointTrainingNew/index.vue
+++ b/src/views/newMap/jointTrainingNew/index.vue
@@ -239,7 +239,6 @@ export default {
         await this.$store.dispatch('training/end', null);
         await this.$store.dispatch('training/reset');
         await this.$store.dispatch('map/mapClear');
-        await this.$store.dispatch('training/setGroup', '');
         if (this.countdown) {
             clearInterval(this.countdown);
         }
@@ -433,6 +432,13 @@ export default {
                 this.drivingShow = false;
                 break;
             }
+            if (this.$route.query.type === 'ILW') {
+                this.$store.dispatch('training/setPrdType', '');
+                this.$store.dispatch('training/setRoles', 'AUDIENCE');
+                this.jl3dmaintainershow = false;
+                this.drivingShow = false;
+                this.hideIbp();
+            }
         },
         /* 竞赛系统倒计时 */
         startCounting() {
diff --git a/src/views/newMap/jointTrainingNew/memberManage/content-menu.vue b/src/views/newMap/jointTrainingNew/memberManage/content-menu.vue
index a537967dc..1064b94a2 100644
--- a/src/views/newMap/jointTrainingNew/memberManage/content-menu.vue
+++ b/src/views/newMap/jointTrainingNew/memberManage/content-menu.vue
@@ -38,9 +38,6 @@ export default {
         position() {
             return this.$store.state.menuOperation.menuPosition;
         },
-        drawWay() {
-            return this.$route.query.drawWay + '';
-        },
         menu() {
             return [{
                 label: this.$t('trainRoom.kickOutTheRoom'),
diff --git a/src/views/newMap/jointTrainingNew/memberManage/membersManage.vue b/src/views/newMap/jointTrainingNew/memberManage/membersManage.vue
index 3c8ce2ae6..bc8469054 100644
--- a/src/views/newMap/jointTrainingNew/memberManage/membersManage.vue
+++ b/src/views/newMap/jointTrainingNew/memberManage/membersManage.vue
@@ -123,9 +123,6 @@ export default {
         group() {
             return this.$route.query.group;
         },
-        drawWay() {
-            return this.$route.query.drawWay + '';
-        },
         userId() {
             return this.$store.state.user ? this.$store.state.user.id : '';
         },
@@ -157,9 +154,11 @@ export default {
                         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':
@@ -196,7 +195,12 @@ export default {
                     labelName: '车辆段',
                     id: 'depotDispatcher',
                     children: depotDispatcherList
-                }];
+                }, {
+                    labelName: '电力调度',
+                    id: 'electricDispatcher',
+                    children: electricDispatcherList
+                }
+                ];
                 this.$nextTick(() => {
                     if (this.$refs.tree) {
                         this.$refs.tree.filter(this.queryMember);
diff --git a/src/views/newMap/jointTrainingNew/menuDemon.vue b/src/views/newMap/jointTrainingNew/menuDemon.vue
index 2c4341ad7..c023906b9 100644
--- a/src/views/newMap/jointTrainingNew/menuDemon.vue
+++ b/src/views/newMap/jointTrainingNew/menuDemon.vue
@@ -1,6 +1,6 @@
 <template>
   <div>
-    <chat-box :group="group" :user-role="userRole" />
+    <chat-box v-if="$route.query.type !== 'ILW'" :group="group" :user-role="userRole" />
     <!-- 地图没有报错-->
     <!-- 地图错误判断 -->
     <div v-if="!dataError&&hasOneButton" class="display_top_draft" :style="{top: offset+'px'}">
@@ -14,9 +14,9 @@
         <el-button v-if="isShowScheduling || isStationSupervisor" size="small" @click="jumpjl3dpassflow">{{ $t('display.demon.passengerflow') }}</el-button>
         <el-button v-if="isShowScheduling || isStationSupervisor" size="small" @click="jumpjl3dfaultdevice">{{ $t('display.demon.maintainer') }}</el-button>
         <!-- <el-button v-if="isAdmin" size="small" @click="otherVrView">VR第三人称视角</el-button> -->
-        <el-button v-if="isAdmin && !noQrcodeList.includes(project)" type="primary" size="small" @click="generateQrCode">生成二维码</el-button>
-        <el-button v-if="isAdmin" size="small" @click="memberManage">成员管理</el-button>
-        <el-button v-if="isAdmin && isProject" size="small" @click="handleEquipment">设备管理</el-button>
+        <el-button v-if="isAdmin && !noQrcodeList.includes(project) && $route.query.type !== 'ILW'" type="primary" size="small" @click="generateQrCode">生成二维码</el-button>
+        <el-button v-if="isAdmin && $route.query.type !== 'ILW'" size="small" @click="memberManage">成员管理</el-button>
+        <el-button v-if="(isAdmin && isProject) || $route.query.type === 'ILW'" size="small" @click="handleEquipment">设备管理</el-button>
         <el-button v-if="isDeviceLogin" size="small" @click="handleTeach">教学系统</el-button>
         <el-button v-if="isDeviceLogin || $route.query.type === 'IM'" size="small" @click="handleExam">考试系统</el-button>
       </el-button-group>
@@ -26,7 +26,7 @@
         <el-button v-if="project==='refereeJsxt'" type="success" size="small" @click="refeeEndCompetition">退出</el-button> <!-- 竞赛退出 -->
         <el-button v-if="project!=='jsxt' && project!=='refereeJsxt'" type="primary" :loading="backLoading" size="small" @click="back">退出</el-button>
         <template v-if="!dataError"> <!-- 地图错误判断 -->
-          <template v-if="isAdmin && project != 'refereeJsxt'">
+          <template v-if="isAdmin && project != 'refereeJsxt' && $route.query.type !== 'ILW'">
             <el-button type="danger" size="small" @click="end">{{ $t('joinTraining.initialize') }}</el-button>
             <!-- 按计划行车 -->
             <el-button type="success" :disabled="isDisable" size="small" @click="selectBeginTime">{{ $t('joinTraining.drivingByPlan') }}</el-button>
@@ -203,7 +203,6 @@ export default {
         });
     },
     async beforeDestroy() {
-        this.$store.dispatch('training/setGroup', '');
         if (this.project === 'jsxt') {
             quitCurrentRace(this.$route.query.raceId, {group:this.group}).then(res=>{
             });
diff --git a/src/views/newMap/jointTrainingNew/menuSchema.vue b/src/views/newMap/jointTrainingNew/menuSchema.vue
index 85038052a..02db231ae 100644
--- a/src/views/newMap/jointTrainingNew/menuSchema.vue
+++ b/src/views/newMap/jointTrainingNew/menuSchema.vue
@@ -7,13 +7,13 @@
       <el-button-group>
         <el-button v-if="userRole=== 'STATION_SUPERVISOR' && !$route.query.projectDevice" size="small" @click="goIbp">IBP盘</el-button>
         <el-button v-if="userRole=== 'DISPATCHER' && !$route.query.projectDevice" size="small" @click="goBigScreen">大屏</el-button>
-        <el-button v-if="running && !dataError" size="small" :disabled="viewDisabled" @click="viewRunPlan">{{ $t('joinTraining.runGraphPreview') }}</el-button>
+        <el-button v-if="running && !dataError && $route.query.type !== 'ILW'" size="small" :disabled="viewDisabled" @click="viewRunPlan">{{ $t('joinTraining.runGraphPreview') }}</el-button>
         <template v-if="isAdmin">
-          <el-button v-if="!running && !dataError" size="small" type="warning" @click="loadRunPlan">
+          <el-button v-if="!running && !dataError && $route.query.type !== 'ILW'" size="small" type="warning" @click="loadRunPlan">
             {{ $t('joinTraining.runGraphLoading') }}</el-button><!-- 运行图加载 -->
         </template>
       </el-button-group>
-      <el-button v-if="isAdmin && !dataError && !isScreen" size="small" :type="faultMode ? '' : 'primary' " @click="changeOperateMode()">{{ faultMode?' 切换到普通模式':'切换到故障模式' }}</el-button>
+      <el-button v-if="(isAdmin || $route.query.type === 'ILW') && !dataError && !isScreen" size="small" :type="faultMode ? '' : 'primary' " @click="changeOperateMode()">{{ faultMode?' 切换到普通模式':'切换到故障模式' }}</el-button>
       <!-- isCenter && !dataError && !isAdmin 此判断用于以后(目前 暂时不用) -->
       <el-button v-if="isShowDirective" size="small" :type="directiveMode ? 'primary' : ''" @click="changeDirectiveMode()">{{ directiveMode? '切换到普通模式':'切换到指令模式' }}</el-button>
     </div>
diff --git a/src/views/newMap/mapsystemNew/plugin/trainingtip.vue b/src/views/newMap/mapsystemNew/plugin/trainingtip.vue
index 51c09baf0..1d967ca0e 100644
--- a/src/views/newMap/mapsystemNew/plugin/trainingtip.vue
+++ b/src/views/newMap/mapsystemNew/plugin/trainingtip.vue
@@ -41,7 +41,7 @@ export default {
                 this.$store.dispatch('training/isTeachMode').then(() => {
                     this.tipShow = true;
                     const offset = this.$store.state.config.canvasOffset;
-                    if (this.$store.state.training.started) {
+                    if (this.$store.state.training.trainingStart) {
                         const order = this.$store.state.training.order;
                         const steps = this.$store.state.training.steps;
                         if (order > -1 && order < steps.length) {
diff --git a/src/views/newMap/newDesignUser/mapmanage/create.vue b/src/views/newMap/newDesignUser/mapmanage/create.vue
index 389144103..7564b7e6e 100644
--- a/src/views/newMap/newDesignUser/mapmanage/create.vue
+++ b/src/views/newMap/newDesignUser/mapmanage/create.vue
@@ -22,7 +22,7 @@
         <el-tab-pane :label="$t('map.publishMapCreation')" name="second">
           <el-form ref="pullForm" label-position="right" :model="pullModel" :rules="pullRules" label-width="140px" size="mini">
             <el-form-item :label="$t('map.publishMap')+ ':'" prop="id">
-              <el-select v-model="pullModel.id" :placeholder="$t('map.pleaseSelect')">
+              <el-select v-model="pullModel.id" :placeholder="$t('map.pleaseSelect')" @change="handlePullModel">
                 <el-option
                   v-for="item in publishMapList"
                   :key="item.id"
@@ -47,9 +47,6 @@
 
 <script>
 import { newMap, newUsePublishMap } from '@/api/jmap/mapdraft';
-// import XLSX from 'xlsx';
-// import { translate, translateSheetTitle } from '@/scripts/translate';
-// import { sheet_to_json } from '@/utils/Export2Excel';
 import { getLineCodeList } from '@/api/management/mapline';
 import { getMapListByProject } from '@/utils/mapList';
 
@@ -124,6 +121,10 @@ export default {
         handleClose() {
             this.close();
         },
+        handlePullModel(id) {
+            const obj = this.publishMapList.find(ele => ele.id == id);
+            this.pullModel.name = obj.name;
+        },
         initLoadData() {
             this.lineCodeList = [];
             this.$Dictionary.cityType().then(list => {
diff --git a/src/views/newMap/newDesignUser/mapmanage/mapImport.vue b/src/views/newMap/newDesignUser/mapmanage/mapImport.vue
index 46d998f0c..93be29b32 100644
--- a/src/views/newMap/newDesignUser/mapmanage/mapImport.vue
+++ b/src/views/newMap/newDesignUser/mapmanage/mapImport.vue
@@ -19,7 +19,7 @@
   </el-dialog>
 </template>
 <script>
-//
+
 import { postBuildMapImport } from '@/api/jmap/mapdraft';
 export default {
     name: 'MapImport',
diff --git a/src/views/newMap/newDesignUser/mapmanage/publish3d.vue b/src/views/newMap/newDesignUser/mapmanage/publish3d.vue
index be4c181ed..151e70f67 100644
--- a/src/views/newMap/newDesignUser/mapmanage/publish3d.vue
+++ b/src/views/newMap/newDesignUser/mapmanage/publish3d.vue
@@ -21,9 +21,8 @@
 </template>
 
 <script>
-import { publishMap3d } from '@/api/jmap/mapdraft';
 
-// import { checkMapName } from '@/api/jmap/map';
+import { publishMap3d } from '@/api/jmap/mapdraft';
 export default {
     name: 'MapPublish3d',
     props: {
diff --git a/src/views/newMap/newMapdraft/index.vue b/src/views/newMap/newMapdraft/index.vue
index cfdba59e4..d5f6b6f0e 100644
--- a/src/views/newMap/newMapdraft/index.vue
+++ b/src/views/newMap/newMapdraft/index.vue
@@ -418,7 +418,7 @@ export default {
             map.stationStandList.forEach(stationStand => {
                 const section = this.$store.getters['map/getDeviceByCode'](stationStand.standTrackCode);
                 const list = [];
-                section.points.forEach(point => {
+                section && section.points.forEach(point => {
                     list.push(point.x);
                 });
                 if (stationStand.position.x > Math.max(...list) || stationStand.position.x < Math.min(...list)) {
diff --git a/src/views/newMap/newMapdraft/mapoperate/checkboxDraft.vue b/src/views/newMap/newMapdraft/mapoperate/checkboxDraft.vue
index 0104ff4ea..00ba58821 100644
--- a/src/views/newMap/newMapdraft/mapoperate/checkboxDraft.vue
+++ b/src/views/newMap/newMapdraft/mapoperate/checkboxDraft.vue
@@ -154,7 +154,7 @@ export default {
         },
         clearList() { // 清空数据
             this.stationCode = '';
-            this.$store.dispatch('map/setSeclectDeviceList', []);
+            this.$store.commit('map/setSeclectDeviceList', []);
             this.seclectDeviceList = [];
             this.modelList = [
                 {
diff --git a/src/views/newMap/newMapdraft/mapoperate/config/list.vue b/src/views/newMap/newMapdraft/mapoperate/config/list.vue
index 19ae47f54..5d9026f66 100644
--- a/src/views/newMap/newMapdraft/mapoperate/config/list.vue
+++ b/src/views/newMap/newMapdraft/mapoperate/config/list.vue
@@ -133,6 +133,47 @@
               </div>
             </div>
           </template>
+          <template v-if="checkFieldType(item, 'sectionUnit')">
+            <div :key="item.prop" class="coordinate">
+              <span class="title" :style="{width: item.width}">{{ item.label }}</span>
+              <div class="point-section">
+                <template v-for="(sectionUnit, j) in formModel[item.prop]">
+                  <div :key="j" style="border: 1px solid #CCCCCC; border-radius: 5px;padding: 2px;padding-top: 10px;">
+                    <el-form-item label="左端区段" :prop="'sectionUnitList[' + j + '].leftCode'" label-width="70px">
+                      <el-select v-model="sectionUnit.leftCode" filterable placeholder="请选择" clearable style="width: 115px;">
+                        <el-option
+                          v-for="elem in item.options"
+                          :key="elem.code"
+                          :label="elem.name"
+                          :value="elem.code"
+                        />
+                      </el-select>
+                      <el-button
+                        :type="item.buttonShowType && item.listIndex === ('leftCode' + j) ? 'danger' : 'primary'"
+                        @click="item.hover(item.buttonType, `leftCode${j}`)"
+                      >{{ $t('map.activate') }}</el-button>
+                    </el-form-item>
+                    <el-form-item label="右端区段" :prop="'sectionUnitList[' + j + '].rightCode'" label-width="70px">
+                      <el-select v-model="sectionUnit.rightCode" filterable placeholder="请选择" clearable style="width: 115px;">
+                        <el-option
+                          v-for="elem in item.options"
+                          :key="elem.code"
+                          :label="elem.name"
+                          :value="elem.code"
+                        />
+                      </el-select>
+                      <el-button
+                        :type="item.buttonShowType && item.listIndex === ('rightCode' + j) ? 'danger' : 'primary'"
+                        @click="item.hover(item.buttonType, `rightCode${j}`)"
+                      >{{ $t('map.activate') }}</el-button>
+                      <el-button type="success" icon="el-icon-plus" circle @click="item.addSectionUnit(j)" />
+                      <el-button v-if="j" type="danger" icon="el-icon-delete" circle @click="item.delSectionUnit(j)" />
+                    </el-form-item>
+                  </div>
+                </template>
+              </div>
+            </div>
+          </template>
           <!-- 多个坐标点绘制 -->
           <template v-if="checkFieldType(item, 'points')">
             <div v-if="!item.isHidden" :key="item.prop" class="coordinate">
diff --git a/src/views/newMap/newMapdraft/mapoperate/delayunlock.vue b/src/views/newMap/newMapdraft/mapoperate/delayunlock.vue
index a0aeca576..742e0aad4 100644
--- a/src/views/newMap/newMapdraft/mapoperate/delayunlock.vue
+++ b/src/views/newMap/newMapdraft/mapoperate/delayunlock.vue
@@ -24,7 +24,7 @@
 
 <script>
 import { mapGetters } from 'vuex';
-import { getUID } from '@/jmap/utils/Uid';
+import { getUID } from '@/jmapNew/utils/Uid';
 import OperateProperty from './components/operateProperty';
 import CreateOperate from './components/createOperate';
 import { deepAssign } from '@/utils/index';
diff --git a/src/views/newMap/newMapdraft/mapoperate/power.vue b/src/views/newMap/newMapdraft/mapoperate/power.vue
index 94b2f2e69..9e224c59f 100644
--- a/src/views/newMap/newMapdraft/mapoperate/power.vue
+++ b/src/views/newMap/newMapdraft/mapoperate/power.vue
@@ -1,5 +1,5 @@
 <template>
-  <el-tabs v-model="activeName" class="card">
+  <el-tabs v-model="activeName" class="card" @tab-click="tabClick">
     <el-tab-pane class="view-control" :label="$t('map.property')" name="first" :lazy="lazy">
       <operate-property
         ref="dataform"
@@ -19,6 +19,12 @@
         @create="create"
       />
     </el-tab-pane>
+    <el-tab-pane class="view-control" :label="$t('map.batchSettings')" name="third" :lazy="lazy">
+      <div style="width: 100%;text-align: center;">
+        <div style="margin-bottom: 10px;font-size: 12px;">根据左右端点区段重置供电线坐标</div>
+        <el-button type="primary" @click="batchSetPosition">批量设置</el-button>
+      </div>
+    </el-tab-pane>
   </el-tabs>
 </template>
 
@@ -49,6 +55,8 @@ export default {
         return {
             activeName: 'first',
             lazy: true,
+            field: '',
+            listIndex: '',
             terminalList: [
                 { label: '显示', value: true},
                 { label: '隐藏', value: false }
@@ -59,7 +67,15 @@ export default {
                 leftTerminal: true, // 左端点显示
                 rightTerminal: true,
                 showConditions: '01', // 显示条件
-                points: []
+                points: [],
+                leftSectionCode: '',
+                leftOffset: 0,
+                rightSectionCode: '',
+                rightOffset: 0,
+                sectionUnitList: [{
+                    leftCode: '',
+                    rightCode: ''
+                }]
             },
             addModel: {
                 width: 1,
@@ -67,7 +83,12 @@ export default {
                 points: [
                     { x: 0, y: 0 },
                     { x: 100, y: 100 }
-                ]
+                ],
+                leftSectionCode: '',
+                leftOffset: 0,
+                rightSectionCode: '',
+                rightOffset: 0,
+                sectionUnitList: []
             },
             rules: {
                 code: [
@@ -81,7 +102,8 @@ export default {
     },
     computed: {
         ...mapGetters('map', [
-            'powerLineList'
+            'powerLineList',
+            'sectionList'
         ]),
         showConditionsList() {
             const showConditionsList = ConstConfig.ConstSelect.showConditionsList;
@@ -89,6 +111,18 @@ export default {
                 ? showConditionsList.map(elem => { return { value: elem.value, label: elem.enlabel }; })
                 : showConditionsList.map(elem => { return { value: elem.value, label: elem.label }; });
         },
+        isButtonTypeLeft() {
+            return this.field == 'leftSectionCode';
+        },
+        isButtonTypeRight() {
+            return this.field == 'rightSectionCode';
+        },
+        isButtonTypeUnit() {
+            return this.field == 'sectionUnit';
+        },
+        listIndexProp() {
+            return this.listIndex;
+        },
         form() {
             const form = {
                 labelWidth: '120px',
@@ -105,7 +139,12 @@ export default {
                             { prop: 'showConditions', label: this.$t('map.showConditions'), type: 'radio', optionLabel: 'label', optionValue:'value', radioList: this.showConditionsList},
                             { prop: 'leftTerminal', label: '左侧端点:', type: 'select', optionLabel: 'label', optionValue:'value', options: this.terminalList},
                             { prop: 'rightTerminal', label: '右侧端点:', type: 'select', optionLabel: 'label', optionValue:'value', options: this.terminalList},
-                            { prop: 'points', label: this.$t('map.segmentCoordinates'), type: 'points', width: '100px', isHidden: !this.isPointsShow, addPoint: this.addPoint, delPoint: this.delPoint }
+                            { prop: 'points', label: this.$t('map.segmentCoordinates'), type: 'points', width: '100px', isHidden: !this.isPointsShow, addPoint: this.addPoint, delPoint: this.delPoint },
+                            { prop: 'leftSectionCode', label: '左端点区段', type: 'selectHover', optionLabel: 'name', optionValue: 'code', options: this.sectionList, hover: this.hover, buttonType: 'leftSectionCode', buttonShowType: this.isButtonTypeLeft},
+                            { prop: 'leftOffset', label: '左端点区段偏移', type: 'number', min: 0},
+                            { prop: 'rightSectionCode', label: '右端点区段', type: 'selectHover', optionLabel: 'name', optionValue: 'code', options: this.sectionList, hover: this.hover, buttonType: 'rightSectionCode', buttonShowType: this.isButtonTypeRight},
+                            { prop: 'rightOffset', label: '右端点区段偏移', type: 'number', min: 0},
+                            { prop: 'sectionUnitList', label: '额外的区段单元', type: 'sectionUnit', options: this.sectionList, addSectionUnit: this.addSectionUnit, delSectionUnit: this.delSectionUnit, hover:this.hover, buttonType: 'sectionUnit', buttonShowType: this.isButtonTypeUnit, listIndex: this.listIndexProp }
                         ]
                     },
                     map: {
@@ -129,7 +168,11 @@ export default {
                         item: [
                             { prop: 'width', label: this.$t('map.lineWidth'), type: 'number', min:1, placeholder: 'px'},
                             { prop: 'showConditions', label: this.$t('map.showConditions'), type: 'radio', optionLabel: 'label', optionValue:'value', radioList: this.showConditionsList},
-                            { prop: 'points', label: this.$t('map.linePoint'), type: 'points', width: '100px', hiddenSpan:true, addPoint: this.addPointAddModel, delPoint: this.delPointAddModel }
+                            { prop: 'points', label: this.$t('map.linePoint'), type: 'points', width: '100px', hiddenSpan:true, addPoint: this.addPointAddModel, delPoint: this.delPointAddModel },
+                            { prop: 'leftSectionCode', label: '左端点区段', type: 'selectHover', optionLabel: 'code', optionValue: 'code', options: this.sectionList, hover: this.hover, buttonType: 'leftSectionCode', buttonShowType: this.isButtonTypeLeft},
+                            { prop: 'leftOffset', label: '左端点区段偏移', type: 'number', min: 0},
+                            { prop: 'rightSectionCode', label: '右端点区段', type: 'selectHover', optionLabel: 'name', optionValue: 'code', options: this.sectionList, hover: this.hover, buttonType: 'rightSectionCode', buttonShowType: this.isButtonTypeRight},
+                            { prop: 'rightOffset', label: '右端区段偏移', type: 'number', min: 0}
                         ]
                     }
                 }
@@ -141,6 +184,50 @@ export default {
     mounted() {
     },
     methods: {
+        hover(field, listIndex) {
+            if (this.listIndex != listIndex && this.field == field) {
+                this.field = field;
+            } else {
+                this.field = field == this.field ? '' : field;
+            }
+            this.listIndex = listIndex == this.listIndex ? '' : listIndex;
+            if (this.field) {
+                this.$emit('deviceSelect', 'Power');
+            } else {
+                this.$emit('deviceSelect', '');
+            }
+        },
+        addSectionUnit(i) {
+            this.editModel.sectionUnitList.splice(i + 1, 0, {leftCode: '', rightCode: ''});
+        },
+        delSectionUnit(i) {
+            this.editModel.sectionUnitList.splice(i, 1);
+        },
+        batchSetPosition() {
+            const models = [];
+            this.powerLineList.forEach(item => {
+                if (item.leftSectionCode && item.leftTerminal) {
+                    const section = this.$store.getters['map/getDeviceByCode'](item.leftSectionCode);
+                    item.points[0].x = section.points[0].x + 10;
+                } else if (item.leftSectionCode && !item.leftTerminal) {
+                    const section = this.$store.getters['map/getDeviceByCode'](item.leftSectionCode);
+                    item.points[0].x = section.points[0].x;
+                }
+                if (item.rightSectionCode) {
+                    const section = this.$store.getters['map/getDeviceByCode'](item.rightSectionCode);
+                    item.points[item.points.length - 1].x = section.points[section.points.length - 1].x;
+                }
+                if (item.rightSectionCode || item.leftSectionCode) {
+                    models.push(item);
+                }
+            });
+            this.$emit('updateMapModel', models);
+        },
+        tabClick() {
+            this.field = '';
+            this.listIndex = '';
+            this.$emit('deviceSelect', '');
+        },
         deviceChange(code) {
             this.$emit('setCenter', code);
             this.deviceSelect(this.$store.getters['map/getDeviceByCode'](code));
@@ -150,7 +237,32 @@ export default {
                 this.$refs.form && this.$refs.form.resetFields();
                 this.$refs.make && this.$refs.make.resetFields();
                 this.activeName = 'first';
+                this.initEditModel();
                 this.editModel = deepAssign(this.editModel, selected);
+                if (!this.editModel.sectionUnitList) {
+                    this.editModel.sectionUnitList = [{leftCode: '', rightCode: ''}];
+                }
+            } else if (selected && selected._type.toUpperCase() === 'Section'.toUpperCase() && this.field === 'leftSectionCode' && this.activeName === 'first') {
+                this.editModel.leftSectionCode = selected.code;
+            } else if (selected && selected._type.toUpperCase() === 'Section'.toUpperCase() && this.field === 'leftSectionCode' && this.activeName === 'second') {
+                this.addModel.leftSectionCode = selected.code;
+            } else if (selected && selected._type.toUpperCase() === 'Section'.toUpperCase() && this.field === 'rightSectionCode' && this.activeName === 'first') {
+                if (selected.lengthFact) {
+                    this.editModel.rightOffset = selected.lengthFact;
+                }
+                this.editModel.rightSectionCode = selected.code;
+            } else if (selected && selected._type.toUpperCase() === 'Section'.toUpperCase() && this.field === 'rightSectionCode' && this.activeName === 'second') {
+                if (selected.lengthFact) {
+                    this.addModel.rightOffset = selected.lengthFact;
+                }
+                this.addModel.rightSectionCode = selected.code;
+            } else if (selected && selected._type.toUpperCase() === 'Section'.toUpperCase() && this.field === 'sectionUnit') {
+                const index = this.listIndex[this.listIndex.length - 1];
+                if (this.listIndex.startsWith('leftCode')) {
+                    this.editModel.sectionUnitList[index].leftCode = selected.code;
+                } else if (this.listIndex.startsWith('rightCode')) {
+                    this.editModel.sectionUnitList[index].rightCode = selected.code;
+                }
             }
         },
         addPoint(index) {
@@ -177,6 +289,10 @@ export default {
                     leftTerminal: true,
                     rightTerminal: true,
                     showConditions: this.addModel.showConditions,
+                    leftSectionCode: this.addModel.leftSectionCode,
+                    leftOffset: this.addModel.leftOffset,
+                    rightSectionCode: this.addModel.rightSectionCode,
+                    rightOffset: this.addModel.rightOffset,
                     points: JSON.parse(pointArr)
                 };
                 this.$emit('updateMapModel', model);
@@ -187,7 +303,29 @@ export default {
             }
         },
         updateMapModel(data) {
-            this.$emit('updateMapModel', data);
+            const list = [];
+            let msg = '';
+            if (data.sectionUnitList && data.sectionUnitList.length) {
+                data.sectionUnitList.forEach(item => {
+                    if (item.leftCode && item.rightCode) {
+                        list.push(item);
+                    } else if (item.leftCode && !item.rightCode) {
+                        msg = '完善或清除填写过的额外单元信息';
+                    } else if (!item.leftCode && item.rightCode) {
+                        msg = '完善或清除填写过的额外单元信息';
+                    }
+                });
+            }
+            if (msg) {
+                this.$message.error(msg);
+            } else {
+                if (list.length) {
+                    data.sectionUnitList = list;
+                } else {
+                    delete data.sectionUnitList;
+                }
+                this.$emit('updateMapModel', data);
+            }
         },
         deleteObj() {
             this.$refs.dataform.deleteObj();
@@ -195,6 +333,24 @@ export default {
         // 修改对象
         edit() {
             this.$refs.dataform.edit();
+        },
+        initEditModel() {
+            this.editModel = {
+                code: '',
+                width: 1,
+                leftTerminal: true, // 左端点显示
+                rightTerminal: true,
+                showConditions: '01', // 显示条件
+                points: [],
+                leftSectionCode: '',
+                leftOffset: 0,
+                rightSectionCode: '',
+                rightOffset: 0,
+                sectionUnitList: [{
+                    leftCode: '',
+                    rightCode: ''
+                }]
+            };
         }
     }
 };
diff --git a/src/views/oldMap/display/demon/addQuest.vue b/src/views/oldMap/display/demon/addQuest.vue
deleted file mode 100644
index b34ec5851..000000000
--- a/src/views/oldMap/display/demon/addQuest.vue
+++ /dev/null
@@ -1,209 +0,0 @@
-<template>
-  <div>
-    <el-dialog
-      v-dialogDrag
-      :title="$t('display.script.scriptList')"
-      :visible.sync="show"
-      top="50px"
-      width="70%"
-      :before-do-close="doClose"
-      :close-on-click-modal="false"
-      :z-index="2000"
-    >
-      <QueryListPage
-        ref="queryListPage"
-        :pager-config="pagerConfig"
-        :query-form="queryForm"
-        :query-list="queryList"
-      />
-    </el-dialog>
-    <el-dialog
-      v-dialogDrag
-      :title="$t('display.script.roleSelect')"
-      :visible.sync="roleShow"
-      top="50px"
-      width="350px"
-      :before-do-close="roleDoClose"
-      :close-on-click-modal="false"
-      :z-index="5000"
-    >
-      <div>
-        <el-form ref="ruleForm" :model="form" label-width="50px">
-          <el-form-item :label="$t('display.script.role')" prop="role">
-            <el-select v-model="form.role" :placeholder="$t('display.script.pleaseSelect')">
-              <el-option
-                v-for="item in memberList"
-                :key="item.id"
-                :label="(roleConfig[item.role]?roleConfig[item.role]: '')+(item.name?item.name: '')"
-                :value="item.id"
-                :disabled="checkDisabled(item.role)"
-              />
-            </el-select>
-          </el-form-item>
-        </el-form>
-      </div>
-      <span slot="footer" class="dialog-footer">
-        <el-button @click="roleDoClose">{{ $t('global.cancel') }}</el-button>
-        <el-button type="primary" @click="confirm">{{ $t('global.confirm') }}</el-button>
-      </span>
-    </el-dialog>
-  </div>
-</template>
-
-<script>
-import { getScriptPageListOnline, getScriptById, getDraftScriptByGroup } from '@/api/script';
-
-// 剧本弹窗
-export default {
-    name: 'AddQuest',
-    props: {
-        trainings: {
-            type: Array,
-            default() {
-                return [];
-            }
-        },
-        detail: {
-            type: Object,
-            default() {
-                return null;
-            }
-        }
-    },
-    data() {
-        return {
-            show: false,
-            roleShow: false,
-            pagerConfig: {
-                pageSize: 'pageSize',
-                pageIndex: 'pageNum'
-            },
-            row: {},
-            form: {
-                role: ''
-            },
-            memberList: [],
-            mapLocation:null,
-            queryForm: {
-                labelWidth: '80px',
-                reset: false,
-                show: false,
-                queryObject: {
-
-                }
-            },
-            queryList: {
-                query: this.listQuest,
-                selectCheckShow: false,
-                indexShow: true,
-                columns: [
-                    {
-                        title: this.$t('display.script.scriptName'),
-                        prop: 'name'
-                    },
-                    {
-                        title: this.$t('display.script.createTime'),
-                        prop: 'createTime'
-                    },
-                    {
-                        type: 'button',
-                        title: this.$t('display.script.operate'),
-                        width: '250',
-                        buttons: [
-                            {
-                                name: this.$t('display.script.loadScript'),
-                                type: 'primary',
-                                handleClick: this.handleLoad
-                            }
-                        ]
-                    }
-                ],
-                actions: [
-                ]
-            },
-
-            currentModel: {},
-            roleConfig: {
-                'Admin': this.$t('display.script.admin'),
-                'Instructor': this.$t('display.script.instructor'),
-                'Dispatcher': this.$t('display.script.dispatcher'),
-                'Attendant': this.$t('display.script.attendant'),
-                'Audience': this.$t('display.script.audience'),
-                'Driver': this.$t('display.script.driver'),
-                'Repair':this.$t('display.script.repair'),
-                'no': ''
-            }
-        };
-    },
-    created() {
-        this.loadInitData();
-    },
-    methods: {
-        doShow() {
-            this.show = true;
-            this.reloadTable();
-        },
-        doClose() {
-            this.show = false;
-        },
-        listQuest(params) {
-            params['mapId'] = this.$route.query.mapId;
-            return getScriptPageListOnline(params);
-        },
-        async loadInitData() {
-
-        },
-        async handleLoad(index, row) {
-            this.row = row;
-            const res = this.$route.fullPath.includes('design/display/demon') ? await getDraftScriptByGroup(row.group) : await getScriptById(row.id);
-            let newMemberList = [];
-            if (res.code == 200) {
-                if (res.data.playerVOList && res.data.playerVOList.length > 0) {
-                    newMemberList = res.data.playerVOList.filter(item => item.hasPlay === true);
-                }
-                if (res.data.mapLocation) {
-                    this.mapLocation = res.data.mapLocation;
-                }
-                this.memberList = newMemberList || [];
-                this.memberList.unshift({ id: '', name: this.$t('display.script.none'), role: 'no' });
-            }
-            this.roleShow = true;
-        },
-
-        reloadTable() {
-            if (this.queryList && this.queryList.reload) {
-                this.queryList.reload();
-            }
-        },
-
-        confirm() {
-            const roleName = this.memberList.find(elem=>{ return elem.id == this.form.role; });
-            this.$emit('selectQuest', this.row, this.form.role, this.mapLocation, roleName.role);
-            this.doClose();
-            this.roleDoClose();
-
-        },
-
-        roleDoClose() {
-            this.$refs['ruleForm'].resetFields();
-            this.roleShow = false;
-        },
-
-        checkDisabled(role) {
-            if (!this.$route.fullPath.includes('design/display/demon')) {
-                if (this.$route.query.prdType == '01') {
-                    return role !== 'Attendant' && role !== 'no';
-                } else if (this.$route.query.prdType == '02') {
-                    return role !== 'Dispatcher' && role !== 'no';
-                } else if (this.$route.query.prdType == '04') {
-                    return role !== 'Driver' && role !== 'no';
-                }
-            }
-        },
-
-        handleName(item) {
-            return this.roleConfig[item.role] ? this.roleConfig[item.role] : '' + (item.name ? item.name : '');
-        }
-    }
-};
-</script>
diff --git a/src/views/oldMap/display/demon/faultChoose.vue b/src/views/oldMap/display/demon/faultChoose.vue
deleted file mode 100644
index c390ef2ba..000000000
--- a/src/views/oldMap/display/demon/faultChoose.vue
+++ /dev/null
@@ -1,161 +0,0 @@
-<template>
-  <el-dialog v-dialogDrag :title="title" :visible.sync="dialogShow" width="800px" :before-close="doClose" :modal="false">
-    <div class="draft">
-      <el-radio-group v-model="auto">
-        <el-radio :label="false" border>{{ $t('display.faultChoose.manual') }}</el-radio>
-        <el-radio :label="true" border>{{ $t('display.faultChoose.automatic') }}</el-radio>
-      </el-radio-group>
-    </div>
-    <div v-if="auto" class="card">
-      <QueryListPage ref="pageRules" :pager-config="pagerConfig" :query-form="queryForm" :query-list="queryList" />
-    </div>
-    <span slot="footer" class="dialog-footer">
-      <el-button @click="dialogShow = false">{{ $t('global.cancel') }}</el-button>
-      <el-button type="primary" :loading="loading" @click="handleConfirm">{{ $t('global.confirm') }}</el-button>
-    </span>
-  </el-dialog>
-</template>
-
-<script>
-import { getFailureGenerateRules, setFailureMode } from '@/api/simulation';
-import { FaultStatusEnum } from '@/scripts/FaultDic';
-import ModelType from '@/jmap/constant/deviceType';
-
-// 故障列表
-export default {
-    name: 'FaultChoose',
-    props: {
-        group: {
-            type: String,
-            required: true
-        }
-    },
-    data() {
-        return {
-            dialogShow: false,
-            loading: false,
-            deviceMap: {},
-            auto: false,
-            pagerConfig: {
-                pageSize: 'pageSize',
-                pageIndex: 'pageNum'
-            },
-            queryForm: {
-                reset: true,
-                labelWidth: '80px',
-                queryObject: {
-                    condition: {
-                        type: 'text',
-                        label: this.$t('display.faultChoose.settingCondition')
-                    }
-                }
-            },
-            queryList: {
-                query: null,
-                selectCheckShow: false,
-                radioShow: true,
-                columns: [
-                    {
-                        title: this.$t('display.faultChoose.settingCondition'),
-                        prop: 'condition'
-                    },
-                    {
-                        title: this.$t('display.faultChoose.triggerTarget'),
-                        prop: 'target'
-                    }
-                ]
-            }
-        };
-    },
-    computed: {
-        title() {
-            return this.$t('display.faultChoose.selectFault');
-        },
-        lineCode() {
-            return this.$route.query.lineCode;
-        }
-    },
-    mounted() {
-        this.$Dictionary.physicalViewType().then(list => {
-            this.deviceMap = [];
-            list.forEach(elem => {
-                this.deviceMap[elem.code] = elem.name;
-            });
-        });
-    },
-    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: {
-                    name += device.name;
-                    break;
-                }
-                }
-                if (device.stationCode) {
-                    const station = this.$store.getters['map/getDeviceByCode'](device.stationCode);
-                    if (station) {
-                        name += '【' + station.name + '】';
-                    }
-                }
-            }
-
-            return name;
-        },
-        doShow() {
-            this.dialogShow = true;
-            this.queryList.data = [];
-            getFailureGenerateRules({ skin: this.lineCode, group: this.group }).then(response => {
-                const data = response.data;
-                data.forEach(elem => {
-                    this.queryList.data.push({
-                        id: elem.id,
-                        condition: `${this.deviceMap[elem.condition.triggerDeviceType]}${this.formatNameByCode(elem.condition.triggerDeviceCode)} 状态：${FaultStatusEnum[elem.condition.triggerDeviceType][elem.condition.triggerDeviceStatus]}`,
-                        target: `${this.deviceMap[elem.targetDeviceType]}${this.formatNameByCode(elem.targetDeviceCode)}`
-                    });
-                });
-            });
-        },
-        doClose() {
-            this.dialogShow = false;
-        },
-        getFailureModel(auto) {
-            const model = { auto };
-            if (auto) {
-                const choose = this.$refs.pageRules.currentChoose();
-                if (choose) {
-                    choose.id ? Object.assign(model, { ruleId: choose.id }) : this.$messageBox(this.$t('display.faultChoose.selectRules'));
-                }
-            }
-
-            return model;
-        },
-        handleConfirm() {
-            this.$nextTick(() => {
-                const faultModel = this.getFailureModel(this.auto);
-                setFailureMode(faultModel, this.group).then(() => {
-                    this.$message.success(this.$t('display.faultChoose.setFaultSuccess'));
-                }).catch(() => {
-                    this.$messageBox(this.$t('display.faultChoose.setFaultFail'));
-                });
-
-                this.doClose();
-            });
-        },
-        reloadTable() {
-            this.queryList.reload();
-        }
-    }
-};
-</script>
-<style scoped rel="stylesheet/scss" lang="scss">
-    .draft {
-        text-align: center;
-        margin-bottom: 10px;
-    }
-</style>
diff --git a/src/views/oldMap/display/demon/runPlanLoad.vue b/src/views/oldMap/display/demon/runPlanLoad.vue
deleted file mode 100644
index 04d83a840..000000000
--- a/src/views/oldMap/display/demon/runPlanLoad.vue
+++ /dev/null
@@ -1,66 +0,0 @@
-<template>
-  <div v-show="show" class="run-plan-dialog">
-    <component :is="menus" ref="schedule" :group="group" @back="doClose" />
-  </div>
-</template>
-
-<script>
-
-// 运行图加载
-export default {
-    name: 'RunPlanLoad',
-    props: {
-        group: {
-            type: String,
-            required: true
-        }
-    },
-    data() {
-        return {
-            menus: null,
-            show: false
-        };
-    },
-    computed: {
-        title() {
-            return this.$t('display.runPlan.runDiagramPlanTool');
-        }
-    },
-    watch: {
-        '$route.query.lineCode': function (code) {
-            if (code) {
-                this.menus = this.$theme.loadPlanComponent(code);
-            }
-        }
-    },
-    mounted() {
-        this.menus = this.$theme.loadPlanComponent(this.$route.query.lineCode);
-    },
-    methods: {
-        doShow() {
-            this.show = true;
-            this.$refs.schedule.setPosition();
-        },
-        doClose() {
-            this.show = false;
-        }
-    }
-};
-</script>
-<style rel="stylesheet/scss" lang="scss" scoped>
-    @import "src/styles/mixin.scss";
-
-    .run-plan-dialog {
-        -webkit-user-select: none;
-        -moz-user-select: none;
-        -ms-user-select: none;
-        user-select: none;
-        position: absolute;
-        z-index: 10;
-        top: 0px;
-        left: 0px;
-        width: 100%;
-        height: 100%;
-        background: white;
-    }
-</style>
diff --git a/src/views/oldMap/display/demon/runPlanView.vue b/src/views/oldMap/display/demon/runPlanView.vue
deleted file mode 100644
index 9d111eaed..000000000
--- a/src/views/oldMap/display/demon/runPlanView.vue
+++ /dev/null
@@ -1,362 +0,0 @@
-<template>
-  <el-dialog
-    v-dialogDrag
-    v-dialogLoading="dialogLoading"
-    :title="title"
-    :visible.sync="dialogShow"
-    width="100%"
-    :before-close="doClose"
-    :close-on-click-modal="false"
-    :modal="false"
-    fullscreen
-  >
-    <div :id="runPlanId" v-loading="loading" />
-  </el-dialog>
-</template>
-
-<script>
-import { mapGetters } from 'vuex';
-import { runDiagramGetTime } from '@/api/simulation';
-import { getPublishMapInfo } from '@/api/jmap/map';
-import { timeFormat } from '@/utils/date';
-import echarts from 'echarts';
-
-// 运行图预览
-export default {
-    name: 'RunPlanView',
-    props: {
-        group: {
-            type: String,
-            required: true
-        }
-    },
-    data() {
-        return {
-            dialogShow: false,
-            loading: true,
-            runPlanId: 'run-plan-view',
-            myChart: null,
-            PlanConvert: {},
-            series: [],
-            option: {
-                title: {
-                    text: '',
-                    left: 'center'
-                },
-                grid: {
-                    top: '30px',
-                    left: '120px',
-                    right: '40px',
-                    bottom: '80px',
-                    containLabel: true,
-                    backgroundColor: 'floralwhite'
-                },
-                toolbox: {
-                    // right: '20px',
-                    // feature: {
-                    //     dataZoom: {
-                    //         yAxisIndex: 'none'
-                    //     },
-                    //     restore: {},
-                    //     saveAsImage: {}
-                    // }
-                },
-                tooltip: {
-                    axisPointer: {
-                        trigger: 'item',
-                        type: 'cross'
-                    },
-                    formatter: this.axisTooltip,
-                    borderWidth: 1
-                },
-                xAxis: [
-                    {
-                        type: 'category',
-                        boundaryGap: false,
-                        data: [],
-                        axisLine: {
-                            onZero: false,
-                            lineStyle: {
-                                width: 2,
-                                color: '#d14a61'
-                            }
-                        },
-                        axisLabel: {
-                            formatter: this.xAxisLableFormat,
-                            textStyle: {
-                                color: '#333'
-                            }
-                        },
-                        axisPointer: {
-                            snap: true,
-                            label: {
-                                formatter: this.xAxisPointFormat,
-                                backgroundColor: 'rgb(255,0,0,0.5)',
-                                color: 'white'
-                            }
-                        }
-                    }
-                ],
-                yAxis: {
-                    type: 'value',
-                    splitLine: {
-                        show: false
-                    },
-                    axisTick: {
-                        show: false
-                    },
-                    axisLine: {
-                        onZero: false,
-                        lineStyle: {
-                            width: 2,
-                            color: '#d14a61'
-                        }
-                    },
-                    axisLabel: {
-                        interval: 'auto',
-                        formatter: this.yAxisLableFormat
-                    },
-                    axisPointer: {
-                        xAxisIndex: 'all',
-                        label: {
-                            formatter: this.yAxisPointFormat,
-                            backgroundColor: 'rgb(0,100,0,0.5)',
-                            color: 'white'
-                        }
-                    },
-                    min: 0,
-                    max: 0
-                },
-                // graphic: {
-                // 	type: 'line',
-                // 	progressive: true
-                // },
-                series: [],
-                dataZoom: [
-                    {
-                        type: 'inside'
-                    },
-                    {
-                        fiterMode: 'filter',
-                        handleIcon: 'M10.7,11.9v-1.3H9.3v1.3c-4.9,0.3-8.8,4.4-8.8,9.4c0,5,3.9,9.1,8.8,9.4v1.3h1.3v-1.3c4.9-0.3,8.8-4.4,8.8-9.4C19.5,16.3,15.6,12.2,10.7,11.9z M13.3,24.4H6.7V23h6.6V24.4z M13.3,19.6H6.7v-1.4h6.6V19.6z',
-                        handleSize: '80%',
-                        handleStyle: {
-                            color: '#fff',
-                            shadowBlur: 3,
-                            shadowColor: 'rgba(0, 0, 0, 0.6)',
-                            shadowOffsetX: 2,
-                            shadowOffsetY: 2
-                        },
-                        bottom: '25px'
-                    }
-                ]
-            },
-            absoluteTime: 2 * 3600,
-            indexKmRangeMap: {},
-            runPlanData: {},
-            dialogLoading: false
-        };
-    },
-    computed: {
-        ...mapGetters('runPlan', [
-            'stations'
-        ]),
-        title() {
-            return this.$t('display.runPlan.previewRunDiagram');
-        }
-    },
-    watch: {
-        '$store.state.runPlan.planLoadedCount': async function () {
-            try {
-                await this.loadChartPage();
-                if (this.dialogShow) {
-                    await this.loadInitData(this.series);
-                }
-            } catch (e) {
-                console.error(e);
-            } finally {
-                this.loading = false;
-            }
-        },
-        '$store.state.runPlan.planUpdateCount': function () {
-            this.updateRunPlanData(this.$store.state.runPlan.updateData);
-        },
-        '$store.state.app.windowSizeCount': function() {
-            this.reSize({ width: this.$store.state.app.width, height: this.$store.state.app.height - 55 });
-        }
-    },
-    mounted() {
-        getPublishMapInfo(this.$route.query.mapId).then(res=>{
-            this.PlanConvert = this.$theme.loadPlanConvert(res.data.lineCode);
-            this.loadChartPage();
-        });
-    },
-    beforeDestroy() {
-        if (this.myChart && this.myChart.isDisposed) {
-            this.myChart.dispose();
-            this.myChart = null;
-        }
-    },
-    methods: {
-        async  doShow() {
-            try {
-                this.dialogLoading = true;
-                this.dialogShow = true;
-                this.loadInitData(this.series);
-            } catch (e) {
-                console.error(e);
-            } finally {
-                this.dialogLoading = false;
-            }
-        },
-        async doClose() {
-            this.dialogShow = false;
-        },
-        async loadChartPage() {
-            const stations = this.$store.state.runPlan.stations;
-            const planData = this.$store.state.runPlan.planData;
-            this.series = [];
-            this.kmRangeCoordMap = this.PlanConvert.convertStationsToMap(stations);
-            this.pushModels(this.series, [this.PlanConvert.initializeYaxis(stations)]);
-            this.pushModels(this.series, this.PlanConvert.convertDataToModels(planData, stations, this.kmRangeCoordMap, { width: 1, color: '#000' }));
-        },
-        async loadInitData(series) {
-            this.myChart && this.myChart.showLoading();
-            await this.xAxisInit();
-            await this.yAxisInit();
-            await this.loadInitChart(series);
-            this.myChart && this.myChart.hideLoading();
-        },
-        loadInitChart(series) {
-            return new Promise((resolve, reject) => {
-                try {
-                    if (this.myChart && this.myChart.isDisposed) {
-                        this.myChart.clear();
-                    }
-
-                    let startValue = 3600 + this.PlanConvert.TranslationTime;
-                    const offsetTime = 3600;
-                    runDiagramGetTime(this.group).then(resp => {
-                        startValue = resp.data - this.PlanConvert.TranslationTime;
-                        this.option.dataZoom[0].startValue = this.option.dataZoom[1].startValue = startValue - offsetTime;
-                        this.option.dataZoom[0].endValue = this.option.dataZoom[1].endValue = startValue + offsetTime;
-                        this.option.series = series;
-                        this.myChart = echarts.init(document.getElementById(this.runPlanId));
-                        if (this.myChart) {
-                            this.myChart.setOption(this.option);
-                            this.reSize({ width: document.documentElement.clientWidth, height: document.documentElement.clientHeight - 55 });
-                        }
-                    });
-                    resolve(true);
-                } catch (error) {
-                    reject(error);
-                }
-            });
-
-        },
-        updateRunPlanData(data) {
-            const stations = this.$store.state.runPlan.stations;
-            const planData = this.$store.state.runPlan.planData;
-            this.series = this.PlanConvert.updateDataToModels(data, stations, this.kmRangeCoordMap,
-                planData, this.series, { color: '#FF00DE', width: 0.5 }
-            );
-            this.myChart && this.myChart.setOption({ series: this.series });
-        },
-        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;
-        },
-        xAxisPointFormat(params) {
-            return timeFormat(params.value);
-        },
-        yAxisPointFormat(params) {
-            return this.PlanConvert.computedFormatYAxis(this.stations, params);
-        },
-        xAxisLableFormat(value, index) {
-            if (value % 60 === 0) {
-                return timeFormat(value);
-            }
-        },
-        yAxisLableFormat(value, index) {
-            return '';
-        },
-        xAxisInit() {
-            const list = [];
-            for (var time = this.PlanConvert.TranslationTime; time < 3600 * 24 + this.PlanConvert.TranslationTime; time++) {
-                list.push(time);
-            }
-            this.option.xAxis[0].data = list;
-        },
-        yAxisInit() {
-            if (Object.keys(this.PlanConvert).length) {
-                this.option.yAxis.min = this.PlanConvert.computedYaxisMinValue(this.stations);
-                this.option.yAxis.max = this.PlanConvert.computedYaxisMaxValue(this.stations);
-            }
-        },
-        axisTooltip(param) {
-            const station = this.stations[Math.floor((param.data[1] - this.PlanConvert.EdgeHeight) / this.PlanConvert.CoordMultiple)] || { name: '', kmRange: '' };
-            return [
-                `Point Data <hr size=1 style="margin: 3px 0">`,
-                `${this.$t('display.runPlan.stationName')}: ${station.name}<br>`,
-                `${this.$t('display.runPlan.stationMark')}: ${station.kmRange} km <br>`,
-                `${this.$t('display.runPlan.arrivalTime')}: ${timeFormat(param.data[0] + this.PlanConvert.TranslationTime)} (${param.data[0]})<br>`
-            ].join('');
-        },
-        settingExac(data) {
-            this.absoluteTime = Math.abs(parseInt(data.endValue) - parseInt(data.startValue)) / 1000;
-            this.myChart && this.myChart.setOption({
-                xAxis: this.option.xAxis,
-                yAxis: this.option.yAxis
-            });
-
-            this.myChart && this.myChart.dispatchAction({
-                type: 'dataZoom',
-                dataZoomIndex: [0, 1],
-                startValue: parseInt(data.startValue / 1000),
-                endValue: parseInt(data.endValue / 1000)
-            });
-        },
-        run(start) {
-            this.myChart && this.myChart.dispatchAction({
-                type: 'dataZoom',
-                dataZoomIndex: [0, 1],
-                startValue: parseInt(start - this.absoluteTime / 2),
-                endValue: parseInt(start + this.absoluteTime / 2)
-            });
-            this.loadInitData(this.series);
-        },
-        reSize(opt) {
-            if (this.myChart) {
-                this.myChart.resize({ width: opt.width, height: opt.height, silent: false });
-            }
-        }
-    }
-};
-</script>
-<style scoped rel="stylesheet/scss" lang="scss">
-    /deep/ {
-        .el-dialog__body {
-            padding: 0px !important;
-            background-color: floralwhite !important;
-        }
-    }
-</style>
diff --git a/src/views/oldMap/display/demon/scheduling.vue b/src/views/oldMap/display/demon/scheduling.vue
deleted file mode 100644
index 8f27d6ffb..000000000
--- a/src/views/oldMap/display/demon/scheduling.vue
+++ /dev/null
@@ -1,371 +0,0 @@
-<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"
-                    @change="handleQuery"
-                  />
-                </el-form-item>
-              </el-col>
-              <el-col :span="6">
-                <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-form-item>
-              </el-col>
-              <el-col :span="6">
-                <el-form-item :label="$t('display.schedule.scheduleMode')">
-                  <div>{{ formModel.mode }}</div>
-                </el-form-item>
-              </el-col>
-              <el-col :span="6">
-                <el-form-item style="text-align: right">
-                  <el-button-group>
-                    <el-button size="small" type="warning" @click="handleCheck">{{ $t('display.schedule.check') }}</el-button>
-                    <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 { querySecheduling, generateScheduling, getSchedulingAllTrains, checkScheduling, saveScheduling, generateSchedulingAgain } from '@/api/scheduling';
-import { hexColor } from '@/utils/runPlan';
-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: [],
-            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: 'trainCode',
-                        type: 'select',
-                        width: '150',
-                        options: () => { return this.groupNumberList; },
-                        editable: true,
-                        editing: true
-                    },
-                    {
-                        title: this.$t('display.schedule.onlineSection'),
-                        prop: 'onlineSection',
-                        type: 'text'
-                    },
-                    {
-                        title: this.$t('display.schedule.onlineServerNumber'),
-                        prop: 'onlineServerNumber',
-                        type: 'text'
-                    },
-                    {
-                        title: this.$t('display.schedule.onlineTargetNumber'),
-                        prop: 'onlineTargetNumber',
-                        type: 'text'
-                    },
-                    {
-                        title: this.$t('display.schedule.onlineTime'),
-                        prop: 'onlineTime',
-                        type: 'text'
-                    },
-                    {
-                        title: this.$t('display.schedule.onlineTripNumber'),
-                        prop: 'onlineTripNumber',
-                        type: 'text',
-                        format: (row) => { return `${row.onlineDirectionCode}${row.onlineTripNumber}`; }
-                    },
-                    {
-                        title: this.$t('display.schedule.outDepot'),
-                        prop: 'outDepot',
-                        type: 'text'
-                    },
-                    {
-                        title: this.$t('display.schedule.outDepotStatus'),
-                        prop: 'outStatus',
-                        type: 'tag',
-                        columnValue: (row) => { return this.$ConstSelect.translate(row.outStatus, 'Whether'); },
-                        tagType: (row) => {
-                            switch (row.outStatus) {
-                            case true: return 'success';
-                            case false: return 'danger';
-                            }
-                        }
-                    },
-                    {
-                        title: this.$t('display.schedule.offlineSection'),
-                        prop: 'offlineSection',
-                        type: 'text'
-                    },
-                    {
-                        title: this.$t('display.schedule.offlineServerNumber'),
-                        prop: 'offlineServerNumber',
-                        type: 'text'
-                    },
-                    {
-                        title: this.$t('display.schedule.offlineTargetNumber'),
-                        prop: 'offlineTargetNumber',
-                        type: 'text'
-                    },
-                    {
-                        title: this.$t('display.schedule.offlineTime'),
-                        prop: 'offlineTime',
-                        type: 'text'
-                    },
-                    {
-                        title: this.$t('display.schedule.offlineTripNumber'),
-                        prop: 'offlineTripNumber',
-                        type: 'text',
-                        format: (row) => { return `${row.offlineDirectionCode}${row.offlineTripNumber}`; }
-                    },
-                    {
-                        title: this.$t('display.schedule.inDepot'),
-                        prop: 'inDepot',
-                        type: 'text'
-                    },
-                    {
-                        title: this.$t('display.schedule.inDepotStatus'),
-                        prop: 'inStatus',
-                        type: 'tag',
-                        columnValue: (row) => { return this.$ConstSelect.translate(row.inStatus, 'Whether'); },
-                        tagType: (row) => {
-                            switch (row.inStatus) {
-                            case true: return 'success';
-                            case false: return 'danger';
-                            }
-                        }
-                    }
-                ]
-            },
-            tableData: []
-        };
-    },
-    computed: {
-        title() {
-            return this.$t('display.schedule.schedulePlan');
-        }
-    },
-    created() {
-        this.loadInitData();
-    },
-    methods: {
-        doShow() {
-            this.formModel.day = '';
-            this.show = true;
-        },
-        doClose() {
-            this.show = false;
-        },
-        loadInitData() {
-            this.groupNumberList = [];
-            getSchedulingAllTrains(this.group).then(resp => {
-                this.groupNumberList = resp.data.map(elem => { return {value: elem.code, label: elem.groupNumber}; });
-            });
-        },
-        handleQuery(day) {
-            if (day) {
-                this.loading = true;
-                querySecheduling(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();
-                    if (error.code == 30002) {
-                        this.handleReGenerate(day);
-                    } else {
-                        this.$messageBox(`${error.message}`);
-                        this.loading = false;
-                    }
-                });
-            }
-        },
-        handleGenerate(day) {
-            generateScheduling(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}`);
-            });
-        },
-        handleReGenerate(day) {
-            generateSchedulingAgain(this.group).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.regenerateSchedulePlanSuccess'));
-            }).catch(error => {
-                this.loading = false;
-                this.clearData();
-                this.$messageBox(`${error.message}`);
-            });
-        },
-        handleCheck() {
-            if (this.formModel.planDate) {
-                checkScheduling(this.group, this.tableData).then(resp => {
-                    const data = resp.data;
-                    this.setConflictList(data.conflictList);
-                    if (data.pass) {
-                        this.$message.success(this.$t('display.schedule.checkPassed'));
-                    } else {
-                        this.$message.warning(this.$t('display.schedule.checkFailed'));
-                    }
-                }).catch(error => {
-                    this.$messageBox(`${this.$t('display.schedule.checkSchedulePlanFailed')}: ${error.message}`);
-                });
-            } else {
-                this.$messageBox(this.$t('display.schedule.selectSchedulePlan'));
-            }
-        },
-        handleSave() {
-            if (this.formModel.planDate) {
-                saveScheduling(this.group, this.tableData).then(resp => {
-                    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({rowIndex}) {
-            const row = this.tableData[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 => {
-                elem['$conflict'] = null;
-            });
-
-            return tableData;
-        },
-        clearData() {
-            this.formModel.planDate = '';
-            this.tableData = [];
-        }
-    }
-};
-</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/oldMap/display/demon/setTime.vue b/src/views/oldMap/display/demon/setTime.vue
deleted file mode 100644
index 8c6087412..000000000
--- a/src/views/oldMap/display/demon/setTime.vue
+++ /dev/null
@@ -1,118 +0,0 @@
-<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="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>
-      <el-button type="primary" :loading="status" @click="handleSure">{{ $t('global.confirm') }}</el-button>
-    </span>
-  </el-dialog>
-</template>
-
-<script>
-import { prefixIntrger } from '@/utils/date';
-import { getDesignatedTimeTrainNum } from '@/api/simulation';
-
-// 计划行车时间选择
-export default {
-    data() {
-        return {
-            show: false,
-            formModel: {
-                initTime: new Date(),
-                loadNum: 1
-            },
-            maxNumber: 1,
-            pickerOptions: { selectableRange: '00:00:00 - 23:59:59' },
-            status: false
-        };
-    },
-    computed: {
-        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' }
-
-                ]
-            };
-        }
-    },
-    methods: {
-        doShow() {
-            this.formModel.initTime = new Date(this.$store.state.training.initTime || null);
-            this.handleChange(this.formModel.initTime);
-            this.show = true;
-        },
-        doClose() {
-            this.status = false;
-            this.show = false;
-        },
-        handleChange(initTime) {
-            this.formModel.loadNum = 0;
-            if (this.hasNumber) {
-                getDesignatedTimeTrainNum({ initTime: this.formatTime(initTime) }, this.group).then(resp => {
-                    this.maxNumber = parseInt(resp.data);
-                });
-            }
-        },
-        formatTime(initTime) {
-            const hh = prefixIntrger(initTime.getHours(), 2);
-            const mm = prefixIntrger(initTime.getMinutes(), 2);
-            const ss = prefixIntrger(initTime.getSeconds(), 2);
-            return `${hh}:${mm}:${ss}`;
-        },
-        handleSure() {
-            this.$refs.form.validate((valid) => {
-                if (valid) {
-                    this.status = true;
-                    const model = {
-                        initTime: this.formatTime(this.formModel.initTime)
-                    };
-
-                    if (this.hasNumber) {
-                        model['loadNum'] = this.formModel.loadNum;
-                    }
-
-                    this.$emit('ConfirmSelectBeginTime', model);
-                    this.doClose();
-                }
-            });
-        }
-    }
-};
-</script>
diff --git a/src/views/oldMap/display/designIndex.vue b/src/views/oldMap/display/designIndex.vue
deleted file mode 100644
index 06038c6e2..000000000
--- a/src/views/oldMap/display/designIndex.vue
+++ /dev/null
@@ -1,564 +0,0 @@
-<template>
-  <div class="main" :style="{width: canvasWidth+'px'}" @mousemove="mousemove">
-    <div v-show="panelShow" :panelShow="panelShow">
-      <transition name="el-zoom-in-bottom">
-        <map-system-draft ref="mapCanvas" @back="back" />
-      </transition>
-
-      <!-- <menu-exam v-if="isExam" ref="menuExam" :offset="offset" :group="group" /> -->
-
-      <menu-lesson v-if="isLesson" ref="lessonMenu" :offset="offset" :group="group" :training-obj="trainingObj" />
-
-      <menu-demon
-        v-if="isDemon"
-        ref="menuDemon"
-        :offset="offset"
-        :group="group"
-        :quest-id="questId"
-        @tryTime="tryTime"
-        @hidepanel="hidepanel"
-        @quitQuest="quitQuest"
-        @showScheduling="showScheduling"
-      />
-
-      <menu-screen v-if="isScreen" ref="menuScreen" :offset="offset" :group="group" @tryTime="tryTime" />
-
-      <menu-plan v-if="isPlan" ref="menuPlan" :offset="offset" :group="group" />
-
-      <menu-script v-if="isScript" ref="menuScript" :offset="offset" :group="group" />
-
-      <menu-schema
-        v-if="isDemon || isPlan || isScript "
-        ref="menuSchema"
-        :offset="offset"
-        :group="group"
-        @switchMode="switchMode"
-        @selectQuest="selectQuest"
-      />
-
-      <menu-system-time ref="menuSystemTime" :offset="offset" :right="right" :group="group" />
-    </div>
-
-    <Jl3d-Simulation v-show="simulationShow" ref="Jl3dSimulation" :panel-show="simulationShow" @showpanel="showpanel" />
-    <Jl3d-Drive v-show="drivingShow" ref="Jl3dDrive" :panel-show="drivingShow" @showdriving="showdriving" />
-
-    <fault-choose ref="faultChoose" :group="group" />
-    <run-plan-Load ref="runPlanLoad" :group="group" />
-    <run-plan-view ref="runPlanView" :group="group" />
-    <add-quest ref="addQuest" @selectQuest="selectQuest" />
-    <scheduling v-if="isShowScheduling" ref="scheduling" :group="group" />
-  </div>
-</template>
-
-<script>
-import RunPlanLoad from './demon/runPlanLoad';
-import RunPlanView from './demon/runPlanView';
-import FaultChoose from './demon/faultChoose';
-import MapSystemDraft from '@/views/oldMap/mapsystem/index';
-import MenuLesson from '@/views/oldMap/display/menuLesson';
-import MenuDemon from '@/views/oldMap/display/menuDemon';
-import MenuScreen from '@/views/oldMap/display/menuScreen';
-import MenuSchema from '@/views/oldMap/display/menuSchema';
-import MenuSystemTime from '@/views/oldMap/display/menuSystemTime';
-import MenuPlan from '@/views/oldMap/display/menuPlan';
-import MenuScript from '@/views/oldMap/display/menuScript';
-import AddQuest from './demon/addQuest';
-import Scheduling from './demon/scheduling';
-import { mapGetters } from 'vuex';
-import { setGoodsTryUse } from '@/api/management/goods';
-import { runDiagramQuit, getSimulationInfo } from '@/api/simulation';
-import { OperateMode, TrainingMode } from '@/scripts/ConstDic';
-import { checkLoginLine } from '@/api/login';
-import { loadMapDataById } from '@/utils/loaddata';
-import { EventBus } from '@/scripts/event-bus';
-import Vue from 'vue';
-import {loadDraftScript} from '@/api/designPlatform';
-
-// 三维
-import Jl3dSimulation from '@/views/jlmap3d/simulation/jl3dsimulation';
-import Jl3dDrive from '@/views/jlmap3d/drive/jl3ddrive';
-
-export default {
-    name: 'DisplayDraft',
-    components: {
-        RunPlanLoad,
-        RunPlanView,
-        FaultChoose,
-        AddQuest,
-        MenuLesson,
-        MapSystemDraft,
-        MenuPlan,
-        MenuDemon,
-        MenuScreen,
-        MenuScript,
-        MenuSchema,
-        MenuSystemTime,
-        Jl3dSimulation,
-        Jl3dDrive,
-        Scheduling
-    },
-    props: {
-        size: {
-            type: Object,
-            default() {
-                return null;
-            }
-        }
-    },
-    data() {
-        return {
-            mode: '',
-            trainingObj: {},
-            timeDemonNum: 0,
-            checkLine: null,
-            offset: 15,
-            mouseNum: 1,
-            ierval: null,
-            mouseNumTime: 0,
-            mapBox: null,
-            mapBoxP: null,
-            panelShow: true,
-            simulationShow: false,
-            drivingShow: false,
-            questId: 0, 		// 加载任务的Id
-            group: '',
-            prdTypeMap: {
-                '01': '01', 	// 现地 => 现地
-                '02': '02', 	// 行调 => 行调
-                '04': '02', 	// 司机 => 行调
-                '05': ''		// 派班 => null
-            },
-            isDrive: this.prdType == '04',
-            isShowScheduling: this.prdType == '05'
-        };
-    },
-    computed: {
-        ...mapGetters([
-            'canvasWidth',
-            'canvasHeight'
-        ]),
-        ...mapGetters('map', [
-            'map'
-        ]),
-        ...mapGetters('training', [
-            'offsetStationCode'
-        ]),
-        ...mapGetters('config', [
-            'canvasId'
-        ]),
-        width() {
-            return this.$store.state.app.width;
-        },
-        height() {
-            return this.$store.state.app.height;
-        },
-        right() {
-            return this.$store.state.config.width / 2 - 55;
-        },
-        trainingId() {
-            return this.$route.query.trainingId;
-        },
-        mapId() {
-            return this.$route.query.mapId;
-        },
-        prdType() {
-            // return this.$route.query.prdType;
-            return this.$store.state.training.prdType;
-        },
-        skinCode() {
-            return this.$route.query.skinCode;
-        },
-        isLesson() {
-            return this.mode === 'teach' || this.mode === 'record' || this.mode === 'manage';
-        },
-        isDemon() {
-            return this.mode === 'demon';
-        },
-        isScreen() {
-            return this.mode === 'dp';
-        },
-        isScript() {
-            return this.mode === 'script';
-        },
-        isPlan() {
-            return this.mode === 'plan';
-        }
-        // isDrive() {
-        // 	return this.prdType == '04';
-        // },
-        // isShowScheduling() {
-        // 	return this.prdType == '05';
-        // }
-    },
-    watch: {
-        '$store.state.config.menuBarLoadedCount': function (val) {
-            this.setPosition();
-        },
-        '$store.state.map.mapViewLoadedCount': function (val) {
-            this.mapBoxP = document.getElementById(this.canvasId).children[0];
-            this.mapBox = document.getElementsByTagName('canvas');
-
-        },
-        '$store.state.training.prdType': function(val) {
-            // this.prdType=val;
-            this.isDrive = (val == '04');
-            this.isShowScheduling = (val == '05');
-        },
-        '$store.state.socket.permissionOver': function () {
-            this.$alert('用户权限已被收回', '提示', {
-                confirmButtonText: '确定',
-                callback: action => {
-                    this.back();
-                }
-            });
-        },
-        '$store.state.app.windowSizeCount': function() {
-            this.setWindowSize();
-        },
-        $route() {
-            this.$nextTick(() => {
-                this.initLoadData();
-            });
-        }
-    },
-    async created() {
-        this.mode = this.$route.params.mode;
-        this.group = this.$route.query.group || '';
-    },
-    async mounted() {
-
-        EventBus.$on('clearCheckLogin', () => {
-            this.clearCheckLogin();
-        });
-
-        await this.setWindowSize();
-        await this.initLoadData();
-        this.switchMode('');
-    },
-    async beforeDestroy() {
-        await this.clearAllTimer();
-        await this.quit();
-        await this.$store.dispatch('training/reset');
-        await this.$store.dispatch('map/mapClear');
-        EventBus.$off('clearCheckLogin');
-    },
-    methods: {
-        // 清除检查在线定时器
-        clearAllTimer() {
-            if (this.ierval) {
-                clearTimeout(this.ierval);
-                this.ierval = null;
-            }
-
-            if (this.checkLine) {
-                clearTimeout(this.checkLine);
-                this.checkLine = null;
-            }
-        },
-        // 设置检查在线定时器
-        checkLoginLineTimer() {
-            if (this.checkLine) {
-                clearTimeout(this.checkLine);
-            }
-
-            this.checkLine = setInterval(() => {
-                checkLoginLine();
-            }, 5000 * 60);
-        },
-        // 设置手标显示状态
-        checkMouseStatusTimer() {
-            if (this.ierval) {
-                clearTimeout(this.ierval);
-            }
-
-            this.ierval = setInterval(() => {
-                if (this.mouseNum) {
-                    this.mouseNum = 0;
-                    this.mouseNumTime = 0;
-                } else {
-                    this.mouseNumTime += 1;
-                }
-                if (this.mapBox) {
-                    if (this.mouseNumTime >= 15) {
-                        for (let i = 0; i < this.mapBox.length; i++) {
-                            this.mapBox[i].style.cursor = 'none';
-                        }
-                    } else {
-                        for (let i = 0; i < this.mapBox.length; i++) {
-                            this.mapBox[i].style.cursor = '';
-                        }
-                    }
-                }
-            }, 1000);
-        },
-        mousemove(e) {
-            this.mouseNum = 1;
-        },
-        setPosition() {
-            this.$nextTick(() => {
-                let offset = 15;
-                const menuBar = document.getElementById('menuBar');
-                const menuTool = document.getElementById('menuTool');
-                if (menuBar) {
-                    offset += (menuBar.offsetHeight || 0);
-                }
-                if (menuTool) {
-                    offset += (menuTool.offsetHeight || 0);
-                }
-
-                if (this.offset != offset) {
-                    this.offset = offset;
-                }
-            });
-        },
-        // 结束加载状态
-        endViewLoading(isSuccess) {
-            if (!isSuccess) {
-                this.$store.dispatch('map/mapClear');
-            }
-
-            this.$nextTick(() => {
-                EventBus.$emit('viewLoading', false);
-            });
-        },
-        // 加载仿真信息
-        async loadSimulationInfo() {
-            const resp = await getSimulationInfo(this.group);
-            if (resp && resp.code == 200) {
-                this.$store.dispatch('scriptRecord/updateSimulationPause', resp.data.pause);
-                this.questId = Number(resp.data.questId) || 0;
-            }
-        },
-        // 加载地图数据
-        async initLoadData() {
-            this.$store.dispatch('training/reset');
-            try {
-                await this.loadSimulationInfo();
-                if (this.isDemon) {
-                    await this.initLoadDemonData();
-                } else if (this.isScreen) {
-                    await this.initLoadScreenData();
-                } else if (this.isPlan) {
-                    await this.initLoadTestRunData();
-                } else if (this.isScript) {
-                    await this.initLoadTaskData();
-                }
-                this.checkLoginLineTimer();
-                this.checkMouseStatusTimer();
-            } catch (error) {
-                this.$messageBox(`初始化失败: ${error.message}`);
-                this.endViewLoading();
-            }
-        },
-        // 仿真系统
-        async initLoadDemonData() {
-            this.$store.dispatch('training/end', TrainingMode.NORMAL);
-            this.$store.dispatch('training/changeOperateMode', { mode: OperateMode.NORMAL }); // 默认为正常模式
-            this.$store.dispatch('training/setPrdType', this.prdTypeMap[this.prdType]);
-
-            if (parseInt(this.mapId)) {
-                await this.loadMapDataById(this.mapId);
-            } else {
-                this.endViewLoading();
-            }
-        },
-        // 大屏系统请求
-        async initLoadScreenData() {
-            this.$store.dispatch('training/end', TrainingMode.NORMAL);
-            this.$store.dispatch('training/changeOperateMode', { mode: OperateMode.NORMAL }); // 默认为正常模式
-            this.$store.dispatch('training/setPrdType', '01');
-
-            if (parseInt(this.mapId)) {
-                await this.loadMapDataById(this.mapId);
-            } else {
-                this.endViewLoading();
-            }
-        },
-        // 任务录制系统
-        async initLoadTaskData() {
-            this.$store.dispatch('training/end', TrainingMode.NORMAL);
-            this.$store.dispatch('training/changeOperateMode', { mode: OperateMode.NORMAL }); // 默认为正常模式
-            this.switchMode('01');
-
-            if (parseInt(this.mapId)) {
-                await this.loadMapDataById(this.mapId);
-            } else {
-                this.endViewLoading();
-            }
-        },
-        // 测试跑车
-        async initLoadTestRunData() {
-            this.$store.dispatch('training/end', TrainingMode.NORMAL);
-            this.$store.dispatch('training/changeOperateMode', { mode: OperateMode.NORMAL }); // 默认为正常模式
-            this.$store.dispatch('training/setPrdType', '01');
-
-            if (parseInt(this.mapId)) {
-                await this.loadMapDataById(this.mapId);
-            } else {
-                this.endViewLoading();
-            }
-        },
-        // 加载剧本
-        async runQuestLoadShow() {
-            this.$refs.addQuest.doShow();
-        },
-        async runAddRolesLoadShow() {
-            // this.$refs.addQuest.doShow();
-            // const row={id: this.$route.query.scriptId};
-            const row = {group: this.$route.query.group, id: this.$route.query.scriptId};
-            this.$refs.addQuest.handleLoad(1, row);
-        },
-        // 选择脚本
-        async selectQuest(row, id, mapLocation, roleName) {
-            try {
-                let prdType = '';
-                switch (roleName) {
-                case 'Attendant': {
-                    prdType = '01';
-                    break;
-                }
-                case 'Dispatcher': {
-                    prdType = '02';
-                    break;
-                }
-                case 'Driver': {
-                    prdType = '04';
-                    break;
-                }
-                case 'Repair': {
-                    prdType = '';
-                    break;
-                }
-                }
-                this.switchMode(prdType);
-                const res = await loadDraftScript(row.id, id, this.group);
-                if (res && res.code == 200) {
-                    this.questId = parseInt(row.id);
-                    if (mapLocation) {
-                        const newMapLocation = {'offsetX': mapLocation.x, 'offsetY': mapLocation.y, 'scaleRate': mapLocation.scale};
-                        Vue.prototype.$jlmap.setOptions(newMapLocation);
-                    }
-                    // if (res.data && res.data.mapLocation) {
-                    // 	const mapLocation={'offsetX': res.data.mapLocation.x, 'offsetY': res.data.mapLocation.y, 'scaleRate': res.data.mapLocation.scale};
-                    // 	Vue.prototype.$jlmap.setOptions(mapLocation);
-                    // }
-                }
-                if (this.$refs.menuDemon) {
-                    await this.$refs.menuDemon.initLoadPage();
-                }
-
-                if (this.$refs.menuScript) {
-                    await this.$refs.menuScript.initLoadPage();
-                }
-            } catch (error) {
-                this.$messageBox(error.message);
-            }
-        },
-        // 退出脚本
-        async quitQuest() {
-            this.questId = 0;
-        },
-
-        // 通过id加载地图数据
-        async loadMapDataById(mapId) {
-            try {
-                await loadMapDataById(mapId);
-                await this.$store.dispatch('training/setMapDefaultState');
-            } catch (error) {
-                this.$messageBox(`获取地图数据失败: ${error.message}`);
-                this.endViewLoading();
-            }
-        },
-
-        // 销毁仿真
-        async quit() {
-            await runDiagramQuit(this.group);
-            await this.$store.dispatch('training/over');
-        },
-        // 仿真错误时，被动退出时调用
-        async back() {
-            if (this.isLesson) {
-                await this.$refs.lessonMenu.back();
-            } else if (this.isDemon) {
-                await this.$refs.menuDemon.back();
-            } else if (this.isScreen) {
-                await this.$refs.menuScreen.back();
-            } else if (this.isPlan) {
-                await this.$refs.menuPlan.back();
-            } else if (this.isScript) {
-                await this.$refs.menuScript.back();
-            }
-        },
-        // 设置使用时间
-        async tryTime(param) {
-            const data = {
-                goodsId: param.goodsId,
-                time: param.time
-            };
-            if (data.goodsId) {
-                await setGoodsTryUse(data);
-            }
-        },
-        switchMode(prdType) {
-            this.$store.dispatch('training/setPrdType', prdType);
-        },
-        hidepanel() {
-            if (this.isDrive) {
-                this.panelShow = false;
-                this.drivingShow = true;
-                this.$refs.Jl3dDrive.show(this.mapId, this.group);
-            } else {
-                this.panelShow = false;
-                this.simulationShow = true;
-                this.$refs.Jl3dSimulation.show(this.mapId, this.group);
-            }
-        },
-        showScheduling() {
-            this.$refs.scheduling.doShow();
-        },
-        showpanel() {
-            this.panelShow = true;
-            this.simulationShow = false;
-        },
-        showdriving() {
-            this.panelShow = true;
-            this.drivingShow = false;
-        },
-        runPlanViewShow() {
-            this.$refs.runPlanView.doShow();
-        },
-        runPlanLoadShow() {
-            this.$refs.runPlanLoad.doShow();
-        },
-        // faultChooseShow() {
-        //     this.$refs.faultChoose.doShow();
-        // },
-        setWindowSize() {
-            this.$nextTick(() => {
-                const width = this.size ? this.size.width : this.width;
-                const height = this.size ? this.size.height : this.height;
-
-                this.$store.dispatch('config/resize', { width, height });
-
-                this.$store.dispatch('training/updateOffsetStationCode', { offsetStationCode: this.offsetStationCode });
-            });
-        }
-    }
-};
-</script>
-<style>
-    .main {
-        z-index: 10;
-        display: block;
-        width: 100%;
-        height: 100%;
-        overflow: hidden;
-
-        -moz-user-select: none;
-        -o-user-select: none;
-        -khtml-user-select: none;
-        -webkit-user-select: none;
-        -ms-user-select: none;
-        user-select: none;
-    }
-</style>
diff --git a/src/views/oldMap/display/index.vue b/src/views/oldMap/display/index.vue
deleted file mode 100644
index 2cd2f3430..000000000
--- a/src/views/oldMap/display/index.vue
+++ /dev/null
@@ -1,578 +0,0 @@
-<template>
-  <div class="main" :style="{width: canvasWidth+'px'}" @mousemove="mousemove">
-    <div v-show="panelShow" :panelShow="panelShow">
-      <transition name="el-zoom-in-bottom">
-        <map-system-draft ref="mapCanvas" @back="back" />
-      </transition>
-
-      <menu-exam v-if="isExam" ref="menuExam" :offset="offset" :group="group" />
-
-      <menu-lesson v-if="isLesson" ref="lessonMenu" :offset="offset" :group="group" :training-obj="trainingObj" />
-
-      <menu-demon
-        v-if="isDemon"
-        ref="menuDemon"
-        :offset="offset"
-        :group="group"
-        :quest-id="questId"
-        @tryTime="tryTime"
-        @hidepanel="hidepanel"
-        @passflow="passflow"
-        @devicemodel="devicemodel"
-        @quitQuest="quitQuest"
-        @showScheduling="showScheduling"
-      />
-
-      <menu-screen v-if="isScreen" ref="menuScreen" :offset="offset" :group="group" @tryTime="tryTime" />
-
-      <menu-plan v-if="isPlan" ref="menuPlan" :offset="offset" :group="group" />
-
-      <menu-script v-if="isScript" ref="menuScript" :offset="offset" :group="group" />
-
-      <menu-schema
-        v-if="isDemon || isPlan || isScript "
-        ref="menuSchema"
-        :offset="offset"
-        :group="group"
-        @switchMode="switchMode"
-        @selectQuest="selectQuest"
-      />
-
-      <menu-system-time ref="menuSystemTime" :offset="offset" :right="right" :group="group" />
-    </div>
-
-    <!-- <Jl3d-Simulation v-show="simulationShow" ref="Jl3dSimulation" :panel-show="simulationShow" @showpanel="showpanel" /> -->
-
-    <Jl3d-Device v-if="deviceShow" ref="Jl3dDevice" :panel-show="deviceShow" @closedevice3dview="devicemodel" />
-    <Jl3d-Drive v-show="drivingShow" ref="Jl3dDrive" :panel-show="drivingShow" @showdriving="showdriving" />
-
-    <scheduling v-if="isShowScheduling" ref="scheduling" :group="group" />
-  </div>
-</template>
-
-<script>
-import MapSystemDraft from '@/views/oldMap/mapsystem/index';
-import MenuExam from '@/views/oldMap/display/menuExam';
-import MenuLesson from '@/views/oldMap/display/menuLesson';
-import MenuDemon from '@/views/oldMap/display/menuDemon';
-import MenuScreen from '@/views/oldMap/display/menuScreen';
-import MenuSchema from '@/views/oldMap/display/menuSchema';
-import MenuSystemTime from '@/views/oldMap/display/menuSystemTime';
-import MenuPlan from '@/views/oldMap/display/menuPlan';
-import MenuScript from '@/views/oldMap/display/menuScript';
-import Scheduling from './demon/scheduling';
-import { mapGetters } from 'vuex';
-import { getTrainingDetail, getTrainingStepsDetail } from '@/api/jmap/training';
-import { setGoodsTryUse } from '@/api/management/goods';
-import { runDiagramQuit, loadScript, getSimulationInfo } from '@/api/simulation';
-import { OperateMode, TrainingMode } from '@/scripts/ConstDic';
-import { checkLoginLine } from '@/api/login';
-import { loadMapDataById } from '@/utils/loaddata';
-import { EventBus } from '@/scripts/event-bus';
-import { getSessionStorage } from '@/utils/auth';
-import Vue from 'vue';
-
-// 三维
-// import Jl3dSimulation from '@/views/jlmap3d/simulation/jl3dsimulation';
-import Jl3dDrive from '@/views/jlmap3d/drive/jl3ddrive';
-import Jl3dDevice from '@/views/jlmap3d/device/jl3ddevice';
-import { getToken } from '@/utils/auth';
-export default {
-    name: 'DisplayDraft',
-    components: {
-        MenuExam,
-        MenuLesson,
-        MapSystemDraft,
-        MenuPlan,
-        MenuDemon,
-        MenuScreen,
-        MenuScript,
-        MenuSchema,
-        MenuSystemTime,
-        // Jl3dSimulation,
-        Jl3dDrive,
-        Jl3dDevice,
-        Scheduling
-    },
-    props: {
-        size: {
-            type: Object,
-            default() {
-                return null;
-            }
-        }
-    },
-    data() {
-        return {
-            mode: '',
-            trainingObj: {},
-            timeDemonNum: 0,
-            checkLine: null,
-            offset: 15,
-            mouseNum: 1,
-            ierval: null,
-            mouseNumTime: 0,
-            mapBox: null,
-            mapBoxP: null,
-            panelShow: true,
-            simulationShow: false,
-            drivingShow: false,
-            deviceShow: false,
-            questId: 0, 		// 加载任务的Id
-            group: '',
-            prdTypeMap: {
-                '01': '01', 	// 现地 => 现地
-                '02': '02', 	// 行调 => 行调
-                '04': '02', 	// 司机 => 行调
-                '05': ''		// 派班 => null
-            }
-        };
-    },
-    computed: {
-        ...mapGetters([
-            'canvasWidth'
-        ]),
-        ...mapGetters('map', [
-            'map'
-        ]),
-        ...mapGetters('training', [
-            'offsetStationCode'
-        ]),
-        ...mapGetters('config', [
-            'canvasId'
-        ]),
-        width() {
-            return this.$store.state.app.width;
-        },
-        height() {
-            return this.$store.state.app.height;
-        },
-        right() {
-            return this.$store.state.config.width / 2 - 55;
-        },
-        trainingId() {
-            return this.$route.query.trainingId;
-        },
-        mapId() {
-            return this.$route.query.mapId;
-        },
-        prdType() {
-            return this.$route.query.prdType;
-        },
-        skinCode() {
-            return this.$route.query.skinCode;
-        },
-        isLesson() {
-            return this.mode === 'teach' || this.mode === 'record' || this.mode === 'manage';
-        },
-        isExam() {
-            return this.mode === 'exam';
-        },
-        isDemon() {
-            return this.mode === 'demon';
-        },
-        isScreen() { // 暂时不用
-            return this.mode === 'dp';
-        },
-        isScript() {
-            return this.mode === 'script';
-        },
-        isPlan() {
-            return this.mode === 'plan';
-        },
-        isDrive() {
-            return this.prdType == '04';
-        },
-        isShowScheduling() {
-            return this.$route.query.prdType == '05';
-        }
-    },
-    watch: {
-        '$store.state.config.menuBarLoadedCount': function (val) {
-            this.setPosition();
-        },
-        '$store.state.map.mapViewLoadedCount': function (val) {
-            this.mapBoxP = document.getElementById(this.canvasId).children[0];
-            this.mapBox = document.getElementsByTagName('canvas');
-
-            if (this.trainingId) {
-                // 获取实训步骤数据（老版地图）
-                getTrainingStepsDetail(this.trainingId, { group: this.group }).then(resp => {
-                    this.trainingObj = resp.data;
-                    this.$store.dispatch('training/setTrainingData', this.trainingObj);
-                });
-            }
-
-        },
-        '$store.state.socket.permissionOver': function () {
-            this.$alert('用户权限已被收回', '提示', {
-                confirmButtonText: '确定',
-                callback: action => {
-                    this.back();
-                }
-            });
-        },
-        'size.width': function(val) {
-            this.setWindowSize();
-        },
-        '$store.state.app.windowSizeCount': function() {
-            this.setWindowSize();
-        },
-        $route() {
-            this.$nextTick(() => {
-                this.initLoadData();
-            });
-        }
-    },
-    async created() {
-        this.mode = this.$route.params.mode;
-        this.group = this.$route.query.group || '';
-    },
-    async mounted() {
-        EventBus.$on('clearCheckLogin', () => {
-            this.clearCheckLogin();
-        });
-
-        await this.setWindowSize();
-        await this.initLoadData();
-    },
-    async beforeDestroy() {
-        await this.clearAllTimer();
-        await this.quit();
-        await this.$store.dispatch('training/reset');
-        await this.$store.dispatch('map/mapClear');
-        EventBus.$off('clearCheckLogin');
-    },
-    methods: {
-        // 清除检查在线定时器
-        clearAllTimer() {
-            if (this.ierval) {
-                clearTimeout(this.ierval);
-                this.ierval = null;
-            }
-
-            if (this.checkLine) {
-                clearTimeout(this.checkLine);
-                this.checkLine = null;
-            }
-        },
-        // 设置检查在线定时器
-        checkLoginLineTimer() {
-            if (this.checkLine) {
-                clearTimeout(this.checkLine);
-            }
-
-            this.checkLine = setInterval(() => {
-                checkLoginLine();
-            }, 5000 * 60);
-        },
-        // 设置手标显示状态
-        checkMouseStatusTimer() {
-            if (this.ierval) {
-                clearTimeout(this.ierval);
-            }
-
-            this.ierval = setInterval(() => {
-                if (this.mouseNum) {
-                    this.mouseNum = 0;
-                    this.mouseNumTime = 0;
-                } else {
-                    this.mouseNumTime += 1;
-                }
-                if (this.mapBox) {
-                    if (this.mouseNumTime >= 15) {
-                        for (let i = 0; i < this.mapBox.length; i++) {
-                            this.mapBox[i].style.cursor = 'none';
-                        }
-                    } else {
-                        for (let i = 0; i < this.mapBox.length; i++) {
-                            this.mapBox[i].style.cursor = '';
-                        }
-                    }
-                }
-            }, 1000);
-        },
-        mousemove(e) {
-            this.mouseNum = 1;
-        },
-        setPosition() {
-            this.$nextTick(() => {
-                let offset = 15;
-                const menuBar = document.getElementById('menuBar');
-                const menuTool = document.getElementById('menuTool');
-                if (menuBar) {
-                    offset += (menuBar.offsetHeight || 0);
-                }
-                if (menuTool) {
-                    offset += (menuTool.offsetHeight || 0);
-                }
-
-                if (this.offset != offset) {
-                    this.offset = offset;
-                }
-            });
-        },
-        // 结束加载状态
-        endViewLoading(isSuccess) {
-            if (!isSuccess) {
-                this.$store.dispatch('map/mapClear');
-            }
-
-            this.$nextTick(() => {
-                EventBus.$emit('viewLoading', false);
-            });
-        },
-        // 加载仿真信息
-        async loadSimulationInfo() {
-            const resp = await getSimulationInfo(this.group);
-            if (resp && resp.code == 200) {
-                this.$store.dispatch('scriptRecord/updateSimulationPause', resp.data.pause);
-                this.questId = Number(resp.data.questId) || 0;
-            }
-        },
-        // 加载地图数据
-        async initLoadData() {
-            this.$store.dispatch('training/reset');
-
-            try {
-                await this.loadSimulationInfo();
-
-                if (this.isDemon) {
-                    await this.initLoadDemonData();
-                } else if (this.isScreen) {
-                    await this.initLoadScreenData();
-                } else if (this.isPlan) {
-                    await this.initLoadTestRunData();
-                } else if (this.isScript) {
-                    await this.initLoadTaskData();
-                } else {
-                    await this.initLoadLessonOrExamData();
-                }
-
-                this.checkLoginLineTimer();
-                this.checkMouseStatusTimer();
-            } catch (error) {
-                this.$messageBox(`初始化失败: ${error.message}`);
-                this.endViewLoading();
-            }
-        },
-        // 课程和考试系统
-        async initLoadLessonOrExamData() {
-            this.$store.dispatch('training/end', null);
-            this.$store.dispatch('training/changeOperateMode', { mode: OperateMode.NORMAL }); // 默认为正常模式
-
-            if (parseInt(this.trainingId)) {
-                // 设置地图数据
-                // 设置实训数据
-                const resp = await getTrainingDetail(this.trainingId);
-                if (resp && resp.code == 200) {
-                    const detail = resp.data;
-                    await this.$store.dispatch('training/setPrdType', this.prdTypeMap[detail.prdType]);
-                    await this.loadMapDataById(this.mapId);
-                } else {
-                    this.$messageBox(`获取实训步骤数据失败`);
-                    this.endViewLoading();
-                }
-            } else {
-                this.endViewLoading();
-            }
-        },
-        // 仿真系统
-        async initLoadDemonData() {
-            this.$store.dispatch('training/end', TrainingMode.NORMAL);
-            this.$store.dispatch('training/changeOperateMode', { mode: OperateMode.NORMAL }); // 默认为正常模式
-            this.$store.dispatch('training/setPrdType', this.prdTypeMap[this.prdType]);
-
-            if (parseInt(this.mapId)) {
-                await this.loadMapDataById(this.mapId);
-
-            } else {
-                this.endViewLoading();
-            }
-        },
-        // 大屏系统请求
-        async initLoadScreenData() {
-            this.$store.dispatch('training/end', TrainingMode.NORMAL);
-            this.$store.dispatch('training/changeOperateMode', { mode: OperateMode.NORMAL }); // 默认为正常模式
-            this.$store.dispatch('training/setPrdType', '01');
-            if (parseInt(this.mapId)) {
-                await this.loadMapDataById(this.mapId);
-            } else {
-                this.endViewLoading();
-            }
-        },
-        // 任务录制系统
-        async initLoadTaskData() {
-            this.$store.dispatch('training/end', TrainingMode.NORMAL);
-            this.$store.dispatch('training/changeOperateMode', { mode: OperateMode.NORMAL }); // 默认为正常模式
-            this.switchMode('01');
-
-            if (parseInt(this.mapId)) {
-                await this.loadMapDataById(this.mapId);
-            } else {
-                this.endViewLoading();
-            }
-        },
-        // 测试跑车
-        async initLoadTestRunData() {
-            this.$store.dispatch('training/end', TrainingMode.NORMAL);
-            this.$store.dispatch('training/changeOperateMode', { mode: OperateMode.NORMAL }); // 默认为正常模式
-            this.$store.dispatch('training/setPrdType', '01');
-
-            if (parseInt(this.mapId)) {
-                await this.loadMapDataById(this.mapId);
-            } else {
-                this.endViewLoading();
-            }
-        },
-        // 选择脚本
-        async selectQuest(row, id, mapLocation, roleName) {
-            try {
-
-                const res = await loadScript(row.id, id, this.group);
-                if (res && res.code == 200) {
-                    this.questId = parseInt(row.id);
-                    if (mapLocation) {
-                        const newMapLocation = {'offsetX': mapLocation.x, 'offsetY': mapLocation.y, 'scaleRate': mapLocation.scale};
-                        Vue.prototype.$jlmap.setOptions(newMapLocation);
-                    }
-                }
-                if (this.$refs.menuDemon) {
-                    await this.$refs.menuDemon.initLoadPage();
-                }
-
-                if (this.$refs.menuScript) {
-                    await this.$refs.menuScript.initLoadPage();
-                }
-
-            } catch (error) {
-                this.$messageBox(error.message);
-            }
-        },
-        // 退出脚本
-        async quitQuest() {
-            this.questId = 0;
-            this.$store.dispatch('scriptRecord/updateSimulationPause', false);
-        },
-        // 通过id加载地图数据
-        async loadMapDataById(mapId) {
-            try {
-                await loadMapDataById(mapId);
-                await this.$store.dispatch('training/setMapDefaultState');
-            } catch (error) {
-                this.$messageBox(`获取地图数据失败: ${error.message}`);
-                this.endViewLoading();
-            }
-        },
-
-        // 销毁仿真
-        async quit() {
-            await runDiagramQuit(this.group);
-            await this.$store.dispatch('training/over');
-        },
-        // 仿真错误时，被动退出时调用
-        async back() {
-            if (this.isExam) {
-                await this.$refs.menuExam.back();
-            } else if (this.isLesson) {
-                await this.$refs.lessonMenu.back();
-            } else if (this.isDemon) {
-                await this.$refs.menuDemon.back();
-            } else if (this.isScreen) {
-                await this.$refs.menuScreen.back();
-            } else if (this.isPlan) {
-                await this.$refs.menuPlan.back();
-            } else if (this.isScript) {
-                await this.$refs.menuScript.back();
-            }
-        },
-        // 设置使用时间
-        async tryTime(param) {
-            const data = {
-                goodsId: param.goodsId,
-                time: param.time
-            };
-            if (data.goodsId) {
-                await setGoodsTryUse(data);
-            }
-        },
-        switchMode(prdType) {
-            this.$store.dispatch('training/setPrdType', prdType);
-        },
-        hidepanel() {
-            if (this.isDrive) {
-                this.panelShow = false;
-                this.drivingShow = true;
-                this.$refs.Jl3dDrive.show(this.mapId, this.group);
-            } else {
-                const routeData = this.$router.resolve({
-                    path:'/jlmap3d/sandbox',
-                    query:{
-                        mapid:this.mapId,
-                        group:this.group,
-                        token:getToken(),
-                        project:getSessionStorage('project'),
-                        noPreLogout: true
-                    }
-                });
-                window.open(routeData.href, '_blank', 'noopener noreferrer');
-            }
-        },
-        passflow() {
-            const routeData = this.$router.resolve({
-                path:'/jlmap3d/passengerflow',
-                query:{
-                    mapid:this.mapId,
-                    noPreLogout: true
-                }
-            });
-            window.open(routeData.href, '_blank', 'noopener noreferrer');
-        },
-        devicemodel() {
-            if (this.deviceShow == false) {
-                this.deviceShow = true;
-            } else {
-                this.deviceShow = false;
-            }
-
-        },
-        showScheduling() {
-            this.$refs.scheduling.doShow();
-        },
-        showpanel() {
-            this.panelShow = true;
-            this.simulationShow = false;
-        },
-        showdriving() {
-            this.panelShow = true;
-            this.drivingShow = false;
-        },
-        setWindowSize() {
-            this.$nextTick(() => {
-                const width = this.size ? this.size.width : this.width;
-                const height = this.size ? this.size.height : this.height;
-
-                this.$store.dispatch('config/resize', { width, height });
-
-                this.$store.dispatch('training/updateOffsetStationCode', { offsetStationCode: this.offsetStationCode });
-            });
-        }
-    }
-};
-</script>
-<style>
-    .main {
-        z-index: 10;
-        display: block;
-        width: 100%;
-        height: 100%;
-        overflow: hidden;
-
-        -moz-user-select: none;
-        -o-user-select: none;
-        -khtml-user-select: none;
-        -webkit-user-select: none;
-        -ms-user-select: none;
-        user-select: none;
-    }
-</style>
diff --git a/src/views/oldMap/display/menuDemon.vue b/src/views/oldMap/display/menuDemon.vue
deleted file mode 100644
index f3ee1fe07..000000000
--- a/src/views/oldMap/display/menuDemon.vue
+++ /dev/null
@@ -1,273 +0,0 @@
-<template>
-  <div>
-    <div class="display-card" :style="{top: offset+'px'}">
-      <el-row>
-        <span v-if="countTime" class="display-score">{{ $t('display.demon.trialTime') }} {{ countTime }}</span>
-      </el-row>
-    </div>
-    <div class="display-draft">
-      <el-button-group>
-        <el-button v-if="isShowScheduling" type="primary" @click="jumpScheduling">{{ $t('display.demon.dispatchingPlan') }}</el-button>
-        <el-button type="jl3dpassflow" @click="jumpjl3dpassflow">{{ jl3dpassflow }}</el-button>
-        <el-button type="jumpjlmap3d" @click="jumpjlmap3d">{{ jl3dname }}</el-button>
-        <el-button v-if="isShow3dmodel" type="jumpjlmap3dmodel" @click="jumpjlmap3dmodel">{{ jl3dmodel }}</el-button>
-        <template v-if="isShowQuest">
-          <!-- && !isDesignPlatform  -->
-          <el-button v-if="!isDesignPlatform " type="danger" @click="handleQuitQuest">{{ $t('display.demon.exitScript') }}</el-button>
-        </template>
-        <template v-else>
-          <el-button type="success" :disabled="isDisable" @click="selectBeginTime">{{ $t('display.demon.drivingByPlan') }}</el-button>
-          <el-button type="danger" :disabled="!isDisable" @click="end">{{ $t('display.demon.exitPlan') }}</el-button>
-        </template>
-        <el-button type="primary" @click="back">{{ $t('display.demon.back') }}</el-button>
-      </el-button-group>
-    </div>
-
-    <set-time ref="setTime" @ConfirmSelectBeginTime="start" />
-  </div>
-
-</template>
-
-<!-- 单人仿真 -->
-<script>
-import SetTime from './demon/setTime';
-import { Notification } from 'element-ui';
-import { getGoodsTryUse } from '@/api/management/goods';
-import { runDiagramStart, runDiagramOver, runDiagramGetTime } from '@/api/simulation';
-import { PermissionType } from '@/scripts/ConstDic';
-import { getCountTime } from '@/utils/index';
-import { runDiagramIsStart, runDiagramQuit, quitScript } from '@/api/simulation';
-import { timeFormat } from '@/utils/date';
-// import { getToken } from '@/utils/auth';
-
-export default {
-    name: 'MenuDemon',
-    components: {
-        SetTime
-    },
-    props: {
-        group: {
-            type: String,
-            required: true
-        },
-        offset: {
-            type: Number,
-            required: true
-        },
-        questId: {
-            type: Number,
-            default() {
-                return 0;
-            }
-        }
-    },
-    data() {
-        return {
-            isDisable: false,
-            tryTime: 0, 				// 进入页面多少秒
-            timeNow: 0, 				// 进入页面 相对时间
-            time: null, 				// 定时器
-            countTime: 0, 				// 显示 倒计时
-            remainingTime: 0,
-            goodsId: this.$route.query.goodsId,
-            try: this.$route.query.try, // 是否是试用权限
-            training: {
-                id: '',
-                name: '',
-                remarks: ''
-            },
-            jl3dpassflow:this.$t('display.demon.passengerflow'),
-            jl3dname: this.$t('display.demon.threeDimensionalView'),
-            jl3dmodel: this.$t('display.demon.deviceView'),
-            isShow3dmodel :false
-        };
-    },
-    computed: {
-        isShowQuest() {
-            return this.questId;
-        },
-        isShowScheduling() {
-            return this.$route.query.prdType == '05';
-        },
-        isDesignPlatform() {
-            return this.$route.fullPath.includes('design/display/demon');
-        }
-    },
-    watch: {
-        '$store.state.training.subscribeCount': function () {
-            this.group && this.initLoadPage();
-        },
-        '$store.state.socket.tipOperateCount': function (val) {
-            this.$alert(this.$t('display.demon.taskOperateSuccess'), this.$t('global.tips'), {
-                confirmButtonText: this.$t('global.confirm'),
-                callback: action => {
-                }
-            });
-        }
-    },
-    beforeDestroy() {
-        if (this.time) {
-            this.setTryTime();
-            clearTimeout(this.time);
-        }
-    },
-    methods: {
-        async initLoadPage() {
-            try {
-                if (this.try != '0') {
-                    this.loadInitData();
-                }
-
-                const resp = await runDiagramIsStart(this.group);
-                if (resp && resp.data) {
-                    this.isDisable = true;
-                    this.$store.dispatch('training/simulationStart');
-                } else {
-                    this.isDisable = false;
-                    this.$store.dispatch('training/over');
-                }
-
-                await this.loadSystemTime();
-                this.change3dname();
-            } 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(model) {
-            this.isDisable = true;
-            runDiagramStart(model, this.group).then(res => {
-                this.$store.dispatch('training/simulationStart').then(() => {
-                    this.$store.dispatch('training/setInitTime', +new Date(`${new Date().getFullYear()} ${model.initTime}`));
-                });
-            }).catch(error => {
-                this.isDisable = false;
-                this.$messageBox(error.message + '，' + this.$t('display.demon.startSimulationFail'));
-            });
-        },
-        end() {
-            this.isDisable = false;
-            runDiagramOver(this.group).then(() => {
-                this.$store.dispatch('training/over').then(() => {
-                    this.$store.dispatch('training/setMapDefaultState').then(() => {
-                        this.$store.dispatch('map/clearJlmapTrainView');
-                        this.$store.dispatch('map/setTrainWindowShow', false);
-                    });
-                });
-            }).catch(() => {
-                this.isDisable = true;
-                this.$messageBox(this.$t('display.demon.endSimulationFail'));
-            });
-        },
-        handleQuitQuest() {
-            quitScript(this.group).then(resp => {
-                this.$emit('quitQuest');
-                this.initLoadPage();
-            }).catch(() => {
-                this.$messageBox(this.$t('display.demon.exitTaskFail'));
-            });
-        },
-        async back() {
-            await runDiagramQuit(this.group);
-            this.$store.dispatch('training/over').then(() => {
-                history.go(-1);
-                Notification.closeAll();
-            });
-        },
-        jumpjl3dpassflow(){
-            this.$emit('passflow');
-        },
-        jumpjlmap3d() {
-            this.$emit('hidepanel');
-        },
-        jumpjlmap3dmodel() {
-            this.$emit('devicemodel');
-        },
-        jumpScheduling() {
-            this.$emit('showScheduling');
-        },
-        setTryTime() {
-            if (this.try) {
-                this.$emit('tryTime', { time: this.tryTime, goodsId: this.goodsId });
-            }
-        },
-        async loadSystemTime() {
-            const rest = await runDiagramGetTime(this.group);
-            if (rest && rest.code == 200) {
-                this.$store.dispatch('training/setInitTime', +new Date(`${new Date().getFullYear()} ${timeFormat(rest.data)}`));
-            }
-        },
-        change3dname() {
-            if (this.$route.query.prdType == '04') {
-                this.jl3dname = this.$t('display.demon.driverPerspective');
-
-            } else {
-                this.jl3dname = this.$t('display.demon.threeDimensionalView');
-                this.isShow3dmodel = true;
-            }
-        }
-    }
-};
-</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;
-    }
-
-    .display-draft {
-        position: absolute;
-        float: right;
-        right: 20px;
-        bottom: 15px;
-    }
-</style>
diff --git a/src/views/oldMap/display/menuExam.vue b/src/views/oldMap/display/menuExam.vue
deleted file mode 100644
index 9d44b1690..000000000
--- a/src/views/oldMap/display/menuExam.vue
+++ /dev/null
@@ -1,292 +0,0 @@
-<template>
-  <div>
-    <div class="display-card" :style="{top: offset + 'px'}">
-      <el-row style="vertical-align:middle; ">
-        <span class="display-time">{{ formatUsedTime }}</span>
-      </el-row>
-    </div>
-    <div class="display-draft">
-      <el-button-group>
-        <el-button type="success" :disabled="isDisable" :loading="startLoading" @click="start">{{ $t('display.startBtn') }}</el-button>
-        <el-button type="danger" :disabled="!isDisable" @click="end">{{ $t('display.endBtn') }}</el-button>
-        <el-button type="primary" class="back" @click="back">{{ $t('display.backBtn') }}</el-button>
-      </el-button-group>
-    </div>
-    <tip-exam-list @refresh="refresh" />
-  </div>
-</template>
-
-<script>
-import TipExamList from './tipExamList';
-import { Notification } from 'element-ui';
-import { startTraining } from '@/api/jmap/training';
-import { timeFormat } from '@/utils/date';
-import { refreshExamList, finishOneExamQuestion } from '@/api/management/userexam';
-import { launchFullscreen } from '@/utils/screen';
-
-export default {
-    name: 'MenuExam',
-    components: {
-        TipExamList
-    },
-    props: {
-        group: {
-            type: String,
-            required: true
-        },
-        offset: {
-            type: Number,
-            required: true
-        }
-    },
-    data() {
-        return {
-            isDisable: false,
-            startLoading: false,
-            training: {
-                id: '',
-                name: '',
-                remarks: ''
-            }
-        };
-    },
-    computed: {
-        formatUsedTime() {
-            return timeFormat(this.$store.state.training.usedTime);
-        }
-    },
-    watch: {
-        '$store.state.map.mapViewLoadedCount': function() {
-            this.$store.dispatch('exam/countUsedTime');
-        }
-    },
-    methods: {
-        tipInfo(opt) {
-            if (opt && opt.hasOwnProperty('color') && opt.hasOwnProperty('message')) {
-                const h = this.$createElement;
-                this.$notify({
-                    title: this.$t('global.tips'),
-                    message: h('i', { style: 'color:' + opt.color }, this.$t('display.exam.startTestOperateTip'))
-                });
-            }
-        },
-        start() {
-            this.$store.dispatch('menuOperation/setButtonOperation', null);
-            this.startLoading = true;
-            if (this.$route.query.trainingId) {
-                this.isDisable = true;
-                startTraining({ id: this.$route.query.trainingId }, this.group).then(response => {
-                    this.$store.dispatch('training/examModeStart');
-                    this.$store.dispatch('map/clearJlmapTrainView').then(() => {
-                        this.$store.dispatch('training/setMapDefaultState').then(() => {
-                            this.$store.dispatch('training/emitTipFresh');
-                        });
-                    });
-                    this.startLoading = false;
-                }).catch(() => {
-                    this.isDisable = false;
-                    this.startLoading = false;
-                });
-            } else {
-                this.startLoading = true;
-                this.$messageBox(this.$t('display.exam.selectTest'));
-            }
-        },
-        end() {
-            if (this.$route.query.trainingId) {
-                this.isDisable = false;
-                if (this.$store.state.training.started) {
-                    const model = {
-                        id: this.$route.query.examQuestionId,
-                        usedTime: this.$store.state.training.usedTime,
-                        group: this.group
-                    };
-
-                    this.$store.dispatch('training/end', null);
-                    finishOneExamQuestion(model).then(response => {
-                        this.$store.dispatch('training/emitTipFresh');
-                        this.init();
-                    }).catch(() => {
-                        this.$store.dispatch('training/emitTipFresh');
-                        this.$messageBox(this.$t('display.exam.endTrainingError'));
-                    });
-                } else {
-                    this.isDisable = true;
-                    this.$messageBox(this.$t('display.exam.startTestTip'));
-                }
-            }
-        },
-        back() {
-            this.$confirm(this.$t('display.exam.endTestTip'), this.$t('global.tips'), {
-                confirmButtonText: this.$t('global.confirm'),
-                cancelButtonText: this.$t('global.cancel'),
-                type: 'warning'
-            }).then(() => {
-                this.$emit('quit');
-                this.$router.go(-1);
-                Notification.closeAll();
-            }).catch(() => {
-
-            });
-        },
-        init() {
-            launchFullscreen();
-            // 刷新考试列表
-            refreshExamList(this.$route.query.userExamId).then(response => {
-                this.$store.dispatch('exam/setUsedTime', response.data.usedTime);
-                this.$store.dispatch('exam/setTotalTime', response.data.duration);
-                this.$store.dispatch('trainingList/setTrainingList', response.data.userExamQuestionsVOs).then(response => { });
-            }).catch(error => {
-                // 如果时50009则表示考试已完成，不能再次进行y
-                if (error.code === 500009) {
-                    this.$router.replace({ path: `/trainingPlatform/result/${this.$route.params.userExamId}`, query: { subSystem: this.$route.query.subSystem, mapId:this.$route.query.mapId } });
-                } else {
-                    this.$messageBox(this.$t('display.exam.refreshListError'));
-                }
-            });
-        },
-        refresh() {
-            this.isDisable = false;
-            this.$store.dispatch('training/end', null);
-        }
-    }
-};
-</script>
-<style rel="stylesheet/scss" lang="scss" scoped>
-    @import "src/styles/mixin.scss";
-
-    .display-card {
-        z-index: 9;
-        display: inline;
-        position: absolute;
-        // float: left;
-        left: 160px;
-    }
-
-    .display-time {
-        background-color: white;
-        display: -moz-inline-box;
-        display: inline-block;
-        border: 1px solid lightskyblue;
-        width: 100px;
-        height: 32px;
-        line-height: 32px;
-        border-radius: 4px;
-        text-align: center;
-        font-family: "Microsoft" !important;
-        font-size: 18px !important;
-        font-weight: bold;
-        color: black;
-    }
-
-    .display-draft {
-        position: absolute;
-        float: right;
-        right: 15px;
-        bottom: 15px;
-
-        .back {
-            z-index: 100000;
-        }
-    }
-
-    .tip-body-box {
-        position: relative;
-        height: 430px;
-    }
-
-    .reminder-box {
-        position: absolute;
-        float: left;
-        left: 15px;
-        bottom: 15px;
-        width: 650px;
-        height: 470px;
-        background-color: #fff;
-        border-radius: 5px;
-        overflow: hidden;
-        z-index: 500;
-        /* transition: height 0.5s; */
-        font-size: 18px;
-
-        .tip-title {
-            width: 100%;
-            overflow: hidden;
-            height: 40px;
-            display: flex;
-            align-items: center;
-            flex-direction: row-reverse;
-            background-color: #409EFF;
-            cursor: move;
-            border-radius: 5px 5px 0 0;
-            justify-content: space-between;
-            padding: 0 10px;
-        }
-
-        .drag-right,
-        .drag-left {
-            width: 10px;
-            cursor: e-resize;
-            background-color: yellow;
-            height: 100%;
-            position: absolute;
-            right: 0;
-            top: 0;
-            opacity: 0;
-        }
-
-        .drag-left {
-            left: 0;
-        }
-
-        .drag-bottom {
-            position: absolute;
-            bottom: 0;
-            width: 100%;
-            height: 10px;
-            cursor: s-resize;
-            background-color: yellow;
-            opacity: 0;
-        }
-
-        .tip-body {
-            height: 366px;
-            padding: 10px;
-        }
-
-        .tip-foot {
-            width: 100%;
-            margin-right: 10px;
-            position: absolute;
-            right: 0px;
-            bottom: 0px;
-            background-color: #fff;
-            padding: 10px 0;
-            display: flex;
-            align-items: center;
-            flex-direction: row-reverse;
-
-            .btn {
-                margin-right: 10px;
-            }
-        }
-
-        .icon {
-            float: right;
-            margin-right: 10px;
-            cursor: pointer;
-            background-color: #d2d2d2;
-            border-radius: 50%;
-        }
-
-        /deep/ {
-            .el-tree-node__content {
-                margin-bottom: 4px;
-            }
-
-            .el-tree--highlight-current .el-tree-node.is-current>.el-tree-node__content {
-                background-color: #d6e5f7;
-            }
-        }
-    }
-</style>
diff --git a/src/views/oldMap/display/menuLesson.vue b/src/views/oldMap/display/menuLesson.vue
deleted file mode 100644
index 9a41e341f..000000000
--- a/src/views/oldMap/display/menuLesson.vue
+++ /dev/null
@@ -1,268 +0,0 @@
-<template>
-  <div>
-    <div class="display-card" :style="{top: offset + 'px'}">
-      <el-row>
-        <el-radio-group v-model="demoMode" class="mode" size="small">
-          <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 class="display-time">{{ formatUsedTime }}</span>
-        <span v-if="demoMode === TrainingMode.TEST" class="display-score">{{ $t('display.lesson.score') }}{{ formatScore }}</span>
-      </el-row>
-    </div>
-    <div class="display-draft">
-      <el-button-group>
-        <el-button type="success" :disabled="isDisable" :loading="startLoading" @click="start">{{ $t('display.startBtn') }}</el-button>
-        <el-button type="danger" class="end" :disabled="!isDisable" @click="end">{{ $t('display.endBtn') }}</el-button>
-        <el-button type="primary" :disabled="backDisable" class="back" @click="back">{{ $t('display.backBtn') }}</el-button>
-      </el-button-group>
-    </div>
-    <tip-training-detail :training-obj="trainingObj" />
-  </div>
-</template>
-
-<script>
-import TipTrainingDetail from './tipTrainingDetail';
-import { mapGetters } from 'vuex';
-import { Notification } from 'element-ui';
-import { startTraining, endTraining } from '@/api/jmap/training';
-import { trainingNotify } from '@/api/simulation';
-import { TrainingMode } from '@/scripts/ConstDic';
-import { timeFormat } from '@/utils/date';
-import { UrlConfig } from '@/scripts/ConstDic';
-
-export default {
-    name: 'MenuLesson',
-    components: {
-        TipTrainingDetail
-    },
-    props: {
-        group: {
-            type: String,
-            required: true
-        },
-        trainingObj: {
-            type: Object,
-            default() {
-                return null;
-            }
-        },
-        offset: {
-            type: Number,
-            required: true
-        }
-    },
-    data() {
-        return {
-            timeInterval: null,
-            TrainingMode: TrainingMode,
-            demoMode: TrainingMode.TEACH,
-            isDisable: false,
-            backDisable: false,
-            startLoading: false
-        };
-    },
-    computed: {
-        ...mapGetters('training', [
-            'score',
-            'started',
-            'usedTime',
-            'basicInfo'
-        ]),
-        formatScore() {
-            return this.score;
-        },
-        formatUsedTime() {
-            return timeFormat(this.usedTime);
-        }
-    },
-    watch: {
-        demoMode: function (val) {
-            this.$store.dispatch('training/end', null);
-            this.$store.dispatch('training/reset');
-            this.$store.dispatch('training/emitTipFresh');
-            this.$store.dispatch('menuOperation/setButtonOperation', null);
-
-            this.isDisable = false;
-        },
-        '$store.state.training.operateErrMsg': function (val) {
-            this.tipInfo({ color: val.color, message: val.errMsg });
-        }
-    },
-    methods: {
-        tipInfo(opt) {
-            if (opt && opt.hasOwnProperty('color') && opt.hasOwnProperty('message')) {
-                const h = this.$createElement;
-                this.$notify({
-                    title: this.$t('global.tips'),
-
-                    message: h('i', { style: 'color:' + opt.color }, opt.message)
-                });
-            }
-        },
-        start() {
-            // 清空按钮操作
-            this.$store.dispatch('menuOperation/setButtonOperation', null);
-            this.startLoading = true;
-            if (this.trainingObj && this.trainingObj.id) {
-                this.isDisable = true;
-                startTraining(this.trainingObj, this.group).then(response => {
-                    this.$store.dispatch('map/clearJlmapTrainView').then(() => {
-                        this.$store.dispatch('training/teachModeStart', this.demoMode);
-                        this.$store.dispatch('training/setMapDefaultState').then(() => {
-                            this.$store.dispatch('training/emitTipFresh');
-                            this.tipInfo({ color: 'green', message: this.$t('global.pleaseOpearte') });
-                        });
-                    });
-                    this.startLoading = false;
-                }).catch(() => {
-                    this.isDisable = false;
-                    this.startLoading = false;
-                });
-            } else {
-                this.startLoading = false;
-                this.$messageBox(this.$t('display.lesson.selectTraining'));
-            }
-        },
-        endCommit() {
-            this.$store.dispatch('training/setStopCountTime');
-            const mode = {
-                mode: this.demoMode,
-                id: this.trainingObj.id,
-                lessonId: this.$route.query.lessonId,
-                usedTime: this.usedTime
-            };
-
-            endTraining(mode, this.group).then(response => {
-                const data = response.data;
-                this.$store.dispatch('training/judgeFinish', data).then(rsp => {
-                    this.$store.dispatch('training/emitTipFresh');
-                });
-            }).catch(() => {
-                this.$messageBox(this.$t('display.lesson.endTrainingError'));
-            });
-        },
-        end() {
-            // 如果是测试模式需要获取最终的得分
-            if (this.trainingObj && this.trainingObj.id) {
-                if (this.started) {
-                    this.isDisable = false;
-                    this.$store.dispatch('training/isStepOver').then((rnt) => {
-                        if (rnt) {
-                            this.endCommit();
-                        } else {
-                            this.backDisable = true;
-                            this.$confirm(this.$t('display.lesson.endTrainingTip'), this.$t('global.tips'), {
-                                cancelButtonText: this.$t('global.cancel'),
-                                confirmButtonText: this.$t('global.confirm'),
-                                type: 'warning',
-                                center: true,
-                                zIndex: 9999
-                            }).then(() => {
-                                this.backDisable = false;
-                                this.$store.dispatch('training/end', null);
-                                this.$store.dispatch('training/setScore', 0);
-                                this.$store.dispatch('training/emitTipFresh');
-                            }).catch(() => {
-                                this.isDisable = true;
-                                this.backDisable = false;
-                            });
-                        }
-                    });
-                } else {
-                    this.$messageBox(this.$t('display.lesson.startTrainingTip'));
-                }
-            }
-        },
-        back() {
-            this.$emit('quit');
-            Notification.closeAll();
-
-            if (this.$route.params.mode == 'record') {
-                /** 如果是演示返回时，需要重新创建仿真*/
-                trainingNotify({ trainingId: this.$route.query.trainingId }).then(resp => {
-                    this.$router.push({ path: `${UrlConfig.lesson.record}/${this.$route.query.trainingId}/${this.$route.query.trainingName}`, query: { group: resp.data } });
-                }).catch(error => {
-                    this.$messageBox(`${this.$t('display.lesson.createSimulationError')}: ${error.message}`);
-                });
-            } else {
-                history.go(-1);
-            }
-        }
-    }
-};
-</script>
-<style rel="stylesheet/scss" lang="scss" scoped>
-    @import "src/styles/mixin.scss";
-
-    .display-card {
-        z-index: 9;
-        display: inline-block;
-        position: absolute;
-        left: 160px;
-        height: 32px;
-    }
-
-    .display-card .el-row {
-        line-height: 32px !important;
-    }
-
-    .display-mode {
-        display: -moz-inline-box;
-        display: inline-block;
-
-        /deep/ .el-radio-button__inner {
-            font-weight: bold;
-        }
-    }
-
-    .display-time {
-        background-color: white;
-        display: -moz-inline-box;
-        display: inline-block;
-        text-align: center;
-        font-weight: bold;
-        border: 1px solid lightskyblue;
-        width: 100px;
-        height: 32px;
-        line-height: 24px;
-        border-radius: 4px;
-        margin-left: 10px;
-        font-family: "Microsoft" !important;
-        font-size: 18px !important;
-        color: black;
-    }
-
-    .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;
-    }
-
-    .display-draft {
-        position: absolute;
-        float: right;
-        right: 15px;
-        bottom: 15px;
-
-        .back {
-            z-index: 100000;
-        }
-
-        /deep/ .el-button {
-            font-weight: bold;
-        }
-    }
-</style>
diff --git a/src/views/oldMap/display/menuPlan.vue b/src/views/oldMap/display/menuPlan.vue
deleted file mode 100644
index 459fbc486..000000000
--- a/src/views/oldMap/display/menuPlan.vue
+++ /dev/null
@@ -1,141 +0,0 @@
-<template>
-  <div class="display-draft">
-    <el-button-group>
-      <el-button type="success" :disabled="isDisable" @click="selectBeginTime">{{ $t('display.plan.drivingByPlan') }}</el-button>
-      <el-button type="danger" :disabled="!isDisable" @click="end">{{ $t('display.plan.exitPlan') }}</el-button>
-      <el-button type="primary" @click="back">{{ $t('display.plan.back') }}</el-button>
-    </el-button-group>
-    <set-time ref="setTime" @ConfirmSelectBeginTime="start" />
-  </div>
-</template>
-
-<script>
-import SetTime from './demon/setTime';
-import { Notification } from 'element-ui';
-import { runDiagramIsStart, runDiagramGetTime, runDiagramOver, runDiagramStart } from '@/api/simulation';
-import { timeFormat } from '@/utils/date';
-
-// 琏计划 暂时不用
-export default {
-    name: 'MenuPlan',
-    components: {
-        SetTime
-    },
-    props: {
-        group: {
-            type: String,
-            required: true
-        },
-        offset: {
-            type: Number,
-            required: true
-        }
-    },
-    data() {
-        return {
-            isDisable: false
-        };
-    },
-    watch: {
-        '$store.state.training.simulationGroupCount': function () {
-            this.initLoadPage();
-        }
-    },
-    methods: {
-        async initLoadPage() {
-            try {
-                const rest = await runDiagramIsStart(this.group);
-                if (rest && rest.data) {
-                    this.isDisable = true;
-                    this.$store.dispatch('training/simulationStart');
-                } else {
-                    this.isDisable = false;
-                    this.$store.dispatch('training/over');
-                }
-                await this.loadSystemTime();
-            } catch (error) {
-                console.log(error);
-            }
-        },
-        async loadSystemTime() {
-            const rest = await runDiagramGetTime(this.group);
-            if (rest && rest.code == 200) {
-                this.$store.dispatch('training/setInitTime', +new Date(`${new Date().getFullYear()} ${timeFormat(rest.data)}`));
-            }
-        },
-        selectBeginTime() {
-            this.$refs.setTime.doShow();
-        },
-        start(model) {
-            this.isDisable = true;
-            runDiagramStart(model, this.group).then(res => {
-                this.$store.dispatch('training/simulationStart').then(() => {
-                    this.$store.dispatch('training/setInitTime', +new Date(`${new Date().getFullYear()} ${model.initTime}`));
-                });
-            }).catch(() => {
-                this.isDisable = false;
-                this.$messageBox(this.$t('display.plan.startPlanFail'));
-            });
-        },
-        end() {
-            this.isDisable = false;
-            runDiagramOver(this.group).then(() => {
-                this.$store.dispatch('training/over').then(() => {
-                    this.$store.dispatch('training/setMapDefaultState').then(() => {
-                        this.$store.dispatch('map/clearJlmapTrainView');
-                        this.$store.dispatch('map/setTrainWindowShow', false);
-                    });
-                });
-            }).catch(() => {
-                this.isDisable = true;
-                this.$messageBox(this.$t('display.plan.endPlanFail'));
-            });
-        },
-        async back() {
-            this.$store.dispatch('training/over').then(() => {
-                history.go(-1);
-                Notification.closeAll();
-                // exitFullscreen();
-            });
-        }
-    }
-};
-</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;
-    }
-
-    .display-draft {
-        position: absolute;
-        float: right;
-        right: 15px;
-        bottom: 15px;
-    }
-</style>
diff --git a/src/views/oldMap/display/menuSchema.vue b/src/views/oldMap/display/menuSchema.vue
deleted file mode 100644
index 6eb9975bf..000000000
--- a/src/views/oldMap/display/menuSchema.vue
+++ /dev/null
@@ -1,198 +0,0 @@
-<template>
-  <div>
-    <div class="schema" :style="{top: offset+'px'}">
-      <el-select v-if="isScript" v-model="swch" size="small" :placeholder="$t('display.schema.selectProduct')" @change="switchMode">
-        <el-option v-for="item in swchList" :key="item.value" :label="item.name" :value="item.value" />
-      </el-select>
-
-      <el-button-group>
-        <el-button v-if="isDemon && isDesignPlatform" size="small" :disabled="viewDisabled" type="success" @click="viewScriptRoles">{{ $t('display.schema.selectRoles') }}</el-button>
-        <!-- 加载剧本 -->
-        <el-button v-if="isDemon && !isDesignPlatform" size="small" :disabled="viewDisabled" type="success" @click="viewRunQuest">{{ $t('display.schema.loadScript') }}</el-button>
-        <el-button v-if="notScript && runing" size="small" :disabled="viewDisabled" @click="viewRunPlan">{{ $t('display.schema.previewRunDiagram') }}</el-button>
-        <el-button v-if="!runing && !isPlan && notScript" size="small" :disabled="viewDisabled" type="warning" @click="loadRunPlan">{{ $t('display.schema.loadRunDiagram') }}</el-button>
-        <el-button v-if="mode==OperateMode.FAULT" size="small" type="danger" @click="setFault">{{ $t('display.schema.faultSetting') }}</el-button>
-      </el-button-group>
-
-      <el-radio-group v-if="!isPlan" v-model="mode" size="small" @change="changeOperateMode(mode)">
-        <el-radio-button class="mode" :label="OperateMode.NORMAL">{{ $t('display.schema.normalOperation') }}</el-radio-button>
-        <el-radio-button class="mode" :label="OperateMode.FAULT">{{ $t('display.schema.faultOperation') }}</el-radio-button>
-      </el-radio-group>
-    </div>
-    <fault-choose v-if="isDemon || isPlan || isScript" ref="faultChoose" :group="group" />
-    <run-plan-Load ref="runPlanLoad" :group="group" />
-    <run-plan-view ref="runPlanView" :group="group" />
-    <!-- 加载剧本列表弹窗 -->
-    <add-quest ref="addQuest" @selectQuest="selectQuest" />
-  </div>
-</template>
-<script>
-import RunPlanLoad from './demon/runPlanLoad';
-import RunPlanView from './demon/runPlanView';
-import FaultChoose from './demon/faultChoose';
-import AddQuest from './demon/addQuest';
-import { mapGetters } from 'vuex';
-import { OperateMode } from '@/scripts/ConstDic';
-import { getStationList, queryRunPlan } from '@/api/runplan';
-import { getEveryDayRunPlanData } from '@/api/simulation';
-import {getRpDetailByUserMapId} from '@/api/designPlatform';
-
-// 右上角操作
-export default {
-    name: 'MenuSchema',
-    components: {
-        RunPlanLoad,
-        RunPlanView,
-        FaultChoose,
-        AddQuest
-    },
-    props: {
-        group: {
-            type: String,
-            required: true
-        },
-        offset: {
-            type: Number,
-            required: true
-        }
-    },
-    data() {
-        return {
-            mode: OperateMode.NORMAL,
-            OperateMode: OperateMode,
-            viewDisabled: true,
-            runing: false,
-            swch: '01',
-            swchList: [
-                { value: '01', name: '现地' },
-                { value: '02', name: '行调' }
-            ]
-        };
-    },
-    computed: {
-        ...mapGetters('runPlan', [
-            'stations'
-        ]),
-        notScript() {
-            return this.$route.params.mode !== 'script';
-        },
-        isPlan() {
-            return this.$route.params.mode === 'plan';
-        },
-        isScript() {
-            return this.$route.params.mode === 'script';
-        },
-        isDemon() {
-            return this.$route.params.mode === 'demon';
-        },
-        isDesignPlatform() {
-            return this.$route.fullPath.includes('design/display/demon');
-        }
-    },
-    watch: {
-        '$store.state.training.started': function (val) {
-            this.setRuning(val);
-        },
-        '$store.state.training.switchcount': async function () {
-            if (this.group) {
-                const started = this.$store.state.training.started;
-                if (started) {
-                    await this.loadRunData(this.$route.query);
-                }
-            }
-        }
-    },
-    async mounted() {
-        await this.loadRunData(this.$route.query);
-    },
-    methods: {
-        loadRunData(opt) {
-            this.$store.dispatch('runPlan/clear').then(() => {
-                if (opt && opt.mapId) {
-                    this.viewDisabled = true;
-                    getStationList(opt.mapId).then(response => {
-                        this.$store.dispatch('runPlan/setStations', response.data).then(() => {
-                            if (this.$route.params.mode == 'plan') {
-                                if (this.$route.query.from == 'user') {
-                                    // 测试运行图功能
-                                    getRpDetailByUserMapId(this.$route.query.planId).then(resp => {
-                                        this.$store.dispatch('runPlan/setPlanData', resp.data);
-                                        this.viewDisabled = false;
-                                    }).catch(() => {
-                                        this.$store.dispatch('runPlan/setPlanData', []);
-                                        this.$messageBox(this.$t('display.schema.getRunDiagramFail'));
-                                    });
-                                } else {
-                                    // 测试运行图功能
-                                    queryRunPlan(this.$route.query.planId).then(resp => {
-                                        this.$store.dispatch('runPlan/setPlanData', resp.data);
-                                        this.viewDisabled = false;
-                                    }).catch(() => {
-                                        this.$store.dispatch('runPlan/setPlanData', []);
-                                        this.$messageBox(this.$t('display.schema.getRunDiagramFail'));
-                                    });
-                                }
-
-                            } else {
-                                getEveryDayRunPlanData(this.group).then(resp => {
-                                    this.$store.dispatch('runPlan/setPlanData', resp.data);
-                                    this.viewDisabled = false;
-                                }).catch(error => {
-                                    this.$store.dispatch('runPlan/setPlanData', []);
-                                    if (error.code == 30001) {
-                                        this.$messageBox(this.$t('display.schema.todayRunDiagramNoLoad'));
-                                    } else {
-                                        this.$messageBox(this.$t('display.schema.getRunDiagramFail'));
-                                    }
-                                });
-                            }
-                        });
-                    }).catch(() => {
-                        this.$messageBox(this.$t('display.schema.getStationListFail'));
-                    });
-                }
-            });
-        },
-        changeOperateMode(handle) {
-            this.$store.dispatch('training/changeOperateMode', { mode: handle });
-        },
-        setRuning(run) {
-            this.runing = run;
-        },
-        setFault() {
-            this.$refs.faultChoose.doShow();
-        },
-        loadRunPlan() {
-            this.$refs.runPlanLoad.doShow();
-        },
-        viewRunPlan() {
-            this.$refs.runPlanView.doShow();
-        },
-        viewRunQuest() {
-            this.$refs.addQuest.doShow();
-        },
-        viewScriptRoles() {
-            const row = {id: this.$route.query.scriptId, group:this.$route.query.group};
-            this.$refs.addQuest.handleLoad(1, row);
-        },
-        selectQuest(row, id, mapLocation, roleName) {
-            this.$emit('selectQuest', row, id, mapLocation, roleName);
-        },
-        switchMode(swch) {
-            this.$emit('switchMode', swch);
-        }
-    }
-};
-</script>
-<style rel="stylesheet/scss" lang="scss" scoped>
-    .schema {
-        z-index: 9;
-        display: inline;
-        position: absolute;
-        right: 15px;
-    }
-
-    /deep/ .el-button+.el-button {
-        margin-left: 0px;
-    }
-</style>
diff --git a/src/views/oldMap/display/menuScreen.vue b/src/views/oldMap/display/menuScreen.vue
deleted file mode 100644
index 49e8a666b..000000000
--- a/src/views/oldMap/display/menuScreen.vue
+++ /dev/null
@@ -1,151 +0,0 @@
-<template>
-  <div>
-    <div class="display-card" :style="{top: offset+'px'}">
-      <el-row>
-        <span v-if="countTime" class="display-score">{{ $t('display.screen.trialTime') }} {{ countTime }}</span>
-      </el-row>
-    </div>
-  </div>
-</template>
-<script>
-import { getGoodsTryUse } from '@/api/management/goods';
-import { PermissionType } from '@/scripts/ConstDic';
-import { getCountTime } from '@/utils/index';
-import { runDiagramIsStart, runDiagramGetTime, runDiagramStart } from '@/api/simulation';
-import { timeFormat } from '@/utils/date';
-
-export default {
-    name: 'MenuScreen',
-    props: {
-        group: {
-            type: String,
-            required: true
-        },
-        offset: {
-            type: Number,
-            required: true
-        }
-    },
-    data() {
-        return {
-            tryTime: 0, // 进入页面多少秒
-            timeNow: 0, // 进入页面 相对时间
-            time: null, // 定时器
-            countTime: 0, //  显示 倒计时
-            remainingTime: 0,
-            goodsId: this.$route.query.goodsId,
-            try: this.$route.query.try, // 是否是试用权限
-            training: {
-                id: '',
-                name: '',
-                remarks: ''
-            }
-        };
-    },
-    watch: {
-        '$store.state.training.subscribeCount': function () {
-            this.group && this.initLoadPage();
-        }
-    },
-    beforeDestroy() {
-        if (this.time) {
-            this.setTryTime();
-            clearTimeout(this.time);
-        }
-    },
-    methods: {
-        async initLoadPage() {
-            try {
-                if (this.try != '0') {
-                    const data = {
-                        permissionType: PermissionType.SCREEN
-                    };
-
-                    const resr = await getGoodsTryUse(data);
-                    if (resr && resr.code == 200) {
-                        this.remainingTime = resr.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);
-                        }
-                    } else {
-                        this.$messageBox(this.$t('display.screen.getTimeFail'));
-                    }
-                }
-
-                const initTime = this.$route.query.initTime;
-                const retp = await runDiagramIsStart(this.group);
-                if (retp && !retp.data) {
-                    await runDiagramStart({ initTime: initTime }, this.group);
-                }
-
-                await this.$store.dispatch('training/simulationStart');
-                await this.loadSystemTime();
-            } catch (error) {
-                console.log(error);
-            }
-        },
-        async loadSystemTime() {
-            const rest = await runDiagramGetTime(this.group);
-            if (rest && rest.code == 200) {
-                this.$store.dispatch('training/setInitTime', +new Date(`${new Date().getFullYear()} ${timeFormat(rest.data)}`));
-            }
-        },
-        setTryTime() {
-            if (this.try) {
-                this.$emit('tryTime', { time: this.tryTime, goodsId: this.goodsId });
-            }
-        },
-        back() {
-            this.$store.dispatch('training/over').then(() => {
-                Notification.closeAll();
-                history.go(-1);
-                // exitFullscreen();
-            });
-        }
-    }
-};
-</script>
-<style rel="stylesheet/scss" lang="scss" scoped>
-    @import "src/styles/mixin.scss";
-
-    .display-card {
-        z-index: 9;
-        display: inline;
-        position: absolute;
-        top: 17px;
-        left: 30px;
-    }
-
-    .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;
-    }
-
-    .display-draft {
-        position: absolute;
-        float: right;
-        right: 15px;
-        bottom: 15px;
-    }
-</style>
diff --git a/src/views/oldMap/display/menuScript.vue b/src/views/oldMap/display/menuScript.vue
deleted file mode 100644
index 73ba710a0..000000000
--- a/src/views/oldMap/display/menuScript.vue
+++ /dev/null
@@ -1,183 +0,0 @@
-<template>
-  <div>
-    <div class="display-draft">
-      <!-- <el-button-group>
-                <el-button type="primary" @click="saveScenesStage" v-if="isSaveStage">保存背景</el-button>
-                <el-button type="success" @click="saveScenesData" v-else>保存数据</el-button>
-                <el-button type="danger" @click="dumpScenesData">重置剧本</el-button>
-            </el-button-group> -->
-      <el-button-group>
-        <el-button type="success" :disabled="isDisable" @click="selectBeginTime">{{ $t('scriptRecord.drivingByPlan') }}</el-button>
-        <!-- <el-button type="danger" :disabled="!isDisable" @click="end">退出计划</el-button> -->
-        <el-button type="primary" @click="back">{{ $t('scriptRecord.scriptBack') }}</el-button>
-      </el-button-group>
-    </div>
-    <set-time ref="setTime" @ConfirmSelectBeginTime="start" />
-  </div>
-</template>
-
-<!-- 单人仿真 -->
-<script>
-import SetTime from './demon/setTime';
-import { Notification } from 'element-ui';
-import { runDiagramStart, runDiagramOver, runDiagramGetTime } from '@/api/simulation';
-import { runDiagramIsStart } from '@/api/simulation';
-import { timeFormat } from '@/utils/date';
-import { EventBus } from '@/scripts/event-bus';
-
-export default {
-    name: 'MenuTask',
-    components: {
-        SetTime
-    },
-    props: {
-        group: {
-            type: String,
-            required: true
-        },
-        offset: {
-            type: Number,
-            required: true
-        }
-    },
-    data() {
-        return {
-            isDisable: false,
-            tryTime: 0, // 进入页面多少秒
-            timeNow: 0, // 进入页面 相对时间
-            time: null, // 定时器
-            countTime: 0, // 显示 倒计时
-            remainingTime: 0,
-            goodsId: this.$route.query.goodsId,
-            // isSaveStage: true,
-            training: {
-                id: '',
-                name: '',
-                remarks: ''
-            }
-        };
-    },
-    computed: {
-        scriptId() {
-            return this.$route.query.scriptId;
-        }
-    },
-    watch: {
-        '$store.state.training.subscribeCount': function () {
-            this.group && this.initLoadPage();
-        }
-    },
-    beforeDestroy() {
-        if (this.time) {
-            this.setTryTime();
-            clearTimeout(this.time);
-        }
-    },
-    methods: {
-        async initLoadPage() {
-            try {
-                const resp = await runDiagramIsStart(this.group);
-                if (resp && resp.data) {
-                    this.isDisable = true;
-                    this.$store.dispatch('training/simulationStart');
-                } else {
-                    this.isDisable = false;
-                    this.$store.dispatch('training/over');
-                }
-
-                await this.loadSystemTime();
-            } catch (error) {
-                console.log(error);
-            }
-        },
-        selectBeginTime() {
-            this.$refs.setTime.doShow();
-        },
-        resetBeginTime() {
-            this.isDisable = false;
-        },
-        start(model) {
-            this.isDisable = true;
-            runDiagramStart(model, this.group).then(res => {
-                this.$store.dispatch('training/simulationStart').then(() => {
-                    this.$store.dispatch('training/setInitTime', +new Date(`${new Date().getFullYear()} ${model.initTime}`));
-                });
-            }).catch(() => {
-                this.isDisable = false;
-                this.$messageBox('开始仿真失败，请返回重试');
-            });
-        },
-        end() {
-            this.isDisable = false;
-            runDiagramOver(this.group).then(() => {
-                this.$store.dispatch('training/over').then(() => {
-                    this.$store.dispatch('training/setMapDefaultState').then(() => {
-                        this.$store.dispatch('map/clearJlmapTrainView');
-                        this.$store.dispatch('map/setTrainWindowShow', false);
-                    });
-                });
-            }).catch(() => {
-                this.isDisable = true;
-                this.$messageBox('结束仿真失败，请返回');
-            });
-        },
-        setTryTime() {
-            if (this.try) {
-                this.$emit('tryTime', { time: this.tryTime, goodsId: this.goodsId });
-            }
-        },
-        back() {
-            this.$store.dispatch('training/over').then(() => {
-                EventBus.$emit('runPlanStop');
-                EventBus.$emit('chatSubscribeStop');
-                history.go(-1);
-                Notification.closeAll();
-            });
-        },
-        async loadSystemTime() {
-            const rest = await runDiagramGetTime(this.group);
-            if (rest && rest.code == 200) {
-                this.$store.dispatch('training/setInitTime', +new Date(`${new Date().getFullYear()} ${timeFormat(rest.data)}`));
-            }
-        }
-    }
-};
-</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;
-    }
-
-    .display-draft {
-        position: absolute;
-        float: right;
-        right: 15px;
-        bottom: 15px;
-    }
-</style>
diff --git a/src/views/oldMap/display/menuSystemTime.vue b/src/views/oldMap/display/menuSystemTime.vue
deleted file mode 100644
index ab65f3642..000000000
--- a/src/views/oldMap/display/menuSystemTime.vue
+++ /dev/null
@@ -1,85 +0,0 @@
-<template>
-  <div v-if="isShowSystemTime" class="display-card" :style="{top: offset+'px', right: right+'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"
-      />
-
-    </template>
-  </div>
-</template>
-<script>
-import { prefixIntrger } from '@/utils/date';
-import SystemTime from '@/views/components/systemTime/index';
-
-// 顶部时间栏显示
-export default {
-    name: 'MenuSystemTime',
-    components: {
-        SystemTime
-    },
-    props: {
-        offset: {
-            type: Number,
-            required: true
-        },
-        right: {
-            type: Number,
-            required: true
-        }
-    },
-    data() {
-        return {
-            time: '00:0000'
-        };
-    },
-    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;
-        },
-        pause() {
-            return this.$store.state.scriptRecord.simulationPause;
-        }
-    },
-    watch: {
-        '$store.state.training.initTime': function (initTime) {
-            const date = new Date(initTime);
-            this.time = `${prefixIntrger(date.getHours(), 2)}:${prefixIntrger(date.getMinutes(), 2)}${prefixIntrger(date.getSeconds(), 2)}`;
-        }
-    }
-};
-</script>
-<style rel="stylesheet/scss" lang="scss" scoped>
-    @import "src/styles/mixin.scss";
-
-    .display-card {
-        z-index: 9;
-        display: inline;
-        position: absolute;
-    }
-
-	.display-pause {
-		font-size: 21px;
-		font-weight: bold;
-		color: yellow;
-	}
-
-	.display-time{
-		padding: 3px 5px;
-		box-shadow: 0px 0px 5px #eee;
-        border-radius: 3px;
-	}
-
-    .display-card .el-row {
-        line-height: 32px !important;
-    }
-
-</style>
diff --git a/src/views/oldMap/display/tipExamList.vue b/src/views/oldMap/display/tipExamList.vue
deleted file mode 100644
index 91f83f6b9..000000000
--- a/src/views/oldMap/display/tipExamList.vue
+++ /dev/null
@@ -1,422 +0,0 @@
-<template>
-  <div v-drag class="reminder-drag">
-    <div ref="drapBox" class="reminder-box">
-      <div class="tip-title">
-        <i v-show="isShrink" class="icon el-icon-minus" @click="shrink" />
-        <i v-show="!isShrink" class="icon el-icon-plus" @click="shrink" />
-        <p v-if="!isShrink" style="color: #fff;">
-          <span class="time-label">{{ $t('display.exam.examTime') }}</span>
-
-          <span class="time-elem">{{ formatRemainTime }}</span>
-        </p>
-        <p v-if="isShrink" style="color: #fff;">
-          <span>{{ examName }}</span>
-        </p>
-      </div>
-      <div ref="dragBody" class="tip-body-box">
-        <div v-show="detailShow" class="tip-body">
-          <el-scrollbar wrap-class="scrollbar-wrapper">
-            <el-tree
-              ref="treeQuestion"
-              :data="trainingList"
-              node-key="id"
-              highlight-current
-              @node-click="getTrainDetail"
-            >
-              <span slot-scope="{ node, data }">
-                <span :style="{color: data.usedTime !== undefined ? 'green':''}">&nbsp;{{ trainingList.indexOf(data)+1 }}.{{
-                  data.trainingName }}
-                </span>
-              </span>
-            </el-tree>
-          </el-scrollbar>
-        </div>
-        <div v-show="!detailShow" class="tip-body">
-          <el-scrollbar wrap-class="scrollbar-wrapper">
-            <p class="list-item">
-              <span class="list-label">{{ $t('display.exam.questionTitle') }}</span>
-              <span class="list-elem">{{ courseModel.name }}</span>
-            </p>
-            <p class="list-item">
-              <span class="list-label">{{ $t('display.exam.bestTime') }}</span>
-              <span class="list-elem">{{ courseModel.minDuration }} {{ $t('display.seconds') }} </span>
-            </p>
-            <p class="list-item">
-              <span class="list-label">{{ $t('display.exam.maximumTime') }}</span>
-              <span class="list-elem">{{ courseModel.maxDuration }} {{ $t('display.seconds') }} </span>
-            </p>
-            <p class="list-item">
-              <span class="list-label"> {{ $t('display.exam.trainingInstructions') }}</span>
-              <span class="list-elem">{{ courseModel.remarks }}</span>
-            </p>
-          </el-scrollbar>
-        </div>
-        <div class="tip-foot">
-          <div v-show="!detailShow" class="foot-detail">
-            <el-button class="btn" @click="backList">{{ $t('display.exam.viewQuestions') }}</el-button>
-            <el-button v-if="!isFirst" class="btn" type="primary" @click="lastExam">{{ $t('display.exam.prev') }}</el-button>
-            <el-button v-if="!isLast" class="btn" type="primary" @click="nextExam">{{ $t('display.exam.next') }}</el-button>
-            <el-button v-if="isLast" class="btn" type="primary" @click="overExam">{{ $t('display.exam.submitExaminationPaper') }}</el-button>
-          </div>
-          <div v-show="detailShow" class="foot-submit">
-            <el-button class="btn" type="primary" @click="overExam">{{ $t('display.exam.submitExaminationPaper') }}</el-button>
-          </div>
-          <p style="color: #000; float: left;">
-            <span class="time-label">{{ $t('display.exam.examTime') }}</span>
-            <span class="time-elem">{{ formatRemainTime }}</span>
-          </p>
-        </div>
-        <div class="drag-right" />
-        <div class="drag-left" />
-        <div class="drag-bottom" />
-        <div class="drag-top" />
-      </div>
-    </div>
-  </div>
-</template>
-
-<script>
-import { mapGetters } from 'vuex';
-import { timeFormat } from '@/utils/date';
-import { refreshExamList } from '@/api/management/userexam';
-import { getTrainingDetail } from '@/api/jmap/training';
-import { launchFullscreen } from '@/utils/screen';
-
-export default {
-    name: 'TipExamList',
-    components: {
-    },
-    data() {
-        return {
-            training: {
-                id: '',
-                name: '',
-                remarks: ''
-            },
-            isShrink: true,
-            examName: '',
-            courseModel: {
-                id: '',
-                name: '',
-                maxDuration: '',
-                minDuration: '',
-                remarks: '',
-                updateTime: ''
-            },
-            detailShow: false,
-            examIndex: 0,
-            scanInter:null
-        };
-    },
-    computed: {
-        ...mapGetters('trainingList', [
-            'trainingList'
-        ]),
-        remainTime() {
-            return this.$store.state.exam.totalTime - this.$store.state.exam.usedTime;
-        },
-        formatRemainTime() {
-            return this.remainTime >= 0 ? timeFormat(this.remainTime) : '';
-        },
-        isFirst() {
-            return this.examIndex == 0;
-        },
-        isLast() {
-            return this.examIndex == this.trainingList.length - 1;
-        }
-    },
-    watch: {
-        '$store.state.map.mapViewLoadedCount': function() {
-            this.$store.dispatch('exam/stopCountTime');
-            this.loadInitData();
-            this.$store.dispatch('exam/countUsedTime');
-        }
-    },
-    beforeDestroy() {
-        this.clearScanCommit();
-    },
-    methods: {
-        backList() {
-            this.detailShow = true;
-            this.$nextTick(() => {
-                this.$refs.treeQuestion.setCurrentKey(this.$route.query.examQuestionId); // value 绑定的node-key
-            });
-        },
-        // 获取试题详情
-        selectedTraining(obj) {
-            this.trainingList.forEach((item, index) => {
-                if (item.id == obj.id) {
-                    this.examIndex = index;
-                    return;
-                }
-            });
-            if (obj) {
-                getTrainingDetail(obj.trainingId).then(res => {
-                    this.courseModel = {
-                        id: res.data.id,
-                        name: res.data.name,
-                        maxDuration: res.data.maxDuration,
-                        remarks: res.data.remarks,
-                        minDuration: res.data.minDuration,
-                        updateTime: res.data.updateTime
-                    };
-                    this.$store.dispatch('exam/setCenter ', res.data.locateDeviceCode);
-                }).catch(error => {
-                    this.$message.error(this.$t('display.exam.getTestInformation') + ':' + error.message);
-                });
-            }
-
-            this.jump(obj);
-        },
-        getTrainDetail(obj) {
-            this.selectedTraining(obj);
-            this.detailShow = false;
-        },
-        // 获取试题列表
-        async loadInitData() {
-            // 刷新考试列表
-            refreshExamList(this.$route.query.userExamId).then(response => {
-                this.examName = response.data.examName;
-                this.$store.commit('exam/setUsedTime', response.data.usedTime);
-                this.$store.commit('exam/setTotalTime', response.data.duration);
-                this.$store.commit('trainingList/setTrainingList', response.data.userExamQuestionsVOs);
-                const obj = {
-                    trainingId: '',
-                    id: ''
-                };
-
-                if (this.$route.query.examQuestionId && this.$route.query.trainingId) {
-                    obj.trainingId = this.$route.query.trainingId;
-                    obj.id = this.$route.query.examQuestionId;
-                } else {
-                    obj.trainingId = response.data.userExamQuestionsVOs[0].trainingId;
-                    obj.id = response.data.userExamQuestionsVOs[0].id;
-                }
-                this.selectedTraining(obj);
-                this.scanCommit();
-            }).catch(error => {
-                // 如果时50009则表示考试已完成，不能再次进行y
-                if (error.code === 500009) {
-                    this.$router.replace({ path: `/trainingPlatform/result/${this.$route.params.userExamId}`, query: { subSystem: this.$route.query.subSystem, mapId:this.$route.query.mapId } });
-                } else {
-                    this.$messageBox(this.$t('display.exam.refreshListError'));
-
-                }
-            });
-        },
-        scanCommit() {
-            this.clearScanCommit();
-            this.scanInter = setInterval(()=>{
-                if (this.remainTime < 0) {
-                    this.$message.success(this.$t('display.exam.autoSubmit'));
-                    this.clearScanCommit();
-                    this.submit();
-                }
-            }, 1000);
-        },
-        clearScanCommit() {
-            clearInterval(this.scanInter);
-            this.scanInter = null;
-        },
-        nextExam() {
-            const obj = {
-                trainingId: '',
-                id: ''
-            };
-            if (this.trainingList[this.examIndex + 1] && this.trainingList[this.examIndex + 1].trainingId) {
-                obj.trainingId = this.trainingList[this.examIndex + 1].trainingId;
-                obj.id = this.trainingList[this.examIndex + 1].id;
-                this.examIndex = this.examIndex + 1;
-            }
-            if (obj.trainingId && obj.id) {
-                this.selectedTraining(obj);
-            }
-        },
-        lastExam() {
-            const obj = {
-                trainingId: '',
-                id: ''
-            };
-            if (this.trainingList[this.examIndex - 1] && this.trainingList[this.examIndex - 1].trainingId) {
-                obj.trainingId = this.trainingList[this.examIndex - 1].trainingId;
-                obj.id = this.trainingList[this.examIndex - 1].id;
-                this.examIndex = this.examIndex - 1;
-            }
-            if (obj.trainingId && obj.id) {
-                this.selectedTraining(obj);
-            }
-        },
-        jump(obj) {
-            const query = {
-                group: this.$route.query.group,
-                userExamId: this.$route.query.userExamId,
-                trainingId: obj.trainingId,
-                examQuestionId: obj.id,
-                subSystem: this.$route.query.subSystem,
-                examId: this.$route.query.examId,
-                mapId: this.$route.query.mapId
-            };
-            this.$router.replace({ path: '/display/exam', query: query });
-            this.$emit('refresh');
-            launchFullscreen();
-        },
-        overExam() {
-            this.$store.dispatch('exam/isOver').then(isOver => {
-                if (isOver) {
-                    this.submit();
-                } else {
-                    this.$confirm(this.$t('display.exam.cancleExam'), this.$t('global.tips'), {
-                        cancelButtonText: this.$t('global.cancel'),
-                        confirmButtonText: this.$t('global.confirm'),
-                        type: 'warning',
-                        center: true
-                    }).then(() => {
-                        this.submit();
-                    }).catch(() => {
-                    });
-                }
-            });
-        },
-        submit() {
-            this.$store.dispatch('exam/over').then(() => {
-                this.$store.dispatch('trainingList/clearTrainingList');
-                this.$router.replace({ path: `/trainingPlatform/result/${this.$route.query.userExamId}`, query: { subSystem: this.$route.query.subSystem, mapId:this.$route.query.mapId } });
-            });
-        },
-        shrink() {
-            const height = this.$refs.dragBody.offsetHeight + 40;
-            const top = this.$refs.drapBox.style.top;
-            if (this.isShrink) {
-                this.$refs.drapBox.style.height = '40px';
-                this.$refs.drapBox.style.top = '';
-                this.isShrink = false;
-            } else {
-                this.$refs.drapBox.style.height = height + 'px';
-                this.$refs.drapBox.style.top = top;
-                this.isShrink = true;
-            }
-        }
-    }
-};
-</script>
-<style rel="stylesheet/scss" lang="scss" scoped>
-    @import "src/styles/mixin.scss";
-
-    .tip-body-box {
-        position: relative;
-        height: 430px;
-    }
-
-    .reminder-box {
-        position: absolute;
-        float: left;
-        left: 15px;
-        bottom: 15px;
-        width: 650px;
-        height: 470px;
-        background-color: #fff;
-        border-radius: 5px;
-        overflow: hidden;
-        z-index: 10;
-        font-size: 18px;
-
-        .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: space-between;
-            padding: 0 10px;
-        }
-
-        .drag-right,
-        .drag-left {
-            width: 10px;
-            cursor: e-resize;
-            background-color: yellow;
-            height: 100%;
-            position: absolute;
-            right: 0;
-            top: 0;
-            opacity: 0;
-        }
-
-        .drag-left {
-            left: 0;
-        }
-
-        .drag-bottom {
-            position: absolute;
-            bottom: 0;
-            width: 100%;
-            height: 10px;
-            cursor: s-resize;
-            background-color: yellow;
-            opacity: 0;
-        }
-
-        .drag-top {
-            position: absolute;
-            top: -45px;
-            left: 0;
-            width: 100%;
-            height: 10px;
-            cursor: s-resize;
-            background-color: yellow;
-            opacity: 0;
-        }
-
-        .tip-body {
-            height: 366px;
-            padding: 10px;
-
-            .list-label {
-                width: 105px;
-            }
-        }
-
-        .tip-foot {
-            width: 100%;
-            position: absolute;
-            right: 0px;
-            bottom: 0px;
-            background-color: #fff;
-            padding: 10px 0 10px 10px;
-
-            .foot-detail {
-                height: 100%;
-                float: right;
-                margin-top: 9px;
-                padding-right: 15px;
-            }
-
-            .foot-submit {
-                float: right;
-                margin-top: 9px;
-                padding-right: 15px;
-            }
-        }
-
-        .icon {
-            float: right;
-            margin-right: 10px;
-            cursor: pointer;
-            background-color: #f3f3f3;
-            border-radius: 50%;
-        }
-
-        /deep/ {
-            .el-tree-node__content {
-                margin-bottom: 4px;
-            }
-
-            .el-tree--highlight-current .el-tree-node.is-current>.el-tree-node__content {
-                background-color: #d6e5f7;
-            }
-        }
-    }
-</style>
diff --git a/src/views/oldMap/display/tipTrainingDetail.vue b/src/views/oldMap/display/tipTrainingDetail.vue
deleted file mode 100644
index 63dde3d7e..000000000
--- a/src/views/oldMap/display/tipTrainingDetail.vue
+++ /dev/null
@@ -1,270 +0,0 @@
-<template>
-  <!-- v-drag  拖拽 调整宽高 -->
-  <div v-quickMenuDrag class="reminder-drag">
-    <div ref="drapBox" class="reminder-box">
-      <div class="tip-title">
-        <i v-show="!isShrink" class="icon el-icon-minus" @click="shrink" />
-        <i v-show="isShrink" class="icon el-icon-plus" @click="shrink" />
-        <p v-if="isShrink" style="color: #fff;">
-          <span>{{ lessonName }}</span>
-        </p>
-      </div>
-      <div ref="dragBody" class="tip-body-box">
-        <div class="tip-body">
-          <el-scrollbar wrap-class="scrollbar-wrapper">
-            <p class="list-item">
-              <span class="list-label">{{ $t('display.training.trainingName') }}</span>
-              <span class="list-elem">{{ courseModel.name }}</span>
-            </p>
-            <p class="list-item">
-              <span class="list-label">{{ $t('display.training.bestTime') }}</span>
-              <span class="list-elem">{{ courseModel.minDuration }} {{ $t('display.seconds') }} </span>
-            </p>
-            <p class="list-item">
-              <span class="list-label">{{ $t('display.training.maximumTime') }}</span>
-              <span class="list-elem">{{ courseModel.maxDuration }} {{ $t('display.seconds') }} </span>
-            </p>
-            <p class="list-item">
-              <span class="list-label"> {{ $t('display.training.trainingInstructions') }}</span>
-              <span class="list-elem">{{ courseModel.remarks }}</span>
-            </p>
-          </el-scrollbar>
-        </div>
-        <div class="drag-right" />
-        <div class="drag-left" />
-        <div class="drag-bottom" />
-        <div class="drag-top" />
-      </div>
-    </div>
-  </div>
-</template>
-
-<script>
-import { mapGetters } from 'vuex';
-import { getPublishLessonDetail } from '@/api/jmap/lesson';
-import { launchFullscreen } from '@/utils/screen';
-
-export default {
-    name: 'TipTrainingDetail',
-    props: {
-        trainingObj: {
-            type: Object,
-            default() {
-                return null;
-            }
-        }
-    },
-    data() {
-        return {
-            training: {
-                id: '',
-                name: '',
-                remarks: ''
-            },
-            isShrink: false,
-            lessonName: '',
-            courseModel: {
-                id: '',
-                name: '',
-                maxDuration: '',
-                minDuration: '',
-                remarks: '',
-                updateTime: ''
-            },
-            showSumbit: false,
-            lessonIndex: 0
-        };
-    },
-    computed: {
-        ...mapGetters('trainingList', [
-            'trainingList'
-        ])
-    },
-    watch: {
-        'trainingObj': function (val) {
-            if (val) {
-                this.courseModel = {
-                    id: val.id,
-                    name: val.name,
-                    maxDuration: val.maxDuration,
-                    minDuration: val.minDuration,
-                    remarks: val.remarks,
-                    updateTime: val.updateTime
-                };
-            }
-        }
-    },
-    mounted() {
-        this.loadInitData(this.$route.query);
-    },
-    methods: {
-        loadInitData(obj) {
-            this.showSumbit = false;
-            this.lessonName = '';
-            this.courseModel = {
-                id: '',
-                name: '',
-                maxDuration: '',
-                minDuration: '',
-                remarks: '',
-                updateTime: ''
-            };
-
-            if (parseInt(obj.lessonId)) {
-                getPublishLessonDetail({ id: obj.lessonId }).then(response => {
-                    this.lessonName = response.data.name;
-                }).catch(error => {
-                    this.$message.error(this.$t('display.training.getCourseInformationFail') + ':' + error.message);
-                });
-            }
-        },
-        jump(obj) {
-            const query = {
-                group: this.$route.query.group,
-                trainingId: this.$route.query.trainingId,
-                lessonId: this.$route.query.lessonId
-            };
-            this.$router.push({ path: `/display/${this.$route.params.mode}`, query: query });
-            launchFullscreen();
-        },
-        shrink() {
-            const height = this.$refs.dragBody.offsetHeight + 40;
-            const top = this.$refs.drapBox.style.top;
-            if (this.isShrink) {
-                this.$refs.drapBox.style.height = height + 'px';
-                this.$refs.drapBox.style.top = top;
-                this.isShrink = false;
-            } else {
-                this.$refs.drapBox.style.height = '40px';
-                this.$refs.drapBox.style.top = '';
-                this.isShrink = true;
-            }
-        }
-    }
-};
-</script>
-<style rel="stylesheet/scss" lang="scss" scoped>
-    @import "src/styles/mixin.scss";
-
-    .tip-body-box {
-        position: relative;
-        height: 260px;
-    }
-
-    .reminder-drag{
-      position: relative;
-    }
-
-    .reminder-box {
-        position: absolute;
-        float: left;
-        left: 15px;
-        bottom: 15px;
-        width: 500px;
-        height: 300px;
-        background-color: #fff;
-        border-radius: 5px;
-        overflow: hidden;
-        z-index: 10;
-        font-size: 18px;
-
-        .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: space-between;
-            padding: 0 10px;
-        }
-
-        .drag-right,
-        .drag-left {
-            width: 10px;
-            cursor: e-resize;
-            background-color: yellow;
-            height: 100%;
-            position: absolute;
-            right: 0;
-            top: 0;
-            opacity: 0;
-        }
-
-        .drag-left {
-            left: 0;
-        }
-
-        .drag-bottom {
-            position: absolute;
-            bottom: 0;
-            width: 100%;
-            height: 10px;
-            cursor: s-resize;
-            background-color: yellow;
-            opacity: 0;
-        }
-
-        .drag-top {
-            position: absolute;
-            top: -45px;
-            left: 0;
-            width: 100%;
-            height: 10px;
-            cursor: s-resize;
-            background-color: yellow;
-            opacity: 0;
-        }
-
-        .tip-body {
-            height: 366px;
-            padding: 10px;
-
-            .list-label {
-                width: 105px;
-            }
-        }
-
-        .tip-foot {
-            width: 100%;
-            position: absolute;
-            right: 0px;
-            bottom: 0px;
-            background-color: #fff;
-            padding: 10px 0 10px 10px;
-
-            .foot-detail {
-                height: 100%;
-                float: right;
-                margin-top: 9px;
-                padding-right: 15px;
-            }
-
-            .foot-submit {
-                float: right;
-                margin-top: 9px;
-                padding-right: 15px;
-            }
-        }
-
-        .icon {
-            float: right;
-            margin-right: 10px;
-            cursor: pointer;
-            background-color: #f3f3f3;
-            border-radius: 50%;
-        }
-
-        /deep/ {
-            .el-tree-node__content {
-                margin-bottom: 4px;
-            }
-
-            .el-tree--highlight-current .el-tree-node.is-current>.el-tree-node__content {
-                background-color: #d6e5f7;
-            }
-        }
-    }
-</style>
diff --git a/src/views/oldMap/jlmap/index.vue b/src/views/oldMap/jlmap/index.vue
deleted file mode 100644
index 1742eb91f..000000000
--- a/src/views/oldMap/jlmap/index.vue
+++ /dev/null
@@ -1,339 +0,0 @@
-<template>
-  <div class="jlmap-canvas" :style="{ width: width+'px', height: height+'px' }">
-    <div v-show="maskOpen" class="mask" />
-    <div :id="canvasId" style="background: #000;" />
-    <progress-bar ref="progressBar" />
-    <zoom-box v-if="!isScreen" :scale-rate="dataZoom.scaleRate" @setShrink="setShrink" @setMagnify="setMagnify" />
-    <div v-if="show" class="zoom-view" :style="{ width: width +'px'}">
-      <el-form :model="dataZoom" label-width="60px" size="mini" inline>
-        <el-form-item :label="$t(`global.offset`)">
-          <el-input v-model="dataZoom.offsetX" :disabled="true" />
-        </el-form-item>
-        <el-form-item>
-          <el-input v-model="dataZoom.offsetY" :disabled="true" />
-        </el-form-item>
-        <el-form-item :label="$t(`global.zoom`)" style="float: right">
-          <el-input v-model="dataZoom.scaleRate" :disabled="true" />
-        </el-form-item>
-      </el-form>
-    </div>
-  </div>
-</template>
-
-<script>
-import Vue from 'vue';
-import localStore from 'storejs';
-import Jlmap from '@/jmap/map';
-import ZoomBox from './zoom/zoom';
-import ProgressBar from '@/views/components/progressBar/index';
-import { mapGetters } from 'vuex';
-import { TrainingMode } from '@/scripts/ConstDic';
-import { EventBus } from '@/scripts/event-bus';
-import Theme from '@/jmap/theme/factory';
-
-export default {
-    name: 'JlmapVisual',
-    components: {
-        ZoomBox,
-        ProgressBar
-    },
-    data() {
-        return {
-            loading: true,
-            dataZoom: {
-                offsetX: '0',
-                offsetY: '0',
-                scaleRate: '1'
-            },
-            sectionActive: false,
-            operate: null
-        };
-    },
-    computed: {
-        ...mapGetters('training', [
-            'mode',
-            'offsetStationCode'
-        ]),
-        canvasId() {
-            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;
-        },
-        height() {
-            return this.$store.state.config.height;
-        },
-        show() {
-            if (this.mode == TrainingMode.EDIT || this.mode == TrainingMode.MAP_EDIT) {
-                return true;
-            }
-            return false;
-        },
-        isScreen() {
-            return this.$route.params.mode == 'dp' || this.$store.state.training.roles == 'BigScreen';
-        },
-        maskOpen() {
-            return this.$store.state.config.maskOpen;
-        }
-    },
-    watch: {
-        '$store.state.map.map': function (val, old) {
-            try {
-                if (val) {
-                    this.setMap(val);
-                }
-                // else {
-                //     this.mapViewLoaded(false);
-                // }
-            } catch (error) {
-                console.log('[ERROR] ', error);
-                this.mapViewLoaded(false);
-            }
-        },
-        '$store.state.training.rezoomCount': function (val, old) {
-            this.setCenter(this.$store.state.training.offsetStationCode);
-        },
-        '$store.state.exam.deviceCode': function (val) {
-            val && this.setCenter(val);
-        },
-        '$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);
-        }
-    },
-    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);
-        });
-    },
-    mounted() {
-        this.initLoadPage();
-    },
-    beforeDestroy() {
-        EventBus.$off('refresh');
-        EventBus.$off('viewLoading');
-        EventBus.$off('viewProgressAt');
-        this.$store.dispatch('map/mapClear');
-        if (this.$jlmap) {
-            this.$jlmap.dispose();
-        }
-    },
-    methods: {
-        // 初始化jlmap
-        initLoadPage() {
-            document.getElementById(this.canvasId).oncontextmenu = function (e) {
-                return false;
-            };
-            // 默认个人地图绘制可以滚轮放大缩小 其他地图显示不允许此操作
-            const path = window.location.href;
-            let mouseWheelFlag = false;
-            if (path.includes('design/userlist/map/draw')) {
-                mouseWheelFlag = true;
-            }
-            Vue.prototype.$theme = new Theme();
-            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
-                },
-                methods: {
-                    dataLoaded: this.handleDataLoaded,
-                    viewLoaded: this.handleViewLoaded,
-                    stateLoaded: this.handleStateLoaded
-                }
-            });
-
-            this.$jlmap.on('dataZoom', this.onDataZoom, this);
-            this.$jlmap.on('selected', this.onSelected, this);
-            this.$jlmap.on('contextmenu', this.onContextMenu, this);
-            this.$jlmap.on('keyboard', this.onKeyboard, this);
-
-            window.document.oncontextmenu = function () {
-                return false;
-            };
-        },
-        // 重置jlmap宽高
-        resetSize() {
-            this.$nextTick(() => {
-                this.$jlmap && this.$jlmap.resize({ width: this.width, height: this.height });
-
-                this.$store.dispatch('training/updateOffsetStationCode', { offsetStationCode: this.offsetStationCode });
-
-                setTimeout(() => {
-                    this.$store.dispatch('config/resetCanvasOffset');
-                    this.$store.dispatch('training/emitTipFresh');
-                }, 100);
-            });
-        },
-        // 设置显示图级
-        setLayerVisible(layer) {
-            this.$jlmap && this.$jlmap.setLayerVisible(layer);
-        },
-        // 设置显示图层
-        setLevelVisible(levels) {
-            this.$jlmap && this.$jlmap.setLevelVisible(levels);
-        },
-        // 设置显示中心
-        setCenter(deviceCode) {
-            this.$jlmap && this.$jlmap.setCenter(deviceCode);
-        },
-        // 地图数据加载完成
-        handleDataLoaded() {
-            this.$store.dispatch('map/mapDataLoaded');
-        },
-        // 地图视图加载完成
-        handleViewLoaded() {
-            this.$store.dispatch('map/mapViewLoaded');
-            if (!this.$store.state.training.prdType) {
-                this.mapViewLoaded(false);
-            }
-        },
-        // 地图状态加载完成
-        handleStateLoaded() {
-            this.mapViewLoaded(false);
-        },
-        // 地图视图更新
-        handleViewUpdate() {
-        },
-        // 地图状态更新
-        handleStateUpdate() {
-        },
-        // 视图参数改变
-        handleOptionsUpdate(options) {
-        },
-        // 键盘快捷键事件
-        onKeyboard(hook) {
-            switch (hook) {
-            case 'Control_Z': this.$store.dispatch('map/setRevocation');
-                break;
-            case 'Control_Y': this.$store.dispatch('map/setRecover');
-                break;
-            }
-        },
-        // 视图缩放事件
-        onDataZoom(dataZoom) {
-            this.dataZoom.offsetX = dataZoom.offsetX.toFixed(1) + '';
-            this.dataZoom.offsetY = dataZoom.offsetY.toFixed(1) + '';
-            this.dataZoom.scaleRate = dataZoom.scaleRate + '';
-
-            const lineCode = this.$store.getters['map/lineCode'];
-            if (lineCode) {
-                const param = {
-                    scaleRate: this.dataZoom.scaleRate,
-                    offsetY: this.dataZoom.offsetY,
-                    offsetX: this.dataZoom.offsetX,
-                    lineCode: lineCode
-                };
-                this.$store.dispatch('map/updateZoom', this.dataZoom);
-                localStore.set(`scaleRate_${lineCode}`, JSON.stringify(param)); // 保存缩放倍数
-            }
-
-            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);
-        },
-        // 刷新地图数据
-        refresh(map) {
-        },
-        // 缩小
-        setShrink() {
-            this.$jlmap.setOptions({type: 'zoom', scale: -1});
-        },
-        // 放大
-        setMagnify() {
-            this.$jlmap.setOptions({type: 'zoom', scale: 1});
-        }
-    }
-};
-</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;
-    }
-
-    .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/oldMap/jlmap/zoom/zoom.vue b/src/views/oldMap/jlmap/zoom/zoom.vue
deleted file mode 100644
index 562c6ac4a..000000000
--- a/src/views/oldMap/jlmap/zoom/zoom.vue
+++ /dev/null
@@ -1,99 +0,0 @@
-<template>
-  <div class="zoom-box" :style="{top: offset+'px'}">
-    <el-button class="shrink zoom" :disabled="scaleRate == 0.8" @click="setShrinkCanvas">
-      <i class="el-icon-minus" />
-    </el-button>
-    <el-button class="magnify zoom" :disabled="scaleRate == 8" @click="setMagnifyCanvas">
-      <i class="el-icon-plus" />
-    </el-button>
-  </div>
-</template>
-<script>
-export default {
-	name: 'ZoomBox',
-	props: {
-		scaleRate: {
-			type: String,
-			default() {
-				return '1';
-			}
-		}
-	},
-	data() {
-		return {
-			offset: 15
-		};
-	},
-	watch: {
-		'$store.state.config.menuBarLoadedCount': function (val) {
-			this.$nextTick(() => {
-				this.setPosition();
-			});
-		}
-	},
-	methods: {
-		setPosition() {
-			this.$nextTick(() => {
-				let offset = 15;
-				const menuBar = document.getElementById('menuBar');
-				const menuTool = document.getElementById('menuTool');
-
-				if (menuBar) {
-					offset += (menuBar.offsetHeight || 0);
-				}
-
-				if (menuTool) {
-					offset += (menuTool.offsetHeight || 0);
-				}
-
-				if (this.offset != offset) {
-					this.offset = offset;
-				}
-			});
-		},
-		setShrinkCanvas() {
-			this.$emit('setShrink');
-		},
-		setMagnifyCanvas() {
-			this.$emit('setMagnify');
-		}
-	}
-};
-</script>
-<style rel="stylesheet/scss" lang="scss" scoped>
-    .zoom-box {
-        z-index: 7;
-        position: absolute;
-        left: 20px;
-        width: 120px;
-        height: 32px;
-        background: rgb(224, 223, 223);
-        border-radius: 4px;
-        overflow: hidden;
-
-        .zoom {
-            width: 50%;
-            float: left;
-            height: 100%;
-            margin: 0;
-            padding: 0;
-            border-radius: 0;
-            display: flex;
-            justify-content: center;
-            align-items: center;
-            border: none;
-            outline: none;
-            color: #333;
-
-            i {
-                color: #000;
-                font-size: 18px;
-                font-weight: 900;
-            }
-        }
-
-        .shrink {
-            border-right: 1px solid #333;
-        }
-    }
-</style>
diff --git a/src/views/oldMap/jointTraining/index.vue b/src/views/oldMap/jointTraining/index.vue
deleted file mode 100644
index 8a436c66e..000000000
--- a/src/views/oldMap/jointTraining/index.vue
+++ /dev/null
@@ -1,420 +0,0 @@
-<template>
-  <div class="main" :style="{width: canvasWidth+'px'}" @mousemove="mousemove">
-    <Jl3d-Drive v-show="drivingShow" ref="Jl3dDrive" :panel-show="drivingShow" @showdriving="showdriving" />
-    <ibp-plate v-show="ibpShow" ref="ibpPlate" @hideIbp="hideIbp" />
-    <div v-show="panelShow" :panelShow="panelShow">
-      <transition name="el-zoom-in-bottom">
-        <map-system-draft ref="mapCanvas" @back="back" />
-      </transition>
-      <menu-demon-joint ref="demonMenu" :group="group" :user-role="userRole" :device-code="deviceCode" @getUserRole="getUserRole" @hidepanel="hidepanel" @showIbp="showIbp" />
-      <menu-demon-schema
-        ref="menuSchema"
-        :group="group"
-        :offset="offset"
-        :user-role="userRole"
-        @runPlanLoadShow="runPlanLoadShow"
-        @runPlanViewShow="runPlanViewShow"
-        @faultChooseShow="faultChooseShow"
-      />
-      <join-fault-choose ref="faultChoose" :group="group" />
-      <join-run-plan-Load ref="runPlanLoad" :group="group" />
-      <join-run-plan-view ref="runPlanView" :group="group" />
-      <menu-system-time ref="menuSystemTime" :offset="offset" :group="group" :right="right" />
-    </div>
-  </div>
-
-</template>
-
-<script>
-import { getToken } from '@/utils/auth';
-import { creatSubscribe, clearSubscribe, roomTopic} from '@/utils/stomp';
-import MapSystemDraft from '@/views/oldMap/mapsystem/index';
-import MenuDemonJoint from './menuDemon';
-import MenuDemonSchema from './menuSchema';
-import JoinFaultChoose from '@/views/oldMap/display/demon/faultChoose';
-import JoinRunPlanLoad from '@/views/oldMap/display/demon/runPlanLoad';
-import JoinRunPlanView from '@/views/oldMap/display/demon/runPlanView';
-import menuSystemTime from '@/views/oldMap/display/menuSystemTime';
-import IbpPlate from '@/views/ibp/ibpsystem/index';
-import { mapGetters } from 'vuex';
-import { OperateMode, TrainingMode } from '@/scripts/ConstDic';
-import { checkLoginLine } from '@/api/login';
-import { loadMapDataById } from '@/utils/loaddata';
-import { getUserRoles, deljointTrainRoom } from '@/api/chat';
-import { runDiagramOver, getSimulationInfo } from '@/api/simulation';
-import Jl3dDrive from '@/views/jlmap3d/drive/jl3ddrive';
-import { EventBus } from '@/scripts/event-bus';
-import ibpData from '@/ibp/constant/ibpData';
-import { Message } from 'element-ui';
-
-export default {
-    name: 'JointTrainingDraft',
-    components: {
-        MapSystemDraft,
-        MenuDemonJoint,
-        MenuDemonSchema,
-        JoinFaultChoose,
-        JoinRunPlanLoad,
-        JoinRunPlanView,
-        menuSystemTime,
-        Jl3dDrive,
-        IbpPlate
-    },
-    data() {
-        return {
-            trainingObj: {},
-            checkLine: null,
-            timeDemonNum: 0,
-            offset: 10,
-            mouseNum: 1,
-            ierval: null,
-            mouseNumTime: 0,
-            mapBox: null,
-            mapBoxP: null,
-            userRole: '',
-            deviceCode: '',
-            group: '',
-            mapId: '',
-            lineCode: '',
-            simulationShow: false,
-            drivingShow: false,
-            ibpShow: false,
-            panelShow: true,
-            ibpPart: ''
-        };
-    },
-    computed: {
-        ...mapGetters([
-            'canvasWidth',
-            'canvasHeight'
-        ]),
-        ...mapGetters('map', [
-            'map'
-        ]),
-        ...mapGetters('training', [
-            'offsetStationCode'
-        ]),
-        ...mapGetters('config', [
-            'canvasId'
-        ]),
-        width() {
-            return this.$store.state.app.width;
-        },
-        height() {
-            return this.$store.state.app.height;
-        },
-        right() {
-            return this.$store.state.config.width / 2 - 55;
-        },
-        userId() {
-            return this.$store.state.user ? this.$store.state.user.id : '';
-        }
-    },
-    watch: {
-        '$store.state.config.menuBarLoadedCount': function (val) {
-            this.setPosition();
-        },
-        '$store.state.map.mapViewLoadedCount': function (val) {
-            this.mapBoxP = document.getElementById(this.canvasId).children[0];
-            this.mapBox = document.getElementsByTagName('canvas');
-        },
-        '$store.state.socket.permissionOver': function () {
-            this.$alert(this.$t('tip.userRightsHaveBeenReclaimed'), this.$t('tip.hint'), {
-                confirmButtonText: this.$t('global.confirm'),
-                showClose: false,
-                callback: async (action) => {
-                    await this.$store.dispatch('training/over');
-                    await runDiagramOver(this.group);
-                    await deljointTrainRoom(this.group);
-                    this.$router.go(-1);
-                }
-            });
-        },
-        '$store.state.socket.jointRoomInfo': function (val) { //  综合演练房间信息
-            if (val.creatorId) {
-                this.handleRoomInfo(val);
-            }
-        },
-        '$store.state.socket.roleList': function (val) { // 综合演练被踢出房间
-            val.forEach(elem => {
-                if (elem.id == this.userId && !elem.userRole) {
-                    this.$router.go(-1);
-                    this.messageInfo(this.$t('tip.beKickedOut'), 'warning');
-                }
-            });
-        },
-        '$store.state.app.windowSizeCount': function() {
-            this.setWindowSize();
-        },
-        $route() {
-            this.$nextTick(() => {
-                this.initLoadData();
-            });
-        }
-    },
-    async created() {
-        this.group = this.$route.query.group;
-        this.mapId = this.$route.query.mapId;
-        this.lineCode = this.$route.query.lineCode;
-        Message.closeAll();
-    },
-    async mounted() {
-        await this.setWindowSize();
-        await this.initLoadData();
-        await this.subscribe();
-    },
-    async beforeDestroy() {
-        await this.clearAllTimer();
-        await this.$store.dispatch('training/end', null);
-        await this.$store.dispatch('training/reset');
-        await this.$store.dispatch('map/mapClear');
-        await this.$store.dispatch('training/setGroup', '');
-        Message.closeAll();
-    },
-    methods: {
-        mousemove(e) {
-            this.mouseNum = 1;
-        },
-        handleRoomInfo(data) {
-            if (data.state == '03') { // 退出房间
-                this.$router.go(-1);
-            } else if (data.state == '01') { // 进入准备中
-                const query = { group: this.group };
-                this.$router.replace({ path: `/trainroom`, query: query });
-            }
-            this.$store.dispatch('socket/setJointRoomInfo'); // 清空房间信息
-        },
-        // 清除检查在线定时器
-        clearAllTimer() {
-            if (this.ierval) {
-                clearTimeout(this.ierval);
-                this.ierval = null;
-            }
-
-            if (this.checkLine) {
-                clearTimeout(this.checkLine);
-                this.checkLine = null;
-            }
-        },
-        // 设置检查在线定时器
-        checkLoginLineTimer() {
-            if (this.checkLine) {
-                clearTimeout(this.checkLine);
-            }
-
-            this.checkLine = setInterval(() => {
-                checkLoginLine();
-            }, 5000 * 60);
-        },
-        // 设置手标显示状态
-        checkMouseStatusTimer() {
-            if (this.ierval) {
-                clearTimeout(this.ierval);
-            }
-
-            this.ierval = setInterval(() => {
-                if (this.mouseNum) {
-                    this.mouseNum = 0;
-                    this.mouseNumTime = 0;
-                } else {
-                    this.mouseNumTime += 1;
-                }
-                if (this.mapBox) {
-                    if (this.mouseNumTime >= 15) {
-                        for (let i = 0; i < this.mapBox.length; i++) {
-                            this.mapBox[i].style.cursor = 'none';
-                        }
-                    } else {
-                        for (let i = 0; i < this.mapBox.length; i++) {
-                            this.mapBox[i].style.cursor = '';
-                        }
-                    }
-                }
-            }, 1000);
-        },
-        // 设置菜单和工具栏位置
-        setPosition() {
-            this.$nextTick(() => {
-                let offset = 10;
-                const menuBar = document.getElementById('menuBar');
-                const menuTool = document.getElementById('menuTool');
-
-                if (menuBar) {
-                    offset += (menuBar.offsetHeight || 0);
-                }
-
-                if (menuTool) {
-                    offset += (menuTool.offsetHeight || 0);
-                }
-
-                if (this.offset != offset) {
-                    this.offset = offset;
-                }
-            });
-        },
-        // 结束加载状态
-        endViewLoading(isSuccess) {
-            if (!isSuccess) {
-                this.$store.dispatch('map/mapClear');
-            }
-
-            this.$nextTick(() => {
-                EventBus.$emit('viewLoading', false);
-            });
-        },
-        // 加载地图数据
-        initLoadData() {
-            const width = document.documentElement.clientWidth;
-            const height = document.documentElement.clientHeight + 200;
-            this.$store.dispatch('config/resize', { width, height });
-
-            try {
-                this.loadSimulationInfo();
-                this.initLoadDemonData();
-                this.checkLoginLineTimer();
-                this.checkMouseStatusTimer();
-            } catch (error) {
-                this.$messageBox( this.$t('error.initializationFailed') + error.message);
-                this.endViewLoading();
-            }
-        },
-        async loadSimulationInfo() {
-            const resp = await getSimulationInfo(this.group);
-            if (resp && resp.code == 200) {
-                this.$store.dispatch('scriptRecord/updateSimulationPause', resp.data.pause);
-                this.questId = Number(resp.data.questId) || 0;
-            }
-        },
-        async getUserRole() {
-            const res = await getUserRoles(this.group);
-            const data = res.data || {};
-            this.userRole = data.userRole;
-            this.deviceCode = data.deviceCode;
-            this.ibpPart = data.ibpPart;
-            if (this.userRole === 'IBP') {
-                this.showIbp(this.deviceCode);
-            } else {
-                this.hideIbp();
-            }
-            return res;
-        },
-        // 仿真系统
-        async initLoadDemonData() {
-            this.$store.dispatch('training/end', TrainingMode.NORMAL);
-            this.$store.dispatch('training/changeOperateMode', { mode: OperateMode.NORMAL }); // 默认为正常模式
-
-            if (this.lineCode) {
-                // 01 现地 02 行调 '' 观众
-                const resp = await this.getUserRole();
-                if (resp && resp.code == 200) {
-                    // Admin 管理员 Instructor 教员 Dispatcher 行调 Attendant 车站 Audience 观众 Driver 司机 Repair 通号 IBP:IBP盘
-                    this.userRole = resp.data.userRole;
-                    switch (this.userRole) {
-                    case 'Admin': this.$store.dispatch('training/setPrdType', '02'); this.$store.dispatch('training/setRoles', 'Admin'); this.hideIbp(); break;
-                    case 'Instructor': this.$store.dispatch('training/setPrdType', '02'); this.$store.dispatch('training/setRoles', 'Instructor'); this.hideIbp(); break;
-                    case 'Dispatcher': this.$store.dispatch('training/setPrdType', '02'); this.$store.dispatch('training/setRoles', 'Dispatcher'); this.hideIbp(); break;
-                    case 'Attendant': this.$store.dispatch('training/setPrdType', '01'); this.$store.dispatch('training/setRoles', 'Attendant'); this.hideIbp(); break;
-                    case 'CI': this.$store.dispatch('training/setPrdType', '01'); this.$store.dispatch('training/setRoles', 'CI'); this.hideIbp(); break;
-                    case 'Audience': this.$store.dispatch('training/setPrdType', ''); this.$store.dispatch('training/setRoles', 'Audience'); this.hideIbp(); break;
-                    case 'Driver': this.$store.dispatch('training/setPrdType', ''); this.$store.dispatch('training/setRoles', 'Driver'); this.hideIbp(); break;
-                    case 'Repair': this.$store.dispatch('training/setPrdType', ''); this.$store.dispatch('training/setRoles', 'Repair'); this.hideIbp(); break;
-                    case 'IBP': this.$store.dispatch('training/setPrdType', ''); this.$store.dispatch('training/setRoles', 'IBP'); this.showIbp(resp.data.deviceCode); break;
-                    case 'BigScreen': this.$store.dispatch('training/setPrdType', ''); this.$store.dispatch('training/setRoles', 'BigScreen'); this.hideIbp(); break;
-                    }
-                }
-                await this.getTrainDetail();
-            } else {
-                this.endViewLoading();
-            }
-        },
-        async getTrainDetail() {
-            try {
-                await loadMapDataById(this.mapId);
-                await this.$store.dispatch('training/setMapDefaultState');
-            } catch (error) {
-                this.$messageBox(this.$t('error.getMapDataFailed'));
-                this.endViewLoading();
-            }
-        },
-        back() {
-            this.$refs.demonMenu.back();
-        },
-        runPlanViewShow() {
-            this.$refs.runPlanView.doShow();
-        },
-        runPlanLoadShow() {
-            this.$refs.runPlanLoad.doShow();
-        },
-        faultChooseShow() {
-            this.$refs.faultChoose.doShow();
-        },
-        showdriving() {
-            this.panelShow = true;
-            this.drivingShow = false;
-            this.ibpShow = false;
-        },
-        showIbp(deviceCode) {
-            if (!this.ibpShow) {
-                this.drivingShow = false;
-                this.panelShow = false;
-                this.ibpShow = true;
-                if (!deviceCode || !ibpData[deviceCode]) {
-                    Message.warning({message: this.$t('error.ibpNoDraw'), duration: 0, showClose: true, type: 'error'});
-                    return;
-                } else {
-                    Message.closeAll();
-                }
-                this.$refs.ibpPlate.show(deviceCode, this.ibpPart);
-            }
-        },
-        hidepanel() {
-            this.panelShow = false;
-            this.drivingShow = true;
-            this.ibpShow = false;
-            this.$refs.Jl3dDrive.show(this.mapId, this.group);
-        },
-        hideIbp() {
-            Message.closeAll();
-            this.drivingShow = false;
-            this.panelShow = true;
-            this.ibpShow = false;
-            if (this.$refs && this.$refs.ibpPlate) {
-                this.$refs.ibpPlate.ibpDestroy();
-            }
-        },
-        messageInfo(message, type) {
-            this.$message({
-                showClose: true,
-                message: message,
-                type: type
-            });
-        },
-        setWindowSize() {
-            this.$nextTick(() => {
-                this.$store.dispatch('config/resize', { width: this.width, height: this.height });
-                this.$store.dispatch('training/updateOffsetStationCode', { offsetStationCode: this.offsetStationCode });
-            });
-        },
-        async subscribe() {
-            if (!this.$store.state.socket.roomIsSubscribe) {
-                this.clearSubscribe();
-                const header = { group: this.group || '', 'X-Token': getToken() };
-                creatSubscribe(`${roomTopic}\/${this.group}`, header);
-                await this.$store.dispatch('socket/setRoomSubscribe', true);
-            }
-        },
-        async clearSubscribe() {
-            clearSubscribe(`${roomTopic}\/${this.group}`);
-            await this.$store.dispatch('socket/setRoomSubscribe', false);
-        }
-    }
-};
-</script>
-<style>
-    .main {
-        display: block;
-        width: 100%;
-        height: 100%;
-        overflow: hidden;
-    }
-</style>
diff --git a/src/views/oldMap/jointTraining/menuDemon.vue b/src/views/oldMap/jointTraining/menuDemon.vue
deleted file mode 100644
index d1ea7bb73..000000000
--- a/src/views/oldMap/jointTraining/menuDemon.vue
+++ /dev/null
@@ -1,446 +0,0 @@
-<template>
-  <div>
-    <div class="display-draft">
-      <el-button-group>
-        <el-button v-if="isShowRelDevice" type="primary" @click="setRelDevice">{{ $t('joinTraining.connectRealDevices') }}</el-button>
-        <el-button v-if="isDriver" type="jumpjlmap3d" @click="jumpjlmap3d">{{ $t('joinTraining.driverPerspective') }}</el-button>
-        <template v-if="isAdmin">
-          <el-button type="success" :disabled="isDisable" @click="selectBeginTime">{{ $t('joinTraining.drivingByPlan') }}</el-button>
-          <el-button type="danger" :disabled="!isDisable" @click="end">{{ $t('joinTraining.exitPlan') }}</el-button>
-        </template>
-        <el-button v-if="!isBigScreen" type="primary" @click="back">{{ $t('global.back') }}</el-button>
-      </el-button-group>
-    </div>
-    <qr-code ref="qrCode" />
-    <set-time ref="setTime" @ConfirmSelectBeginTime="start" />
-    <real-device ref="realDevice" />
-  </div>
-</template>
-
-<script>
-import QrCode from '@/components/QrCode';
-import SetTime from '@/views/oldMap/display/demon/setTime';
-import { runDiagramIsStart, runDiagramStart, runDiagramOver, runDiagramGetTime } from '@/api/simulation';
-import { exitFullscreen } from '@/utils/screen';
-import { putJointTrainingSimulationUser } from '@/api/chat';
-import { timeFormat } from '@/utils/date';
-// import { EventBus } from '@/scripts/event-bus';
-import { getSessionStorage } from '@/utils/auth';
-import RealDevice from './menuDraft/realDevice';
-
-export default {
-    name: 'MenuDemonJoint',
-    components: {
-        QrCode,
-        SetTime,
-        RealDevice
-    },
-    props: {
-        group: {
-            type: String,
-            required: true
-        },
-        userRole: {
-            type: String,
-            required: true
-        },
-        deviceCode: {
-            type: String,
-            default() {
-                return '';
-            }
-        }
-    },
-    data() {
-        return {
-            isDisable: false,
-            timeNow: 0,
-            remainingTime: 0,
-            recordStep: 'BGSetting',
-            training: {
-                id: '',
-                name: '',
-                remarks: ''
-            },
-            chatShow: true,
-            isShowAuto: false,
-            offset: 10,
-            userId: '',
-            activeName: 'first',
-            activeName2: 'second',
-            stationList: [],
-            stationLists: [],
-            minimize: false
-        };
-    },
-    computed: {
-        lineCode() {
-            return this.$route.query.lineCode;
-        },
-        isSpeaking() {
-            return this.userRole != 'Driver' && this.userRole != '';
-        },
-        isDriver() {
-            return this.userRole == 'Driver';
-        },
-        isAdmin() {
-            return this.userRole == 'Admin';
-        },
-        isBigScreen() {
-            return this.userRole == 'BigScreen';
-        },
-        isShowRelDevice() {
-            return getSessionStorage('project').endsWith('gzb') && this.userRole === 'CI';
-        }
-    },
-    watch: {
-        '$store.state.config.menuBarLoadedCount': function (val) {
-            this.setPosition();
-        },
-        '$store.state.map.map.stationList': function (val) { // 执行一次 以后不会有变化
-            if (val && val.length) {
-                this.stationList = val;
-                this.stationLists = val;
-            }
-        },
-        '$store.state.socket.roleList': function (val) {
-            if (val && val.length) {
-                this.$nextTick(() => {
-                    this.addrolesList(val);
-                    this.$store.dispatch('config/updateMenuBar');
-                });
-            }
-        },
-        '$store.state.socket.simulationStart': async function (val) {
-            if (val) {
-                await this.loadSystemTime();
-                this.$store.dispatch('training/simulationStart', { start: true });
-            }
-        }
-    },
-    async mounted() {
-        this.userId = this.$store.state.user.id;
-        await this.initLoadPage();
-    },
-    beforeDestroy() {
-        this.$store.dispatch('training/setGroup', '');
-    },
-    methods: {
-        async initLoadPage() {
-            try {
-                const resp = await runDiagramIsStart(this.group);
-                if (resp && resp.data) {
-                    this.isDisable = true;
-                    this.$store.dispatch('training/simulationStart');
-                } else {
-                    this.isDisable = false;
-                    this.$store.dispatch('training/over');
-                }
-
-                await this.loadSystemTime();
-            } catch (error) {
-                console.log(error);
-            }
-        },
-        // 切换角色tab
-        clickRoles(active) {
-            if (active == 'first') {
-                this.chatShow = true;
-                this.isShowAuto = false;
-                this.$refs.chatView.select(); // 清空选中
-                this.$refs.chat.clearPlay('', ''); // 清空自动播放 会话id
-
-            } else {
-                this.chatShow = false;
-                this.isShowAuto = true;
-                this.$refs.chat.getChathistory('', ''); // 获取所有人列表
-            }
-            this.activeName = active;
-        },
-        loadSystemTime() {
-            runDiagramGetTime(this.group).then(response => {
-                this.$store.dispatch('training/setInitTime', +new Date(`${new Date().getFullYear()} ${timeFormat(response.data)}`));
-            });
-        },
-        handleMinimality(data) {
-            if (data == 'min') {
-                this.minimize = true;
-            } else {
-                this.minimize = false;
-            }
-        },
-        handleChatShow(data) {
-            if (!this.minimize) { // 最大化状态
-                if (this.activeName == 'first') {
-                    this.$refs.chatView.select(data.id);
-                    this.chatShow = false;
-                    this.isShowAuto = false;
-                    this.$refs.chat.handleTextList(data.conversationId);
-                } else {
-                    this.activeName = 'first';
-                    this.handleChatShow(data);
-                }
-            } else { // 最小化状态
-                this.minimize = false;
-                this.handleChatShow(data);
-            }
-        },
-        // 切到未读消息并说话
-        showChatSpeak(data) {
-            this.chatShow = false;
-            this.isShowAuto = false;
-            this.$refs.chat.handleTextList(data.conversationId);
-        },
-        // 获取历史纪录list
-        showChat(obj) {
-            this.chatShow = false;
-            this.$refs.chat.getChathistory(obj.code, obj.id);
-        },
-        handleChatList(data) {
-            this.$refs.chatView.hintInfo(data);
-        },
-        // 设置不显示
-        showChatNone() {
-            this.chatShow = true;
-        },
-        messageInfo(message, type) {
-            this.$message({
-                showClose: true,
-                message: message,
-                type: type
-            });
-        },
-        setPosition() {
-            this.$nextTick(() => {
-                let offset = 10;
-                const menuBar = document.getElementById('menuBar');
-                const menuTool = document.getElementById('menuTool');
-
-                if (menuBar) {
-                    offset += (menuBar.offsetHeight || 0);
-                }
-
-                if (menuTool) {
-                    offset += (menuTool.offsetHeight || 0);
-                }
-
-                if (this.offset != offset) {
-                    this.offset = offset;
-                }
-            });
-        },
-        // 设置用户角色  Admin 管理员 Instructor 教员 Dispatcher 行调 Attendant 车站 Audience 观众 Driver 司机 Repair 通号
-        addrolesList(list) {
-            list.forEach(item => {
-                if (this.userId == 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 'Attendant':
-                        if (!item['deviceCode']) {
-                            this.$store.dispatch('training/setPrdType', ''); this.$store.dispatch('training/setRoles', 'Attendant');
-                            break;
-                        }
-                        this.$store.dispatch('training/setPrdType', '01'); this.$store.dispatch('training/setRoles', 'Attendant');
-                        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', ''); this.$store.dispatch('training/setRoles', 'Driver');
-                        this.$emit('getUserRole');
-                        break;
-                    case 'Repair':
-                        this.$store.dispatch('training/setPrdType', ''); this.$store.dispatch('training/setRoles', 'Repair');
-                        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();
-            }
-        },
-        handleClick(tab, event) {
-            if (this.activeName == 'second') {
-                this.$refs.chat.getChathistory();
-            }
-        },
-        selectBeginTime() {
-            this.$refs.setTime.doShow();
-        },
-        start(model) {
-            this.isDisable = true;
-            runDiagramStart(model, this.group).then(res => {
-                this.$store.dispatch('training/simulationStart').then(() => {
-                    this.$store.dispatch('training/setInitTime', +new Date(`${new Date().getFullYear()} ${model.initTime}`));
-                });
-            }).catch(() => {
-                this.isDisable = false;
-                this.$messageBox(this.$t('error.startSimulationFailed'));
-            });
-        },
-        end() {
-            this.isDisable = false;
-            // EventBus.$emit('trainView');
-            runDiagramOver(this.group).catch(() => {
-                this.$store.dispatch('training/over').then(() => {
-                    this.isDisable = true;
-                    this.$messageBox(this.$t('error.endSimulationFailed'));
-                });
-            });
-        },
-        back() {
-            this.$store.dispatch('training/over').then(() => {
-                putJointTrainingSimulationUser(this.group).then(() => {
-                    this.$router.replace({ path: `/trainroom`, query: { lineCode: this.lineCode, group: this.group } });
-                    exitFullscreen();
-                });
-            });
-        },
-        jumpjlmap3d() {
-            this.$emit('hidepanel');
-        },
-        setRelDevice() {
-            this.$refs.realDevice.doShow();
-        }
-    }
-};
-</script>
-<style rel="stylesheet/scss" lang="scss" scoped>
-    @import "src/styles/mixin.scss";
-    .tabs-roles {
-        overflow: hidden;
-        border-bottom: 1px solid #e4e7ed;
-        height: 40px;
-        line-height: 40px;
-        -webkit-box-sizing: border-box;
-        box-sizing: border-box;
-
-        .roles {
-            padding: 0 20px;
-            height: 41px;
-            list-style: none;
-            font-size: 14px;
-            font-weight: 500;
-            color: #303133;
-            cursor: pointer;
-            border-left: 1px solid #e4e7ed;
-            border-right: 1px solid #e4e7ed;
-            float: left;
-        }
-
-        .roles-first {
-            border-right: none;
-        }
-
-        .roles-active {
-            border-bottom-color: #fff;
-            color: #409EFF;
-        }
-
-        .minimality {
-            float: right;
-            line-height: 40px;
-            margin-right: 10px;
-            cursor: pointer;
-        }
-    }
-
-    .tabs-content {
-        height: 300px;
-        width: 100%;
-        display: flex;
-    }
-
-    .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;
-    }
-
-    .reminder-drag {
-        position: absolute;
-        float: left;
-        left: 10px;
-        bottom: 10px;
-        width: 500px;
-        height: 340px;
-        background-color: #fff;
-        border-radius: 5px;
-        overflow: hidden;
-        z-index: 2;
-        font-size: 18px;
-
-        /deep/ {
-            .el-tabs__header {
-                margin: 0;
-            }
-        }
-
-        .title-bar {
-            height: 40px;
-        }
-
-        .content {
-            height: 300px;
-        }
-    }
-
-    .minimize-box {
-        bottom: 10px;
-        width: 300px;
-        height: 40px;
-
-        .chat-title {
-            float: left;
-            font-size: 16px;
-            margin-left: 10px;
-            line-height: 40px;
-        }
-
-        .minimality {
-            float: right;
-            height: 40px;
-            line-height: 40px;
-            margin-right: 10px;
-            cursor: pointer;
-        }
-    }
-
-    .display-draft {
-        position: absolute;
-        float: right;
-        right: 40px;
-        bottom: 28px;
-    }
-</style>
diff --git a/src/views/oldMap/jointTraining/menuDraft/chooseRole.vue b/src/views/oldMap/jointTraining/menuDraft/chooseRole.vue
deleted file mode 100644
index 0f09f111d..000000000
--- a/src/views/oldMap/jointTraining/menuDraft/chooseRole.vue
+++ /dev/null
@@ -1,94 +0,0 @@
-<template>
-  <el-dialog
-    v-dialogDrag
-    :title="title"
-    :visible.sync="show"
-    width="400px"
-    :before-close="doClose"
-    :z-index="2000"
-    :modal="false"
-    :close-on-click-modal="false"
-    append-to-body
-  >
-    <el-input v-model="filterText" placeholder="输入名称进行过滤" clearable />
-    <ul v-if="filterList.length" class="listBox">
-      <li v-for="item in filterList" :key="item" class="listLi">
-        <el-radio v-model="selected" :label="item"><span>{{ item.name }}</span></el-radio>
-      </li>
-    </ul>
-    <span v-else class="tipLable"> {{ $t('global.temporarilyNoData') }} </span>
-    <span slot="footer" class="dialog-footer">
-      <el-button @click="doClose">{{ $t('global.cancel') }}</el-button>
-      <el-button type="primary" :loading="loading" @click="commit">{{ $t('global.confirm') }}</el-button>
-    </span>
-  </el-dialog>
-</template>
-
-<script>
-export default {
-    name: 'CmdNotice',
-    data() {
-        return {
-            dialogShow: false,
-            title: '',
-            props: {
-                label: 'name'
-            },
-            sourceList: [],
-            filterText: '',
-            selected: '',
-            loading: false
-        };
-    },
-    computed: {
-        show() {
-            return this.dialogShow;
-        },
-        filterList() {
-            return this.sourceList.filter(p => p.name.indexOf(this.filterText) !== -1);
-        }
-    },
-    methods: {
-        doShow(obj) {
-            this.dialogShow = true;
-            this.title = obj.title;
-            this.sourceList = obj.list;
-            this.selected = '';
-        },
-        doClose() {
-            this.dialogShow = false;
-        },
-        commit() {
-            this.$emit('setDriver', this.selected);
-            this.doClose();
-        }
-    }
-};
-
-</script>
-
-<style scoped lang="scss">
-    /deep/ {
-        .el-dialog__body {
-            padding: 0px 20px;
-        }
-    }
-
-    .listBox {
-        margin: 0px;
-        max-height: 270px;
-        overflow-y: auto;
-        padding-inline-start: 0px;
-        width: 100%;
-
-        .listLi {
-            list-style: none;
-            height: 30px;
-            line-height: 30px;
-        }
-    }
-
-    .tipLable {
-        line-height: 33px;
-    }
-</style>
diff --git a/src/views/oldMap/jointTraining/menuDraft/operateMenu.vue b/src/views/oldMap/jointTraining/menuDraft/operateMenu.vue
deleted file mode 100644
index 74f30605d..000000000
--- a/src/views/oldMap/jointTraining/menuDraft/operateMenu.vue
+++ /dev/null
@@ -1,145 +0,0 @@
-<template>
-  <div>
-    <pop-menu ref="popMenu" :menu="menu" />
-    <choose-role ref="chooseRole" @setDriver="setDriver" />
-  </div>
-</template>
-
-<script>
-import PopMenu from '@/components/PopMenu';
-import ChooseRole from './chooseRole';
-import { putUserRoles } from '@/api/chat';
-import { DeviceMenu } from '@/scripts/ConstDic';
-
-export default {
-    name: 'OperateMenu',
-    components: {
-        PopMenu,
-        ChooseRole
-    },
-    props: {
-        group: {
-            type: String,
-            required: true
-        },
-        point: {
-            type: Object,
-            required: true
-        },
-        selected: {
-            type: Object,
-            required: true
-        },
-        driverList: {
-            type: Array,
-            required: true
-        },
-        driverMapDict: {
-            type: Object,
-            required: true
-        }
-    },
-    data() {
-        return {
-            menuShow: false,
-            menu: [
-                {
-                    label: this.$t('joinTraining.chooseDriver'),
-                    handler: this.chooseDriver
-                },
-                {
-                    label: this.$t('joinTraining.cancelDriver'),
-                    handler: this.cancelDriver
-                }
-            ]
-        };
-    },
-    watch: {
-        '$store.state.menuOperation.menuCount': function (val) {
-            if (this.$store.getters['menuOperation/checkDialogIsOpen'](DeviceMenu.SetDriver)) {
-                this.doShow(this.$store.state.menuOperation.menuPosition);
-            } else {
-                this.doClose();
-            }
-        }
-    },
-    mounted() {
-        this.closeEvent();
-    },
-    methods: {
-        closeEvent() {
-            const self = this;
-            window.onclick = function (e) {
-                self.doClose();
-            };
-        },
-        doShow(point) {
-            this.closeEvent();
-            if (this.$refs && this.$refs.popMenu) {
-                this.$refs.popMenu.resetShowPosition(point);
-            }
-            this.menuShow = true;
-        },
-        doClose() {
-            if (this.$refs && this.$refs.popMenu) {
-                this.$refs.popMenu.close();
-            }
-            this.menuShow = false;
-        },
-        chooseDriver() {
-            const arrs = Object.values(this.driverMapDict);
-            const list = this.driverList.filter(elem => {
-                let ret = true;
-                arrs.forEach(item => {
-                    if (item.id == elem.id) {
-                        ret = false;
-                    }
-                });
-                return ret;
-            });
-
-            this.$refs.chooseRole.doShow({ title: this.$t('joinTraining.chooseDriver'), list: list });
-        },
-        async setDriver(obj) {
-            if (obj && this.selected) {
-                const params = [{
-                    id: obj.id,
-                    nickName: obj.name,
-                    userRole: 'Driver',
-                    stationCode: '',
-                    trainCode: this.selected._code
-                }];
-
-                await putUserRoles(params, this.group);
-            }
-        },
-        async cancelDriver() {
-            const data = this.driverMapDict[this.selected._code];
-            if (data) {
-                const params = [{
-                    id: data.id,
-                    nickName: data.name,
-                    userRole: 'Driver',
-                    stationCode: '',
-                    trainCode: ''
-                }];
-
-                await putUserRoles(params, this.group);
-            }
-        },
-        refresh() {
-            this.$emit('refresh');
-        }
-    }
-};
-</script>
-<style rel="stylesheet/scss" lang="scss" scoped>
-	/deep/ {
-		.menu-item{
-			background: #f1ecec;
-			.pop-menu {
-				background: #5F9EA0;
-			}
-		}
-	}
-</style>
diff --git a/src/views/oldMap/jointTraining/menuDraft/realDevice.vue b/src/views/oldMap/jointTraining/menuDraft/realDevice.vue
deleted file mode 100644
index cc307d56b..000000000
--- a/src/views/oldMap/jointTraining/menuDraft/realDevice.vue
+++ /dev/null
@@ -1,293 +0,0 @@
-<template>
-  <el-dialog
-    v-dialogDrag
-    :title="title"
-    :visible.sync="dialogShow"
-    width="500px"
-    :before-close="doClose"
-    :z-index="2000"
-    :modal="false"
-    :close-on-click-modal="false"
-    append-to-body
-    center
-  >
-    <div v-if="options.length">
-      <ul>
-        <li v-for="(node, index) in options" :key="index" style="height: 45px">
-          <span v-if="node.online" style="color: #339933;">{{ handleDeviceTitle(node) }}</span>
-          <span v-else style="color: #A9A9A9;">{{ handleDeviceTitle(node) }}</span>
-          <div style="float: right;">
-            <el-select
-              v-if="node.projectDeviceType ==='PSD'"
-              v-model="node.deviceCode"
-              :placeholder="$t('global.choose')"
-              filterable
-              clearable
-              size="mini"
-              @change="psdDeviceChange"
-            >
-              <el-option
-                v-for="item in doorList"
-                :key="item.code"
-                :label="item.name"
-                :value="item.code"
-                :disabled="item.disabled"
-                style="margin-left: 10px"
-              />
-            </el-select>
-            <el-select
-              v-else-if="node.projectDeviceType ==='SWITCH'"
-              v-model="node.deviceCode"
-              :placeholder="$t('global.choose')"
-              filterable
-              clearable
-              size="mini"
-              @change="switchDeviceChange"
-            >
-              <el-option
-                v-for="item in switchList"
-                :key="item.code"
-                :label="item.name"
-                :value="item.code"
-                :disabled="item.disabled"
-                style="margin-left: 10px"
-              />
-            </el-select>
-            <el-select
-              v-else-if="node.projectDeviceType ==='SIGNAL'"
-              v-model="node.deviceCode"
-              :placeholder="$t('global.choose')"
-              filterable
-              clearable
-              size="mini"
-              @change="signalDeviceChange"
-            >
-              <el-option
-                v-for="item in signalList"
-                :key="item.code"
-                :label="item.name"
-                :value="item.code"
-                :disabled="item.disabled"
-                style="margin-left: 10px"
-              />
-            </el-select>
-          </div>
-        </li>
-      </ul>
-    </div>
-    <div v-else style="height: 50px; text-align: center; color: #C0C0C0;line-height: 50px">
-      <span>未查询到真实设备</span>
-    </div>
-    <span slot="footer" class="dialog-footer">
-      <el-button type="primary" @click="doSave">{{ $t('global.connect') }}</el-button>
-      <el-button @click="doClose">{{ $t('global.cancel') }}</el-button>
-    </span>
-  </el-dialog>
-</template>
-
-<script>
-import { getRealDevicesInRoom, updateRealDevices, realDeviceIsUsed } from '@/api/chat';
-import { hasDoorStationList } from '@/api/jmap/map';
-import {getAllDeviceInProject} from '@/api/project';
-import { mapGetters } from 'vuex';
-import { getSessionStorage } from '@/utils/auth';
-export default {
-    name: 'RealDevice',
-    data() {
-        return {
-            dialogShow: false,
-            options: [],
-            loading: false,
-            doorList: [],
-            deviceRelList: [],
-            projectCode:''
-        };
-    },
-    computed: {
-        ...mapGetters('map', [
-            'stationList',
-            'stationStandList',
-            'switchList',
-            'signalList'
-        ]),
-        title() {
-            return this.$t('joinTraining.connectRealDevices');
-        }
-    },
-    mounted() {
-    },
-    methods: {
-        handleDeviceTitle(node) {
-            let connectDeviceName = '';
-            if (node.connectDeviceCode) {
-                if (node.projectDeviceType === 'PSD') {
-                    this.doorList.forEach(item => {
-                        if (item.code === node.connectDeviceCode) {
-                            connectDeviceName = item.name;
-                        }
-                    });
-                } else if (node.projectDeviceType === 'SWITCH') {
-                    this.switchList.forEach(item => {
-                        if (item.code === node.connectDeviceCode) {
-                            connectDeviceName = item.name;
-                        }
-                    });
-                } else if (node.projectDeviceType === 'SIGNAL') {
-                    this.signalList.forEach(item => {
-                        if (item.code === node.connectDeviceCode) {
-                            connectDeviceName = item.name;
-                        }
-                    });
-                }
-            }
-            const online = node.connectDeviceCode ? this.$t('joinTraining.connectedDevice') + connectDeviceName + ']' : this.$t('joinTraining.notConnected');
-            return node.projectDeviceCode + online;
-        },
-        psdDeviceChange() {
-            const psdDevices = [];
-            this.options.forEach(item => {
-                if (item.projectDeviceType === 'PSD' || item.deviceCode) {
-                    psdDevices.push(item.deviceCode);
-                }
-            });
-            this.doorList.forEach(it => {
-                it.disabled = psdDevices.includes(it.code);
-            });
-        },
-        switchDeviceChange() {
-            const switchDevices = [];
-            this.options.forEach(item => {
-                if (item.projectDeviceType === 'SWITCH' || item.deviceCode) {
-                    switchDevices.push(item.deviceCode);
-                }
-            });
-            this.switchList.forEach(it => {
-                it.disabled = switchDevices.includes(it.code);
-            });
-        },
-        signalDeviceChange() {
-            const signalDevices = [];
-            this.options.forEach(item => {
-                if (item.projectDeviceType === 'SIGNAL' || item.deviceCode) {
-                    signalDevices.push(item.deviceCode);
-                }
-            });
-            this.signalList.forEach(it => {
-                it.disabled = signalDevices.includes(it.code);
-            });
-        },
-        doShow() {
-            this.dialogShow = true;
-            this.options = [];
-            this.projectCode = getSessionStorage('project').toUpperCase();
-            this.getDoorList(this.$route.query.mapId, this.stationList);
-            getAllDeviceInProject({projectCode: this.projectCode, group:this.$route.query.group}).then(resp => {
-                getRealDevicesInRoom(this.$route.query.group).then(res => {
-                    resp.data.forEach((it, index) => {
-                        this.options.push({
-                            deviceCode: '',
-                            id: null,
-                            online: it.online,
-                            projectDeviceId: it.id,
-                            projectDeviceCode: it.code,
-                            projectDeviceType: it.type,
-                            connectDeviceCode: it.deviceCode,
-                            roomId: this.$route.query.roomId
-                        });
-                        res.data.forEach(item => {
-                            if (it.id == item.projectDeviceId) { // it.id为number item.projectDeviceId为string
-                                this.options[index].id = item.id;
-                                this.options[index].deviceCode = item.deviceCode;
-                            }
-                        });
-                    });
-                    this.psdDeviceChange();
-                    this.switchDeviceChange();
-                    this.signalDeviceChange();
-                });
-            }).catch(() => {
-                this.$message.error(this.$t('error.getRealDeviceFailed'));
-            });
-        },
-        async getDoorList(mapId, stationList) {
-            const doorList = [];
-            hasDoorStationList(mapId).then(res =>{
-                stationList.forEach(item => {
-                    res.data.forEach(it =>{
-                        if (item.code === it.stationCode) {
-                            const direction = parseInt(it.doorLocationType) % 2 === 0 ? this.$t('trainRoom.uplinkPlatform') : this.$t('trainRoom.downlinkPlatform');
-                            doorList.push({code: it.code, name: item.name + direction});
-                        }
-                    });
-                });
-                this.doorList = doorList;
-            }).catch(() => {
-                this.$messageBox(this.$t('error.getScreenDoorsListFailed'));
-            });
-        },
-        doClose() {
-            this.dialogShow = false;
-            this.options = [];
-            this.doorList = [];
-            this.deviceRelList = [];
-        },
-        update() {
-            const paramsList = [];
-            this.options.forEach(item => {
-                if (item.deviceCode || item.id) {
-                    paramsList.push(item);
-                }
-            });
-            updateRealDevices(this.$route.query.group, paramsList).then(res => {
-                this.$message.success(this.$t('tip.updateRealDeviceConnectionSuccess'));
-                this.doClose();
-            }).catch(() => {
-                this.$message.error(this.$t('tip.updateRealDeviceConnectionFailed'));
-            });
-        },
-        doSave() {
-            // realDeviceIsUsed(this.$route.query.group, this.projectCode).then(resp => {
-            //     if (resp.data) {
-            //         this.$confirm('当前真实设备被其他仿真占用，是否进行抢占?', '提示', {
-            //             confirmButtonText: '抢占',
-            //             cancelButtonText: '取消',
-            //             type: 'warning'
-            //         }).then(()=> {
-            //             this.update();
-            //         });
-            //     } else {
-            //         this.update();
-            //     }
-            // });
-            this.update();
-        }
-    }
-};
-
-</script>
-
-<style scoped lang="scss">
-    /deep/ {
-        .el-dialog__body {
-            padding: 0px 20px;
-        }
-    }
-
-    .listBox {
-        margin: 0px;
-        max-height: 270px;
-        overflow-y: auto;
-        padding-inline-start: 0px;
-        width: 100%;
-
-        .listLi {
-            list-style: none;
-            height: 30px;
-            line-height: 30px;
-        }
-    }
-
-    .tipLable {
-        line-height: 33px;
-    }
-</style>
diff --git a/src/views/oldMap/jointTraining/menuSchema.vue b/src/views/oldMap/jointTraining/menuSchema.vue
deleted file mode 100644
index 732bedfdf..000000000
--- a/src/views/oldMap/jointTraining/menuSchema.vue
+++ /dev/null
@@ -1,167 +0,0 @@
-<template>
-  <div class="schema" :style="{top: offset+'px'}">
-    <el-select
-      v-if="userRole == 'Instructor' || userRole == 'Admin'"
-      v-model="swch"
-      size="small"
-      :placeholder="this.$t('rules.productTypeInput')"
-      @change="switchMode"
-    >
-      <el-option v-for="item in swchList" :key="item.value" :label="item.name" :value="item.value" />
-    </el-select>
-
-    <el-button-group>
-      <template>
-        <el-button v-if="runing" size="small" :disabled="viewDisabled" @click="viewRunPlan">{{ $t('joinTraining.runGraphPreview') }}</el-button>
-      </template>
-      <template v-if="userRole == 'Admin'">
-        <el-button v-if="!runing" size="small" type="warning" :disabled="viewDisabled" @click="loadRunPlan">
-          {{ $t('joinTraining.runGraphLoading') }}</el-button>
-      </template>
-      <template v-if="userRole == 'Instructor' || userRole == 'Admin'">
-        <el-button v-if="mode==OperateMode.FAULT" size="small" type="danger" @click="setFault">{{ $t('joinTraining.faultSetting') }}</el-button>
-      </template>
-    </el-button-group>
-
-    <el-radio-group
-      v-if="userRole == 'Instructor' || userRole == 'Admin'"
-      v-model="mode"
-      size="small"
-      @change="changeOperateMode(mode)"
-    >
-      <el-radio-button class="mode" :label="OperateMode.NORMAL">{{ $t('joinTraining.normalOperation') }}</el-radio-button>
-      <el-radio-button class="mode" :label="OperateMode.FAULT">{{ $t('joinTraining.faultOperation') }}</el-radio-button>
-    </el-radio-group>
-  </div>
-</template>
-<script>
-import { mapGetters } from 'vuex';
-import { OperateMode } from '@/scripts/ConstDic';
-import { getStationList } from '@/api/runplan';
-import { getEveryDayRunPlanData } from '@/api/simulation';
-
-export default {
-    name: 'MenuDemonSchema',
-    props: {
-        group: {
-            type: String,
-            required: true
-        },
-        offset: {
-            type: Number,
-            required: true
-        },
-        userRole: {
-            type: String,
-            required: true
-        }
-    },
-    data() {
-        return {
-            mode: OperateMode.NORMAL,
-            OperateMode: OperateMode,
-            viewDisabled: true,
-            realData: {},
-            series: [],
-            kmRangeCoordMap: {},
-            runPlanData: {},
-            swch: '02',
-            swchList: [
-                { value: '01', name: this.$t('joinTraining.local') },
-                { value: '02', name: this.$t('joinTraining.lineAdjustment') }
-            ],
-            runing: false,
-            userId: ''
-        };
-    },
-    computed: {
-        ...mapGetters('runPlan', [
-            'stations'
-        ]),
-        isShowMenuBar() {
-            return this.$store.state.map.roles == 'Admin';
-        }
-    },
-    watch: {
-        '$store.state.training.started': function (val) {
-            this.setRuning(val);
-        },
-        '$store.state.training.switchcount': async function () {
-            if (this.group) {
-                const started = this.$store.state.training.started;
-                if (started) {
-                    await this.loadRunData(this.$route.query);
-                }
-            }
-        }
-    },
-    async mounted() {
-        this.userId = this.$store.state.user.id;
-        await this.loadRunData(this.$route.query);
-    },
-    methods: {
-        loadRunData(opt) {
-            this.$store.dispatch('runPlan/clear').then(resp => {
-                if (opt && opt.mapId) {
-                    this.viewDisabled = true;
-                    getStationList(opt.mapId).then(response => {
-                        const stations = response.data;
-                        this.$store.dispatch('runPlan/setStations', stations).then(() => {
-                            getEveryDayRunPlanData(this.group).then(resp => {
-                                this.$store.dispatch('runPlan/setPlanData', resp.data);
-                                this.viewDisabled = false;
-                            }).catch(error => {
-                                this.$store.dispatch('runPlan/setPlanData', []);
-                                if (error.code == 30001) {
-                                    this.$messageBox(this.$t('error.runGraphIsNotLoaded'));
-                                } else {
-                                    this.$messageBox(this.$t('error.obtainOperationGraphFailed'));
-                                }
-                            });
-                        });
-                    }).catch(() => {
-                        this.$messageBox(this.$t('error.obtainStationListFailed'));
-                    });
-                }
-            });
-        },
-        switchMode(swch) {
-            this.$store.dispatch('training/setPrdType', swch);
-        },
-        changeOperateMode(handle) {
-            this.$store.dispatch('training/changeOperateMode', { mode: handle });
-        },
-        setFault() {
-            this.$emit('faultChooseShow');
-        },
-        loadRunPlan() {
-            this.$emit('runPlanLoadShow');
-        },
-        viewRunPlan() {
-            this.$emit('runPlanViewShow');
-        },
-        setRuning(run) {
-            this.runing = run;
-        }
-    }
-};
-</script>
-<style>
-    .schema {
-        z-index: 360;
-        display: inline;
-        position: absolute;
-        right: 20px;
-    }
-
-    .schema .el-radio-group .el-radio-button__inner {
-        padding: 0px 15px 0px 15px;
-        height: 32px;
-        line-height: 32px;
-        font-size: 12px;
-    }
-
-    /* /deep/ .el-button+ .el-button {
-        margin-left: 0px;
-    } */
-</style>
diff --git a/src/views/oldMap/mapsystem/common/index.vue b/src/views/oldMap/mapsystem/common/index.vue
deleted file mode 100644
index ae52e83c6..000000000
--- a/src/views/oldMap/mapsystem/common/index.vue
+++ /dev/null
@@ -1,164 +0,0 @@
-<template>
-  <div id="_Tips_Start_Position" class="mapContext">
-    <training-tips ref="trainingTips" />
-    <component :is="menus" :selected="selected" />
-    <jlmap-visual ref="jlmapVisual" @onSelect="clickEvent" @onMenu="contextmenu" />
-  </div>
-</template>
-
-<script>
-import { mapGetters } from 'vuex';
-import { getDeviceMenuByDeviceType, OperationEvent } from '@/scripts/ConstDic';
-import { letfMouseSelectDevice } from '@/api/simulation';
-import deviceType from '@/jmap/constant/deviceType';
-import JlmapVisual from '@/views/oldMap/jlmap/index';
-import TrainingTips from '@/views/oldMap/mapsystem/plugin/trainingtip';
-
-export default {
-    name: 'LessonCanvas',
-    components: {
-        JlmapVisual,
-        TrainingTips
-    },
-    data() {
-        return {
-            selected: null,
-            menus: null,
-            point: {
-                x: 0,
-                y: 0
-            }
-        };
-    },
-    computed: {
-        ...mapGetters('menuOperation', [
-            'buttonOperation'
-        ]),
-        Signal() {
-            return OperationEvent.Signal;
-        },
-        isScreen() {
-            return this.$route.params.mode === 'dp';
-        },
-        group() {
-            return this.$route.query.group;
-        }
-    },
-    watch: {
-        '$store.state.map.mapDataLoadedCount': function () {
-            const lineCode = this.$jlmap.lineCode;
-            if (lineCode) {
-                this.menus = this.$theme.loadMenuComponent(lineCode);
-            }
-        }
-    },
-    beforeDestroy() {
-        if (this.autoSaveTask) {
-            clearInterval(this.autoSaveTask);
-        }
-    },
-    methods: {
-        // 获取设备数据
-        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);
-                }
-            }
-
-            return device;
-        },
-        clickEvent(em) {
-            var device = { _type: em.deviceType, _code: em.deviceCode };
-            var CanClickDeviceList = [
-                deviceType.Switch,
-                deviceType.Signal,
-                deviceType.StationStand
-            ];
-
-            if (em.deviceCode) {
-                device = this.getDeviceByEm(em);
-                if (CanClickDeviceList.includes(em.deviceType)) {
-                    try {
-                        letfMouseSelectDevice(em.deviceCode, this.group);
-                    } catch (error) {
-                        console.log('send left mouse click error.');
-                    }
-                }
-            }
-
-            this.selected = device;
-            this.$store.dispatch('menuOperation/setSelected', {device: device, subType: em.subType});
-            this.$store.dispatch('training/emitTipFresh');
-
-        },
-        contextmenu(em) {
-            var menu = null;
-            var device = null;
-
-            this.point = { x: em.clientX, y: em.clientY };
-
-            if (em.subType === 'TrainWindow') {
-                device = { _type: deviceType.Train, code: em.deviceCode };
-                this.$store.dispatch('map/setTrainWindowShow', true);
-            } else if (em.deviceCode && !this.isScreen) {
-                device = this.getDeviceByEm(em);
-            }
-
-            if (device) {
-                this.selected = device = this.getSelectedByLineCode(device);
-                if (!this.buttonOperation) {
-                    this.$store.dispatch('menuOperation/setSelected', {device: device, subType: em.subType});
-                    if (!this.checkShouldPop(device)) {
-                        this.$store.dispatch('menuOperation/setPopMenu', { position: this.point, menu: null });
-                    } else {
-                        menu = getDeviceMenuByDeviceType(device._type);
-                        this.$store.dispatch('menuOperation/setPopMenu', { position: this.point, menu: menu });
-                    }
-                }
-            } else {
-                menu = getDeviceMenuByDeviceType('Cancel');
-                this.$store.dispatch('menuOperation/setPopMenu', { position: this.point, menu: menu });
-            }
-            this.$store.dispatch('training/emitTipFresh');
-        },
-        checkShouldPop(device) {
-            const lineCode = this.$store.getters['map/lineCode'];
-            if (device._type === 'Signal') {
-                return device._viewVal === '3';
-            } else if (device._type === 'StationControl' && lineCode == '01') { // 中控模式显示范围
-                return device._viewVal === '1';
-            } else {
-                return true;
-            }
-        },
-        mapViewLoaded(loading) {
-            this.$refs.jlmapVisual && this.$refs.jlmapVisual.mapViewLoaded(loading);
-        }
-    }
-};
-</script>
-<style rel="stylesheet/scss" lang="scss" scoped>
-    @import "src/styles/mixin.scss";
-
-    .mapContext {
-        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;
-        width: 100%;
-        min-height: 100%;
-    }
-</style>
diff --git a/src/views/oldMap/mapsystem/index.vue b/src/views/oldMap/mapsystem/index.vue
deleted file mode 100644
index 6876def71..000000000
--- a/src/views/oldMap/mapsystem/index.vue
+++ /dev/null
@@ -1,117 +0,0 @@
-<template>
-  <div class="mainContext">
-    <map-common ref="mapCommon" />
-  </div>
-</template>
-
-<script>
-import MapCommon from './common/index';
-import { getToken } from '@/utils/auth';
-import { creatSubscribe, clearSubscribe, displayTopic} from '@/utils/stomp';
-// import { sendCommand } from '@/api/jmap/training';
-import { getSessionStorage } from '@/utils/auth';
-
-export default {
-    name: 'MapSystemDraft',
-    components: {
-        MapCommon
-    },
-    data() {
-        return {
-            topic: '/user/queue/training',
-            stomp: null,
-            currentMap: null,
-            mode: '',
-            isDesignPlatform: false,
-            group: ''
-        };
-    },
-    watch: {
-        '$store.state.map.mapViewLoadedCount': function (val) {
-            this.subscribe();
-        },
-        '$store.state.socket.equipmentStatus': function (val) {
-            if (val.length) {
-                this.statusMessage(val);
-            }
-        },
-        '$store.state.socket.simulationError': function (val) {
-            if (val) {
-                this.simulationError(val);
-            }
-        },
-        '$store.state.socket.simulationReset': function (val) {
-            if (val) {
-                this.simulationReset(val);
-            }
-        }
-    },
-    mounted() {
-        window.onbeforeunload = this.clearSubscribe;
-        this.mode = this.$route.params.mode || '';
-        this.group = this.$route.query.group || '';
-        this.currentMap = this.$refs.mapCommon;
-        this.$nextTick(() => {
-            setTimeout(() => {
-                this.$store.dispatch('config/resetCanvasOffset');
-            }, 100);
-        });
-        this.isDesignPlatform = getSessionStorage('project').startsWith('design');
-    },
-    beforeDestroy() {
-        this.clearSubscribe();
-    },
-    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 simulationError() {
-            await this.$store.dispatch('map/clearJlmapTrainView');
-            await this.$store.dispatch('map/setTrainWindowShow', false);
-            await this.$store.dispatch('training/setMapDefaultState');
-            this.clearSubscribe();
-            this.$confirm(this.$t('tip.getMapStateDataException'), this.$t('tip.hint'), {
-                confirmButtonText: this.$t('global.confirm'),
-                showCancelButton: false,
-                type: 'warning'
-            }).then(() => {
-                this.$emit('back');
-            }).catch(() => {
-            });
-        },
-        async simulationReset() {
-            await this.$store.dispatch('map/clearJlmapTrainView');
-            await this.$store.dispatch('map/setTrainWindowShow', false);
-            await this.$store.dispatch('training/over');
-            await this.$store.dispatch('socket/setSimulationReset');
-            await this.$store.dispatch('socket/setSimulationStart');
-            await this.$store.dispatch('training/setMapDefaultState');
-        },
-        async subscribe() {
-            this.clearSubscribe();
-            const header = { group: this.group || '', 'X-Token': getToken() };
-            creatSubscribe(`${displayTopic}\/${this.group}`, header);
-
-            await this.$store.dispatch('training/setHasSubscribed');
-        },
-        clearSubscribe() {
-            clearSubscribe(`${displayTopic}\/${this.group}`);
-        }
-    }
-};
-</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/oldMap/mapsystem/plugin/delayBox.vue b/src/views/oldMap/mapsystem/plugin/delayBox.vue
deleted file mode 100644
index ef36dd91b..000000000
--- a/src/views/oldMap/mapsystem/plugin/delayBox.vue
+++ /dev/null
@@ -1,35 +0,0 @@
-<template>
-  <div v-if="delayShow">
-    <div v-for="item in stationList">
-      <delay-info v-if="item.delayInfo" :delay-info-list="item.delayInfo" position="item.points" />
-    </div>
-  </div>
-</template>
-
-<script>
-import DelayInfo from './delayInfo';
-
-export default {
-    name: 'DelayBox',
-    components: {
-        DelayInfo
-    },
-    data() {
-        return {
-            delayShow: false,
-            stationList: []
-        };
-    },
-    watch: {
-        '$store.state.map.stationList': function(val) {
-            this.stationList = val;
-        }
-    },
-    methods: {
-    }
-};
-</script>
-
-<style scoped>
-
-</style>
diff --git a/src/views/oldMap/mapsystem/plugin/delayInfo.vue b/src/views/oldMap/mapsystem/plugin/delayInfo.vue
deleted file mode 100644
index d6a9bdba2..000000000
--- a/src/views/oldMap/mapsystem/plugin/delayInfo.vue
+++ /dev/null
@@ -1,72 +0,0 @@
-<template>
-  <div v-show="showDelayBox" class="info_box" :style="{left: tPosition.x+'px', top: tPosition.y+'px' }">
-    <el-scrollbal>
-      <div v-for="item in delayInfoList"><span>人解</span><span>信号机名</span><span>时间</span></div>
-    </el-scrollbal>
-  </div>
-</template>
-
-<script>
-export default {
-    name: 'DelayInfo',
-    props: {
-        delayInfoList: {
-            type: Object,
-            required: true,
-            default: function () {
-                return [];
-            }
-        },
-        position: {
-            type: Object,
-            required: true,
-            default: function () {
-                return {
-                    x: 0,
-                    y: 0
-                };
-            }
-        }
-    },
-    data() {
-        return {
-            tPosition: {
-                x: 0,
-                y: 0
-            },
-            showDelayBox: true
-        };
-    },
-    watch: {
-        'position.x': function (val) {
-            this.handlePosition();
-        },
-        'position.y': function (val) {
-            this.handlePosition();
-        }
-    },
-    methods: {
-        handlePosition() {
-            const offset = this.$store.state.config.canvasOffset;
-            this.tPosition = {
-                x: this.position.x + offset.x,
-                y: this.position.y + offset.y
-            };
-            if (this.tPosition.x < 0 || this.tPosition < 0) {
-                this.showDelayBox = false;
-            } else {
-                this.showDelayBox = true;
-            }
-        }
-    }
-};
-</script>
-
-<style scoped>
-    .info_box{
-        border-top:1px solid #fff;
-        height: auto;
-        max-height: 200px;
-        background-color: #000;
-    }
-</style>
diff --git a/src/views/oldMap/mapsystem/plugin/src/poptip.vue b/src/views/oldMap/mapsystem/plugin/src/poptip.vue
deleted file mode 100644
index 0e0ee61ff..000000000
--- a/src/views/oldMap/mapsystem/plugin/src/poptip.vue
+++ /dev/null
@@ -1,172 +0,0 @@
-<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="text-align: center;" :style="{ width: width + 'px' }">
-      <p style="color: black;">{{ tip }}</p>
-      <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>
-  </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
-        };
-    },
-    computed: {
-        width() {
-            let width = this.tip.length * this.defaultFontSize + 40;
-            if (width > this.maxWidth) {
-                width = this.maxWidth;
-            }
-            return 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() {
-            const self = this;
-            this.$nextTick(() => {
-                // 位置
-                const height = self.$el.clientHeight;
-
-                self.tPosition.align = self.position.align || 'bottom';
-                self.tPosition.x = self.position.x - (this.arrawLeft + this.offset);
-
-                if (self.tPosition.align == 'top') {
-                    const distance = 47;
-                    self.tPosition.y = self.position.y + (distance);
-                } else if (self.tPosition.align == 'bottom') {
-                    const distance = 5;
-                    self.tPosition.y = self.position.y - (height + distance);
-                }
-
-                if (self.tPosition.x < 0) self.tPosition.x = 0;
-                if (self.tPosition.y < 0) self.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_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/oldMap/mapsystem/plugin/src/tip.vue b/src/views/oldMap/mapsystem/plugin/src/tip.vue
deleted file mode 100644
index d571475c6..000000000
--- a/src/views/oldMap/mapsystem/plugin/src/tip.vue
+++ /dev/null
@@ -1,24 +0,0 @@
-<template>
-  <div>
-    <p style="text-align: center;">{{ tip }}</p>
-  </div>
-</template>
-
-<script>
-export default {
-	name: 'Tip',
-	props: {
-		tip: {
-			type: String,
-			required: true
-		}
-	},
-	data() {
-		return {
-			defaultFontSize: 14
-		};
-	},
-	methods: {
-	}
-};
-</script>
diff --git a/src/views/oldMap/mapsystem/plugin/trainingtip.vue b/src/views/oldMap/mapsystem/plugin/trainingtip.vue
deleted file mode 100644
index 575c4a679..000000000
--- a/src/views/oldMap/mapsystem/plugin/trainingtip.vue
+++ /dev/null
@@ -1,181 +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 '@/views/oldMap/mapsystem/plugin/src/poptip';
-import { getDeviceTypeByDic, getDomIdByOperation } from '@/scripts/ConstDic';
-import { getDomOffset } from '@/utils/index';
-
-export default {
-    name: 'TrainingTips',
-    components: { PopTip },
-    data() {
-        return {
-            tipShow: false,
-            popShow: false,
-            position: {
-                x: 0,
-                y: 0
-            },
-            tip: ''
-        };
-    },
-    computed: {
-        ...mapGetters([
-            'canvasWidth',
-            'canvasHeight'
-        ])
-    },
-    watch: {
-        '$store.state.training.tipEvent': function (val) {
-            this.tipInit();
-        }
-    },
-    methods: {
-        tipInit() {
-            this.$nextTick(() => {
-                this.$store.dispatch('training/isTeachMode').then(() => {
-                    this.tipShow = true;
-                    const offset = this.$store.state.config.canvasOffset;
-                    if (this.$store.state.training.started) {
-                        const order = this.$store.state.training.order;
-                        const steps = this.$store.state.training.steps;
-                        if (order > -1 && order < steps.length) {
-                            const step = steps[order];
-                            const distance = 5;
-                            this.tip = step.tip;
-                            /** 如果mbm或者bar的处理*/
-                            if (step.type === 'mbm' || step.type === 'bar') {
-                                const position = this.getOtherTipPoint(step);
-                                if (position) {
-                                    this.position = position;
-                                    this.position.y -= distance;
-                                    this.popTipShow();
-                                }
-                            } else if (step.code) {
-                                /** 默认是shape类型，如果找不到坐标，则可以认为是存在code的dailog*/
-                                const position = this.getShapeTipPoint(step);
-                                if (position) {
-                                    this.position = {
-                                        x: position.x + offset.x,
-                                        y: position.y + offset.y - distance
-                                    };
-                                    this.popTipShow();
-                                } else {
-                                    const position = this.getOtherTipPoint(step);
-                                    if (position) {
-                                        this.position = position;
-                                        this.position.y -= distance;
-                                        this.popTipShow();
-                                    }
-                                }
-                            } else {
-                                /** 不存在code字段的dialog处理*/
-                                const position = this.getOtherTipPoint(step);
-                                if (position) {
-                                    this.position = position;
-                                    this.position.y -= distance;
-                                    this.popTipShow();
-                                } else {
-                                    this.popTipHide();
-                                }
-                            }
-                        } else {
-                            this.tipShow = false;
-                        }
-                    } else {
-                        this.tipShow = false;
-                    }
-                }).catch(() => {
-                    this.tipShow = false;
-                });
-            });
-        },
-        popTipShow() {
-            this.popShow = true;
-        },
-        popTipHide() {
-            this.popShow = false;
-        },
-        // 获取地图设备提示位置
-        getShapeTipPoint(step) {
-            var position = null;
-            const type = getDeviceTypeByDic(step.type);
-            if (type) {
-                position = this.$jlmap.getShapeTipPoint({
-                    code: step.code,
-                    val: step.val
-                });
-
-                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(step) {
-            const domId = getDomIdByOperation(step.operation);
-            const btnDom = document.getElementById(domId);
-            if (btnDom) {
-                const offset = getDomOffset(btnDom, true);
-                if (offset.x == 0 && offset.y == 0) {
-                    return null;
-                }
-
-                let align = 'bottom';
-                if (this.tipAlignIsTop(step, 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;
-            }
-
-            if (/{TOP}/.test(domId)) {
-                return false;
-            }
-
-            if (/{BOTTOM}/.test(domId)) {
-                return true;
-            }
-
-            // 如果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/oldMap/scriptManage/display/index.vue b/src/views/oldMap/scriptManage/display/index.vue
deleted file mode 100644
index 25334a058..000000000
--- a/src/views/oldMap/scriptManage/display/index.vue
+++ /dev/null
@@ -1,59 +0,0 @@
-<template>
-  <div class="script-parent">
-    <div class="script-card" :style="{width: widthLeft+'px'}">
-      <tip-script-record ref="tipTaskRecord" :group="group" :width="widthLeft" />
-    </div>
-    <drap-left :width-left="widthLeft" :min="780" :max="980" @drapWidth="drapWidth" />
-    <div class="script-display">
-      <display ref="display" :size="size" />
-    </div>
-  </div>
-</template>
-
-<script>
-import Display from '@/views/oldMap/display/index';
-import TipScriptRecord from './tipScriptRecord';
-import drapLeft from '@/views/components/drapLeft/index';
-
-export default {
-    name: 'ScriptDisplay',
-    components: {
-        Display,
-        TipScriptRecord,
-        drapLeft
-    },
-    data() {
-        return {
-            widthLeft: 780,
-            size: {
-                width: document.documentElement.clientWidth - 780,
-                height: document.documentElement.clientHeight
-            },
-            group: this.$route.query.group
-        };
-    },
-    watch: {
-        '$store.state.app.windowSizeCount': function() {
-            this.size = { width: this.$store.state.app.width - 780, height: this.$store.state.app.height};
-        },
-        widthLeft: function(val) {
-            this.size = { width: this.$store.state.app.width - val, height: this.$store.state.app.height};
-        }
-    },
-    methods: {
-        drapWidth(width) {
-            this.widthLeft = Number(width);
-        }
-    }
-};
-</script>
-<style rel="stylesheet/scss" lang="scss" scoped>
-    @import "src/styles/mixin.scss";
-    .script-parent {
-        display: flex;
-        flex-flow: row;
-        .script-card {
-            width: 780px;
-        }
-    }
-</style>
diff --git a/src/views/oldMap/scriptManage/display/tipScriptRecord.vue b/src/views/oldMap/scriptManage/display/tipScriptRecord.vue
deleted file mode 100644
index 11a92595a..000000000
--- a/src/views/oldMap/scriptManage/display/tipScriptRecord.vue
+++ /dev/null
@@ -1,322 +0,0 @@
-<template>
-  <div class="reminder-drag">
-    <div ref="drapBox" class="reminder-box" :style="{width: width + 'px'}">
-      <el-container class="actionPane">
-        <el-header style="height: 50px;">
-          <el-row class="actionList">
-            <span class="titleStyle">{{ $t('scriptRecord.scriptRecordTitle') }}</span>
-            <span class="titleStyle">( {{ $t('scriptRecord.language') }}: {{ $route.query.lang=="en"?$t('scriptRecord.english'):$t('scriptRecord.chinese') }} )</span>
-          </el-row>
-        </el-header>
-        <el-main style="padding-top:10px;padding-bottom:10px;">
-          <add-role ref="addRole" :group="group" @refresh="refresh" />
-          <add-action ref="addAction" :group="group" :size="size" @create="create" @setDisabled="setDisabled" />
-          <get-action ref="getAction" :group="group" :size="size" @setAction="setAction" />
-        </el-main>
-        <el-card class="scriptFooter">
-          <el-button-group class="button-group">
-            <el-button v-if="isPause" type="primary" :disabled="executeDisabled" @click="pauseScript">{{ $t('scriptRecord.drivingPause') }}</el-button>
-            <el-button v-else type="primary" :disabled="executeDisabled" @click="executePlayScript">{{ $t('scriptRecord.recoverAndExecute') }}</el-button>
-            <el-button type="danger" @click="dumpScenesData">{{ $t('scriptRecord.resetScript') }}</el-button>
-            <el-button type="primary" :disabled="backDisabled" @click="saveScenesStage">{{ $t('scriptRecord.saveBackground') }}</el-button>
-            <el-button type="success" :loading="isSavingScript" @click="saveScenesData">{{ $t('scriptRecord.saveData') }}</el-button>
-          </el-button-group>
-        </el-card>
-      </el-container>
-    </div>
-  </div>
-</template>
-<script>
-import Vue from 'vue';
-import AddAction from '../scriptRecord/addAction';
-import GetAction from '../scriptRecord/getAction';
-import AddRole from '../scriptRecord/addRole';
-import {getDraftScriptByGroupNew} from '@/api/script';
-import {saveScriptScenes, saveScriptScenesNew, saveScriptData, saveScriptDataNew, dumpScriptData, dumpScriptDataNew, updateMapLocation, updateMapLocationNew, scriptPause, simulationPause, executeScript, executeScriptNew} from '@/api/simulation';
-
-export default {
-    name: 'TipScriptRecord',
-    components: {
-        GetAction,
-        AddRole,
-        AddAction
-    },
-    props: {
-        group: {
-            type: String,
-            required: true
-        },
-        width: {
-            type: Number || String,
-            required: true
-        }
-    },
-    data() {
-        return {
-            title: this.$t('scriptRecord.scriptRecordTitle'),
-            isShrink: false,
-            mapLocation: {},
-            autoSaveScript: null,
-            isSavingScript: false,
-            isPause: true,
-            executeDisabled: false,
-            backDisabled: false,
-            size: {
-                width: 350,
-                height: window.innerHeight - 342
-            }
-        };
-    },
-    computed:{
-        drawWay() {
-            const drawWay = this.$route.query.drawWay;
-            return drawWay && JSON.parse(drawWay);
-        }
-    },
-    watch: {
-        '$store.state.scriptRecord.bgSet': function (val) {
-            this.backDisabled = val;
-        },
-        '$store.state.app.windowSizeCount': function() {
-            this.size = { width: 350, height: window.innerHeight - 342};
-        },
-        width: function(val) {
-            this.size = { width: val / 2 - 20, height: window.innerHeight - 342};
-        }
-    },
-    mounted() {
-        // this.initAutoSaveScript();
-        if (this.drawWay) {
-            getDraftScriptByGroupNew(this.group).then(response=>{
-                this.backDisabled = response.data.bgSet;
-                this.$store.dispatch('scriptRecord/updateBgSet', response.data.bgSet);
-            });
-        } else {
-            this.backDisabled = this.$store.state.scriptRecord.bgSet;
-        }
-
-    },
-    beforeDestroy() {
-        this.clearAutoSave();
-        this.$store.dispatch('scriptRecord/updateBgSet', false);
-    },
-    methods: {
-        setIsParse(isPause) {
-            this.isPause = isPause;
-        },
-        setDisabled(data) {
-            this.executeDisabled = !data;
-        },
-        initAutoSaveScript() {
-            const timeout = 1000 * 20;
-            this.clearAutoSave(this.autoSaveScript);
-            this.autoSaveScript = setInterval(this.saveScenesData, timeout);
-        },
-        clearAutoSave() {
-            if (this.autoSaveScript) {
-                clearInterval(this.autoSaveScript);
-                this.autoSaveScript = null;
-            }
-        },
-        pauseScript() {
-            if (this.drawWay) {
-                simulationPause(this.group).then(resp => {
-                    this.$store.dispatch('scriptRecord/updateSimulationPause', true);
-                }).catch(() => {
-                    this.$messageBox(this.$t('scriptRecord.pauseFail'));
-                });
-            } else {
-                scriptPause(this.group).then(resp => {
-                    this.$store.dispatch('scriptRecord/updateSimulationPause', true);
-                }).catch(() => {
-                    this.$messageBox(this.$t('scriptRecord.pauseFail'));
-                });
-            }
-
-        },
-        executePlayScript() {
-            if (this.drawWay) {
-                executeScriptNew(this.group).then(resp => {
-                    this.$store.dispatch('scriptRecord/updateSimulationPause', false);
-                }).catch(() => {
-                    this.$messageBox(this.$t('scriptRecord.recoverFail'));
-                });
-            } else {
-                executeScript(this.group).then(resp => {
-                    this.$store.dispatch('scriptRecord/updateSimulationPause', false);
-                }).catch(() => {
-                    this.$messageBox(this.$t('scriptRecord.recoverFail'));
-                });
-            }
-
-        },
-        saveScenesStage() {
-            const data = Vue.prototype.$jlmap.$options;
-            const group = this.$route.query.group;
-            const dataZoom = {scale: data.scaleRate, x: data.offsetX, y: data.offsetY};
-            if (this.drawWay) {
-                saveScriptScenesNew(this.group).then(resp => {
-                    updateMapLocationNew(group, dataZoom).then(response=>{
-                        this.$store.dispatch('scriptRecord/updateBgSet', true);
-                        this.$message.success(this.$t('scriptRecord.saveBackgroundSuceess'));
-                    }).catch(error => {
-                        this.$messageBox(`${this.$t('scriptRecord.updateLocationFail')}: ${error.message}`);
-                    });
-                }).catch((error) => {
-                    this.$messageBox(`${this.$t('scriptRecord.saveBackgroundFail')}: ${error.message}`);
-                });
-            } else {
-                saveScriptScenes(this.group).then(resp => {
-                    updateMapLocation(group, dataZoom).then(response=>{
-                        this.$store.dispatch('scriptRecord/updateBgSet', true);
-                        this.$message.success(this.$t('scriptRecord.saveBackgroundSuceess'));
-                    }).catch(error => {
-                        this.$messageBox(`${this.$t('scriptRecord.updateLocationFail')}: ${error.message}`);
-                    });
-                }).catch((error) => {
-                    this.$messageBox(`${this.$t('scriptRecord.saveBackgroundFail')}: ${error.message}`);
-                });
-            }
-
-        },
-        saveScenesData() {
-            this.isSavingScript = true;
-            if (this.drawWay) {
-                saveScriptDataNew(this.group).then(resp => {
-                    this.$message.success(this.$t('scriptRecord.saveDataSucess'));
-                    this.isSavingScript = false;
-                    // this.initAutoSaveScript();
-                }).catch(error => {
-                    this.$messageBox(`${this.$t('scriptRecord.saveDataFail')}: ${error.message}`);
-                    this.isSavingScript = false;
-                    if (error.code === 40004 || error.code === 40005 || error.code === 40003) {
-                        this.clearAutoSave();
-                    } else {
-                        // this.initAutoSaveScript();
-                    }
-                });
-            } else {
-                saveScriptData(this.group).then(resp => {
-                    this.$message.success(this.$t('scriptRecord.saveDataSucess'));
-                    this.isSavingScript = false;
-                    // this.initAutoSaveScript();
-                }).catch(error => {
-                    this.$messageBox(`${this.$t('scriptRecord.saveDataFail')}: ${error.message}`);
-                    this.isSavingScript = false;
-                    if (error.code === 40004 || error.code === 40005 || error.code === 40003) {
-                        this.clearAutoSave();
-                    } else {
-                        // this.initAutoSaveScript();
-                    }
-                });
-            }
-        },
-        dumpScenesData() {
-            this.clearAutoSave();
-            const group = this.group;
-            this.$confirm(this.$t('scriptRecord.clearDataTip'), this.$t('global.tips'), {
-                confirmButtonText: this.$t('global.confirm'),
-                cancelButtonText: this.$t('global.cancel'),
-                type: 'warning'
-            }).then(() => {
-                if (this.drawWay) {
-                    dumpScriptDataNew(group).then(resp => {
-                        this.$parent.$refs['display'].$refs['menuScript'].resetBeginTime();
-                        this.$refs['getAction'].loadInitData();
-                        this.$refs['addRole'].initData();
-                        this.$refs['addAction'].initData();
-                        this.$refs['addAction'].resetData();
-                        // this.initAutoSaveScript();
-                        this.$store.dispatch('scriptRecord/updateBgSet', false);
-                        this.$message.success(this.$t('scriptRecord.resetDataSuccess'));
-                    }).catch(() => {
-                        this.$messageBox(this.$t('scriptRecord.resetDataFail'));
-                    });
-                } else {
-                    dumpScriptData(group).then(resp => {
-                        this.$parent.$refs['display'].$refs['menuScript'].resetBeginTime();
-                        this.$refs['getAction'].loadInitData();
-                        this.$refs['addRole'].initData();
-                        this.$refs['addAction'].initData();
-                        this.$refs['addAction'].resetData();
-                        // this.initAutoSaveScript();
-                        this.$store.dispatch('scriptRecord/updateBgSet', false);
-                        this.$message.success(this.$t('scriptRecord.resetDataSuccess'));
-                    }).catch(() => {
-                        this.$messageBox(this.$t('scriptRecord.resetDataFail'));
-                    });
-                }
-
-            }).catch(() => {
-                // this.initAutoSaveScript();
-            });
-        },
-        refresh() {
-            this.$refs['addAction'].initData();
-        },
-        create() {
-            this.$refs['getAction'].loadInitData();
-        },
-        setAction(row) {
-            this.$refs['addAction'].doShow(row);
-        }
-    }
-};
-</script>
-<style rel="stylesheet/scss" lang="scss" scoped>
-    @import "src/styles/mixin.scss";
-	.reminder-drag{
-		width: 100%;
-		height: 100%;
-	}
-
-    .reminder-box {
-        position: absolute;
-        float: left;
-        left: 0px;
-        top:0px;
-        height: 100%;
-        background-color: #fff;
-        overflow: hidden;
-        z-index: 10;
-        font-size: 18px;
-
-        .actionPane{
-            height: 100%;
-        }
-
-        .button-group{
-            margin: 8px;
-            float: right;
-        }
-
-        .actionList{
-            margin-top: 10px;
-            font-size: 15px;
-            padding-top: 5px;
-            border-bottom: 1px #ccc solid;
-            height: 35px;
-        }
-        .titleStyle{
-            margin-left:5px;
-        }
-
-        .icon {
-            float: right;
-            margin-right: 10px;
-            cursor: pointer;
-            background-color: #f3f3f3;
-            border-radius: 50%;
-        }
-
-        /deep/ {
-            .el-tree-node__content {
-                margin-bottom: 4px;
-            }
-
-            .el-tree--highlight-current .el-tree-node.is-current>.el-tree-node__content {
-                background-color: #d6e5f7;
-            }
-        }
-    }
-</style>
diff --git a/src/views/oldMap/scriptManage/scriptRecord/addAction.vue b/src/views/oldMap/scriptManage/scriptRecord/addAction.vue
deleted file mode 100644
index 426c6f000..000000000
--- a/src/views/oldMap/scriptManage/scriptRecord/addAction.vue
+++ /dev/null
@@ -1,673 +0,0 @@
-<template>
-  <el-scrollbar ref="elActionScrollbar" class="addScript" :style="{width:size.width+'px',height:size.height+'px'}" wrap-class="scrollbar-wrapper">
-    <el-card class="conversitionCard">
-      <div class="addConversition">{{ $t('scriptRecord.addConversition') }}</div>
-      <el-form ref="modalData" size="mini" :model="modalData" :rules="rules" label-width="100px" class="conversitionInfo" label-position="right">
-        <div>
-          <div class="itemGroup">
-            <el-form-item :label="$t('scriptRecord.narrator')" class="conditionVO" prop="actionVO.memberId">
-              <el-select v-model="modalData.actionVO.memberId" :placeholder="$t('scriptRecord.narratorRules')" :disabled="isPause&&isNotModify">
-                <el-option v-for="member in memberList" :key="member.id" :label="member.name" :value="member.id" />
-              </el-select>
-            </el-form-item>
-            <el-form-item :label="$t('scriptRecord.receiver')" class="conditionVO" prop="actionVO.targetId">
-              <!-- multiple -->
-              <el-select v-model="modalData.actionVO.targetId" :placeholder="$t('scriptRecord.receiverRules')" :disabled="isPause&&isNotModify">
-                <el-option v-for="member in memberList" :key="member.id" :label="member.name" :value="member.id" />
-              </el-select>
-            </el-form-item>
-          </div>
-          <div class="changeGroup">
-            <div class="changeTop" />
-            <i class="el-icon-sort changeItem" @click="changeItem" />
-            <div class="changeBottom" />
-          </div>
-        </div>
-        <el-form-item :label="$t('scriptRecord.conversitionContent')" class="conditionVO" prop="actionVO.reply">
-          <el-input v-model="modalData.actionVO.reply" type="textarea" class="textareaStyle" rows="3" :disabled="isPause&&isNotModify" />
-        </el-form-item>
-        <el-form-item>
-          <el-button type="primary" :disabled="isPause&&isNotModify" :loading="modifying" @click="addScriptActionInfo('modalData')">{{ buttonName }}</el-button>
-        </el-form-item>
-      </el-form>
-    </el-card>
-    <el-card v-if="!drawWay" class="commandCard">
-      <div class="addCommand">{{ $t('scriptRecord.addCommand') }}</div>
-      <el-form ref="commandData" size="mini" :model="commandData" :rules="commandRules" label-width="120px" class="actionInfo" label-position="right">
-        <el-form-item :label="$t('scriptRecord.executor')" class="conditionVO" prop="action.memberId">
-          <el-select v-model="commandData.action.memberId" :placeholder="$t('scriptRecord.executorRules')" :disabled="isPause" @change="changeRole">
-            <el-option v-for="member in memberList" :key="member.id" :label="member.name" :value="member.id" />
-          </el-select>
-        </el-form-item>
-        <el-form-item :label="$t('scriptRecord.executeCommand')" class="conditionVO" prop="action.deviceCommand">
-          <el-select v-model="commandData.action.deviceCommand " :placeholder="$t('scriptRecord.executeCommandRules')" class="inputStyle" :disabled="isPause" @change="changeCommand">
-            <el-option v-for="deviceCommand in deviceCommandList" :key="deviceCommand.deviceCommand" :label="deviceCommand.label" :value="deviceCommand.deviceCommand" />
-          </el-select>
-        </el-form-item>
-        <command-operation ref="command" :type="commandType" :is-pause="isPause" :command-data="commandData" />
-        <el-form-item>
-          <el-button type="primary" :disabled="isPause" :loading="adding" @click="addCommandAction('commandData')">{{ $t('scriptRecord.addCommandButton') }}</el-button>
-        </el-form-item>
-      </el-form>
-    </el-card>
-    <el-card v-else class="commandCard">
-      <el-form ref="commandDataNew" size="mini" label-width="120px" class="actionInfo" label-position="right">
-        <div class="addCommand">{{ $t('scriptRecord.addCommand') }}</div>
-        <el-form-item :label="$t('scriptRecord.executor')" class="conditionVO">
-          <el-select v-model="commandDataNew.action.memberId" :placeholder="$t('scriptRecord.executorRules')" :disabled="isPause" @change="changeMember">
-            <el-option v-for="member in memberList" :key="member.id" :label="member.name" :value="member.id" />
-          </el-select>
-          <div class="el-form-item__error">{{ messageTips1 }}</div>
-        </el-form-item>
-        <el-form-item :label="$t('scriptRecord.executeCommand')" class="conditionVO">
-          <el-input v-model="executeCommandName" disabled style="width:130px" />
-          <!-- <el-button :type="field === 'commandActive' ? 'danger' : 'primary'" size="small" @click="hover('commandActive')">{{ $t('map.activate') }}</el-button> -->
-          <div class="el-form-item__error">{{ messageTips2 }}</div>
-        </el-form-item>
-        <el-form-item>
-          <el-button type="primary" :disabled="isPause" :loading="adding" @click="addCommandActionNew()">{{ $t('scriptRecord.addCommandButton') }}</el-button>
-        </el-form-item>
-      </el-form>
-    </el-card>
-  </el-scrollbar>
-</template>
-<script>
-import Vue from 'vue';
-import Cookies from 'js-cookie';
-import ConstConfig from '@/scripts/ConstConfig';
-import CommandOperation from './command';
-import {addScriptAction, addScriptActionNew, modifyScriptAction, modifyScriptActionNew, getAvailableDeviceCommand, getScriptPlayMember, getScriptPlayMemberNew} from '@/api/simulation';
-export default {
-    name: 'AddAction',
-    components:{
-        CommandOperation
-    },
-    props: {
-        group: {
-            type: String,
-            required: true
-        },
-        size:{
-            type: Object,
-            required: true
-        }
-    },
-    data() {
-        return {
-            buttonName:this.$t('scriptRecord.addConversitionButton'),
-            operateType:'add',
-            field:'',
-            modalData:{
-                actionVO:{
-                    memberId:'',
-                    targetId:'',
-                    reply:'',
-                    type:'Conversation'
-                }
-            },
-            messageTips1:'',
-            messageTips2:'',
-            isFirstTips:true,
-            executeCommandName:'',
-            commandDataNew:{
-                action:{
-                    memberId:'',
-                    operationType:'',
-                    operationParamMap:{},
-                    type:'Command'
-                }
-            },
-            commandData:{
-                action:{
-                    memberId:'',
-                    deviceCommand:'',
-                    commandParamList:[],
-                    type:'Command'
-                },
-                param:{
-                    startStation:'',
-                    endStation:'',
-                    drivingMode:'',
-                    speed:'',
-                    signal:''
-                }
-            },
-            isPause:false,
-            isNotModify:true,
-            modifying:false,
-            adding:false,
-            commandType:'',
-            memberList:[],
-            deviceCommandList:[],
-            orginMemberList:[],
-            rules:{
-                actionVO:{
-                    memberId:[
-                        { required: true, message: this.$t('scriptRecord.narratorRules'), trigger: 'change' }
-                    ],
-                    reply:[
-                        { required: true, message: this.$t('scriptRecord.conversitionContentRules'), trigger: 'blur' }
-                    ],
-                    targetId:[
-                        { required: true, message: this.$t('scriptRecord.receiverRules'), trigger: 'change' }
-                    ]
-                }
-            },
-            commandRules:{
-                action:{
-                    memberId:[
-                        { required: true, message: this.$t('scriptRecord.executorRules'), trigger: 'change' }
-                    ],
-                    deviceCommand:[
-                        { required: true, message: this.$t('scriptRecord.executeCommandRules'), trigger: 'change' }
-                    ]
-                },
-                param:{
-                    startStation:[
-                        { required: true, message: this.$t('scriptRecord.startStationRules'), trigger: 'change' }
-                    ],
-                    endStation:[
-                        { required: true, message: this.$t('scriptRecord.endStationRules'), trigger: 'change' }
-                    ],
-                    drivingMode:[
-                        { required: true, message: this.$t('scriptRecord.drivingModeRules'), trigger: 'change' }
-                    ],
-                    speed:[
-                        { required: true, message: this.$t('scriptRecord.speedRules'), trigger: 'blur' }
-                    ],
-                    signal:[
-                        { required: true, message: this.$t('scriptRecord.signalRules'), trigger: 'blur' }
-                    ]
-                }
-            }
-        };
-    },
-    computed:{
-        drawWay() {
-            const drawWay = this.$route.query.drawWay;
-            return drawWay && JSON.parse(drawWay);
-        }
-    },
-    watch:{
-        '$store.state.map.mapViewLoadedCount': function (val) {
-            Vue.prototype.$jlmap.setOptions(this.$store.state.scriptRecord.mapLocation);
-            this.isPause = !(this.$store.state.scriptRecord.simulationPause);
-            this.$parent.$parent.$parent.setIsParse(this.isPause);
-        },
-        '$store.state.scriptRecord.simulationPause': function(val) {
-            this.isPause = !(this.$store.state.scriptRecord.simulationPause);
-            this.$parent.$parent.$parent.setIsParse(this.isPause);
-            this.$refs['modalData'].clearValidate();
-            if (this.drawWay) {
-                this.$refs['commandDataNew'].clearValidate();
-                if (!val) {
-                    this.initActionData();
-                    this.clearCommand();
-                }
-            } else {
-                this.$refs['commandData'].clearValidate();
-                if (!val) {
-                    this.initActionData();
-                    this.initCommandActionData();
-                }
-            }
-        },
-        '$store.state.scriptRecord.scriptCommand':function (val) {
-            const operate = val.cmdType.value;
-            const operateType = operate.split('_')[0];
-            const deviceTypeList = {Section:'区段', Switch:'道岔', Signal:'信号机', Stand:'站台', Station:'车站', TrainWindow:'车次窗', CM:'控制模式'};
-            const operateTypeName = deviceTypeList[operateType];
-            this.executeCommandName = operateTypeName + '(' + val.cmdType.label + ')';
-            this.commandDataNew.action.operationType = val.cmdType.value;
-            // this.commandDataNew.action.operationId = val.operationId;
-            this.commandDataNew.action.operationParamMap = val.param;
-            this.messageTips2 = '';
-        },
-        'commandDataNew.action.memberId':function(val) {
-            if (val) {
-                this.$store.dispatch('scriptRecord/updateIsScriptCommand', true);
-            } else {
-                this.$store.dispatch('scriptRecord/updateIsScriptCommand', false);
-            }
-        }
-    },
-    mounted() {
-        this.initData();
-    },
-    beforeDestroy() {
-        this.$store.dispatch('scriptRecord/updateIsScriptCommand', false);
-    },
-    methods:{
-        initData() {
-            this.buttonName = this.$t('scriptRecord.addConversitionButton');
-            this.operateType = 'add';
-            if (this.drawWay) {
-                getScriptPlayMemberNew(this.group).then(resp => {
-                    this.orginMemberList = resp.data;
-                    const lastData = JSON.stringify(resp.data);
-                    this.memberList = this.covert(lastData, ConstConfig.ConstSelect.roleTypeNew);
-                    this.resetDisabled();
-                    this.clearCommand();
-                }).catch(error => {
-                    this.$message(error.message);
-                });
-            } else {
-                getScriptPlayMember(this.group).then(resp => {
-                    this.orginMemberList = resp.data;
-                    const lastData = JSON.stringify(resp.data);
-                    this.memberList = this.covert(lastData, ConstConfig.ConstSelect.roleType);
-                    this.resetDisabled();
-                    this.initCommandActionData();
-                }).catch(error => {
-                    this.$message(error.message);
-                });
-            }
-
-        },
-        covert(data, roleTypeList) {
-            let lastData = data;
-            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);
-            lastData.forEach(each=>{
-                const name = each.name == undefined ? '' : '-' + each.name;
-                const deviceName = each.deviceName == undefined ? '' : '-' + each.deviceName;
-                each.name = each.role + deviceName + name;
-            });
-            return lastData;
-        },
-        // hover(field) {
-        //     if (this.field == '') {
-        //         if (this.isFirstTips) {
-        //             this.$message('请在右侧地图上选择操作');
-        //             this.isFirstTips = false;
-        //         }
-        //         this.field = field;
-        //         this.$store.dispatch('scriptRecord/updateIsScriptCommand', true);
-        //     } else {
-        //         this.field = '';
-        //         this.$store.dispatch('scriptRecord/updateIsScriptCommand', false);
-        //     }
-        // },
-        changeRole(index) {
-            const role = this.orginMemberList.find(elem=>{ return elem.id == index; }).role;
-            const data = {role:role};
-            getAvailableDeviceCommand(data).then(response=>{
-                if (Cookies.get('user_lang') == 'en') {
-                    const tempData = response.data;
-                    tempData.forEach( element => {
-                        switch (element.deviceCommand) {
-                        case 'Train_Manual_Limit_Drive': {
-                            element.label = 'Confirm to run to the front station';
-                            break;
-                        }
-                        case 'Train_Manual_Route_Blocking_Drive': {
-                            element.label = 'Drive as the route block method';
-                            break;
-                        }
-                        }
-                    });
-                    this.deviceCommandList = tempData;
-                } else {
-                    this.deviceCommandList = response.data;
-                }
-                if (response.data.length <= 0) {
-                    this.commandData.action.deviceCommand = '';
-                    this.commandType = '';
-
-                }
-            });
-        },
-        getParams() {
-            if (this.commandData.param.speed) {
-                return [this.commandData.param.drivingMode, this.commandData.param.speed, this.commandData.param.signal];
-            } else {
-                return [this.commandData.param.drivingMode, this.commandData.param.signal];
-            }
-        },
-        addCommandAction(formName) {
-            this.$refs[formName].validate((valid) => {
-                if (valid) {
-                    const group = this.group;
-                    this.commandData.action.type = 'Command';
-                    switch (this.commandData.action.deviceCommand) {
-                    case 'Train_Manual_Route_Blocking_Drive': {
-                        this.commandData.action.commandParamList = [this.commandData.param.startStation, this.commandData.param.endStation];
-                        break;
-                    }
-                    case 'Train_Pass_Red_Signal': {
-                        this.commandData.action.commandParamList = this.getParams();
-                        break;
-                    }
-                    case 'Train_Drive_By_Guide_Signal': {
-                        this.commandData.action.commandParamList = this.getParams();
-                        break;
-                    }
-                    }
-
-                    const data = this.commandData.action;
-                    this.adding = true;
-                    addScriptAction(group, data).then(response=>{
-                        this.adding = false;
-                        this.$message.success(this.$t('scriptRecord.addCommandSucess'));
-                        this.$emit('create');
-                        this.$refs.command.resetButton();
-                        // this.$emit('create',[this.commandData.action.memberId]);
-                        // this.$parent.$parent.$refs['addRole'].resetData([this.commandData.action.memberId]);
-                        // this.initCommandActionData();
-                    }).catch(error => {
-                        this.adding = false;
-                        this.$messageBox(`${this.$t('scriptRecord.addCommandFail')}: ${error.message}`);
-                    });
-                } else {
-                    console.log('error submit!!');
-                    return false;
-                }
-            });
-        },
-        changeMember(member) {
-            if (member) {
-                if (this.isFirstTips) {
-                    this.$message('请在右侧地图上选择操作');
-                    this.isFirstTips = false;
-                }
-                this.messageTips1 = '';
-                this.executeCommandName = '';
-                this.commandDataNew.action.operationType = '';
-                this.commandDataNew.action.operationParamMap = {};
-                this.$store.dispatch('scriptRecord/updateIsScriptCommand', true);
-                this.switchMode(member);
-            }
-        },
-        addCommandActionNew() {
-            if (this.commandDataNew.action.memberId == '') {
-                this.messageTips1 = '请选择执行者';
-                return false;
-            } else if (this.commandDataNew.action.operationType == '') {
-                this.messageTips2 = '请在右侧的地图中选择操作';
-                return false;
-            } else if (Object.keys(this.commandDataNew.action.operationParamMap).length === 0) {
-                this.messageTips2 = '请在右侧的地图中选择操作';
-                return false;
-            } else {
-                const group = this.group;
-                const data = this.commandDataNew.action;
-                this.adding = true;
-                addScriptActionNew(group, data).then(response=>{
-                    this.adding = false;
-                    this.clearCommand();
-                    this.$message.success(this.$t('scriptRecord.addCommandSucess'));
-                    this.$emit('create');
-                }).catch(error => {
-                    this.adding = false;
-                    this.$messageBox(`${this.$t('scriptRecord.addCommandFail')}: ${error.message}`);
-                });
-            }
-        },
-        clearCommand() {
-            this.commandDataNew.action.memberId = '';
-            this.executeCommandName = '';
-            this.commandDataNew.action.operationType = '';
-            this.commandDataNew.action.operationParamMap = {};
-        },
-        addScriptActionInfo(formName) {
-            this.$refs[formName].validate((valid) => {
-                if (valid) {
-                    const group = this.group;
-                    this.modalData.actionVO.type = 'Conversation';
-                    const data = this.modalData.actionVO;
-                    this.modifying = true;
-                    if (this.operateType == 'add') {
-                        if (this.drawWay) {
-                            addScriptActionNew(group, data).then(response=>{
-                                this.modifying = false;
-                                this.$message.success(this.$t('scriptRecord.addConversitionSuccess'));
-                                this.$emit('create');
-                            // [this.modalData.actionVO.memberId]
-                            // this.initActionData();
-                            // this.$parent.$parent.$refs['addRole'].resetData([this.modalData.actionVO.memberId,this.modalData.actionVO.targetId]);
-                            }).catch(error => {
-                                this.modifying = false;
-                                this.$messageBox(`${this.$t('scriptRecord.addConversitionFail')}: ${error.message}`);
-                            });
-                        } else {
-                            addScriptAction(group, data).then(response=>{
-                                this.modifying = false;
-                                this.$message.success(this.$t('scriptRecord.addConversitionSuccess'));
-                                this.$emit('create');
-                            // [this.modalData.actionVO.memberId]
-                            // this.initActionData();
-                            // this.$parent.$parent.$refs['addRole'].resetData([this.modalData.actionVO.memberId,this.modalData.actionVO.targetId]);
-                            }).catch(error => {
-                                this.modifying = false;
-                                this.$messageBox(`${this.$t('scriptRecord.addConversitionFail')}: ${error.message}`);
-                            });
-                        }
-
-                    } else {
-                        const actionId = this.modalData.actionVO.id;
-                        if (this.drawWay) {
-                            data.id = actionId;
-                            modifyScriptActionNew(group, data).then(response=>{
-                                this.modifying = false;
-                                this.isNotModify = true;
-                                this.$emit('setDisabled', this.isNotModify);
-                                this.buttonName = this.$t('scriptRecord.addConversitionButton');
-                                this.operateType = 'add';
-                                this.$message.success(this.$t('scriptRecord.modifyConversitionSuccess'));
-                                this.$emit('create');
-                                // this.$parent.$parent.$refs['addRole'].resetData([this.modalData.action.memberId,this.modalData.action.targetId]);
-                                this.initActionData();
-                            }).catch(error => {
-                                this.modifying = false;
-                                this.$messageBox(`${this.$t('scriptRecord.modifyConversitionFail')}: ${error.message}`);
-                            });
-                        } else {
-                            modifyScriptAction(group, actionId, data).then(response=>{
-                                this.modifying = false;
-                                this.isNotModify = true;
-                                this.$emit('setDisabled', this.isNotModify);
-                                this.buttonName = this.$t('scriptRecord.addConversitionButton');
-                                this.operateType = 'add';
-                                this.$message.success(this.$t('scriptRecord.modifyConversitionSuccess'));
-                                this.$emit('create');
-                                // this.$parent.$parent.$refs['addRole'].resetData([this.modalData.action.memberId,this.modalData.action.targetId]);
-                                this.initActionData();
-                            }).catch(error => {
-                                this.modifying = false;
-                                this.$messageBox(`${this.$t('scriptRecord.modifyConversitionFail')}: ${error.message}`);
-                            });
-                        }
-
-                    }
-                } else {
-                    console.log('error submit!!');
-                    return false;
-                }
-            });
-        },
-        resetDisabled() {
-            if (this.$refs['modalData']) {
-                this.$refs['modalData'].resetFields();
-                this.modalData.actionVO.type = 'Conversation';
-                this.modalData.actionVO.memberId = '';
-                this.modalData.actionVO.targetId = '';
-                this.modalData.actionVO.reply = '';
-            }
-        },
-        clearValidate() {
-            if (this.$refs['commandData']) {
-                this.$refs['commandData'].clearValidate();
-            }
-        },
-        initActionData() {
-            this.resetDisabled();
-        },
-        initCommandActionData() {
-            if (this.$refs['commandData']) {
-                this.deviceCommandList = [];
-                this.$refs['commandData'].resetFields();
-                this.commandData.action.memberId = '';
-                this.commandData.param.startStation = '';
-                this.commandType = '';
-                this.commandData.param.endStation = '';
-            }
-        },
-        changeCommand(index) {
-            switch (index) {
-            case 'Train_Manual_Route_Blocking_Drive': {
-                this.commandType = 'isJinLu';
-                this.$refs.command.getDeviceCode();
-                this.clearValidate();
-                break;
-            }
-            case 'Train_Pass_Red_Signal': {
-                this.commandType = 'signal';
-                this.clearValidate();
-                break;
-            }
-            case 'Train_Drive_By_Guide_Signal': {
-                this.commandType = 'signal';
-                this.clearValidate();
-                break;
-            }
-            default: {
-                this.commandType = '';
-                this.clearValidate();
-                break;
-            }
-            }
-        },
-        changeItem() {
-            if (!(this.isPause && this.isNotModify)) {
-                // debugger;
-                // if (this.modalData.actionVO.targetId) {
-
-                // }
-                const temp = this.modalData.actionVO.memberId;
-                this.modalData.actionVO.memberId = this.modalData.actionVO.targetId;
-                this.modalData.actionVO.targetId = temp;
-            }
-        },
-        doShow(data) {
-            if (data) {
-                this.buttonName = this.$t('scriptRecord.modifyConversition');
-                this.operateType = 'modify';
-                this.clearValidate();
-                this.isNotModify = false;
-                this.$emit('setDisabled', this.isNotModify);
-                // this.initData();
-                this.modalData.actionVO.id = data.id;
-                this.modalData.actionVO.memberId = data.memberId;
-                this.modalData.actionVO.type = data.type;
-                if (data.type == 'Conversation') {
-                    this.commandType = '';
-                    this.modalData.actionVO.targetId = data.targetId;
-                    this.modalData.actionVO.reply = data.reply;
-                }
-            }
-        },
-        resetData() {
-            if (!this.drawWay) {
-                this.$refs.command.resetData();
-            }
-        },
-        switchMode(role) {
-            let prdType = '';
-            const memberInfo = this.memberList.find(member=>{
-                return member.id == role;
-            });
-            if (memberInfo) {
-                if (memberInfo.role == '行值') {
-                    prdType = '01';
-                } else if (memberInfo.role == '行调') {
-                    prdType = '02';
-                } else if (memberInfo.role == '司机') {
-                    prdType = '04';
-                }
-            }
-            this.$store.dispatch('training/setPrdType', prdType);
-        }
-    }
-};
-</script>
-<style rel="stylesheet/scss" lang="scss" scoped>
-    @import "src/styles/mixin.scss";
-    .addConversition{
-        margin-left:10px;
-    }
-    .conversitionInfo{
-        width:350px;
-    }
-    .addAction{
-        margin-top: 20px;
-        margin-left: 5px;
-        font-size: 15px;
-    }
-    .actionInfo{
-        margin-top:10px;
-        margin-left: 5px;
-        font-size: 15px;
-        // width:98%;
-    }
-    .inputStyle{
-        width:200px;
-        height:30px;
-    }
-    .textareaStyle{
-        width:200px;
-    }
-    .conversitionCard{
-        padding-bottom: 20px;
-        margin-top: 10px;
-    }
-    .addConversition{
-        font-size:15px;
-        padding: 20px 10px;
-    }
-    .commandCard{
-        padding-bottom: 20px;
-        margin-top: 10px;
-    }
-    .addCommand{
-        font-size:15px;
-        padding: 20px 10px;
-    }
-    .itemGroup{
-        width:290px;
-        float:left;
-    }
-    .changeGroup{
-        display:inline-block;
-    }
-    .changeTop{
-        margin-top: 10px;
-        width: 25px;
-        border-top: 1px #c0c4cc solid;
-        border-right: 1px #c0c4cc solid;
-        height: 15px;
-    }
-    .changeItem{
-        margin-left: 15px;
-        margin-top: 5px;
-        cursor: pointer;
-    }
-    .changeBottom{
-        margin-top: 5px;
-        width: 25px;
-        border-bottom: 1px #c0c4cc solid;
-        border-right: 1px #c0c4cc solid;
-        height: 15px;
-    }
-    .addScript{
-        margin-top:20px;
-        float:left;
-    }
-
-</style>
diff --git a/src/views/oldMap/scriptManage/scriptRecord/addRole.vue b/src/views/oldMap/scriptManage/scriptRecord/addRole.vue
deleted file mode 100644
index fd12ceda2..000000000
--- a/src/views/oldMap/scriptManage/scriptRecord/addRole.vue
+++ /dev/null
@@ -1,201 +0,0 @@
-<template>
-  <el-card class="scriptTop">
-    <el-transfer v-model="selectRoleData" :data="allRoleData" class="script-player-choose" :titles="[$t('scriptRecord.allRoles'), $t('scriptRecord.actors')]" @change="handleChange">
-      <span slot-scope="{option}">
-        <span>{{ option.name }}</span>
-        <el-radio-group v-model="option.gender" size="mini" class="sexGroup" @change="changeSex($event,option.key)">
-          <el-radio-button label="Male">{{ $t('scriptRecord.roleSexMale') }}</el-radio-button>
-          <el-radio-button label="Female">{{ $t('scriptRecord.roleSexFemale') }}</el-radio-button>
-        </el-radio-group>
-      </span>
-    </el-transfer>
-  </el-card>
-</template>
-<script>
-import Cookies from 'js-cookie';
-import ConstConfig from '@/scripts/ConstConfig';
-import {getScriptPlayMember, getScriptPlayMemberNew, getScriptMemberData, getScriptMemberDataNew, cancleScriptMembers, cancleScriptMembersNew, selectScriptMembers, selectScriptMembersNew, modifyScriptMemberSex} from '@/api/simulation';
-export default {
-    name: 'AddRole',
-    props: {
-        group: {
-            type: String,
-            required: true
-        }
-    },
-    data() {
-        return {
-            allRoleData: [],
-            selectRoleData: [],
-            sexGroup: this.$t('scriptRecord.roleSexMale')
-        };
-    },
-    computed:{
-        drawWay() {
-            const drawWay = this.$route.query.drawWay;
-            return drawWay && JSON.parse(drawWay);
-        }
-    },
-    watch: {
-        '$store.state.socket.simulationStart': function (val) {
-            if (val) {
-                this.initData();
-            }
-        }
-        // '$store.state.map.runPlanStatus':function (val) {
-        //     this.initData();
-        // }
-    },
-    mounted() {
-        this.initData();
-    },
-    methods: {
-        initData() {
-            const group = this.$props.group;
-            if (this.drawWay) {
-                getScriptMemberDataNew(group).then(response=>{
-                    const lastData = JSON.stringify(response.data);
-                    this.allRoleData = this.coverData(lastData, ConstConfig.ConstSelect.roleTypeNew);
-                    getScriptPlayMemberNew(group).then(response=>{
-                        const last = response.data;
-                        const data = [];
-                        last.forEach(function(element) { data.push(element.id); });
-                        this.selectRoleData = data;
-                    });
-                });
-
-            } else {
-                getScriptMemberData(group).then(response=>{
-                    const lastData = JSON.stringify(response.data);
-                    this.allRoleData = this.coverData(lastData, ConstConfig.ConstSelect.roleType);
-                    getScriptPlayMember(group).then(response=>{
-                        const last = response.data;
-                        const data = [];
-                        last.forEach(function(element) { data.push(element.id); });
-                        this.selectRoleData = data;
-                    });
-                });
-            }
-
-        },
-        coverData(data, roleTypeList) {
-            let lastData = data.replace(new RegExp('id', 'g'), 'key');
-            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);
-            lastData.forEach(each=>{
-                const name = each.name == undefined ? '' : '-' + each.name;
-                const deviceName = each.deviceName == undefined ? '' : '-' + each.deviceName;
-                each.name = each.role + deviceName + name;
-            });
-            return lastData;
-        },
-        handleChange(value, direction, movedKeys) {
-            switch (direction) {
-            case 'right': {
-                const group = this.$props.group;
-                const data = movedKeys;
-                if (this.drawWay) {
-                    selectScriptMembersNew(group, data).then(response=>{
-                        this.$message.success(this.$t('scriptRecord.selectScriptActorSuccess'));
-                        this.$emit('refresh');
-                    }).catch(error => {
-                        this.$messageBox(`${this.$t('scriptRecord.selectScriptActorFail')}: ${error.message}`);
-                        return false;
-                    });
-                } else {
-                    selectScriptMembers(group, data).then(response=>{
-                        this.$message.success(this.$t('scriptRecord.selectScriptActorSuccess'));
-                        this.$emit('refresh');
-                    }).catch(error => {
-                        this.$messageBox(`${this.$t('scriptRecord.selectScriptActorFail')}: ${error.message}`);
-                        return false;
-                    });
-                }
-
-                break;
-            }
-            case 'left': {
-                const group = this.$props.group;
-                const data = movedKeys;
-                if (this.drawWay) {
-                    cancleScriptMembersNew(group, data).then(response=>{
-                        this.$emit('refresh');
-                        this.$message.success(this.$t('scriptRecord.cancleScriptActorSuccess'));
-                    }).catch(error => {
-                        this.$messageBox(`${this.$t('scriptRecord.cancleScriptActorFail')}: ${error.message}`);
-                        this.initData();
-                    });
-                } else {
-                    cancleScriptMembers(group, data).then(response=>{
-                        this.$emit('refresh');
-                        this.$message.success(this.$t('scriptRecord.cancleScriptActorSuccess'));
-                    }).catch(error => {
-                        this.$messageBox(`${this.$t('scriptRecord.cancleScriptActorFail')}: ${error.message}`);
-                        this.initData();
-                    });
-                }
-
-            }
-            }
-        },
-        changeSex(event, id) {
-            const group = this.$props.group;
-            const data = {'gender': event};
-            modifyScriptMemberSex(group, id, data).then(response=>{
-                this.$message.success(this.$t('scriptRecord.modifyScriptActorSexSuccess'));
-            }).catch(error => {
-                this.$messageBox(`${this.$t('scriptRecord.modifyScriptActorSexFail')}: ${error.message}`);
-            });
-        }
-    }
-};
-</script>
-<style rel="stylesheet/scss" lang="scss" scoped>
-    @import "src/styles/mixin.scss";
-    .elTransfer{
-        margin-left:20px;
-        width:700px;
-    }
-    .scriptTop{
-        padding: 10px 10px;
-        width: 100%;
-		/deep/ {
-			.script-player-choose .el-transfer-panel__body{
-				height: 120px;
-			}
-			.script-player-choose .el-transfer-panel__list{
-				height: 120px;
-			}
-			.script-player-choose .el-transfer-panel{
-				width: 44%;
-			}
-			.el-transfer-panel__item{
-				margin-right:0px;
-			}
-			.el-transfer__buttons{
-				padding: 0;
-				width: 12%;
-				.el-button{
-					margin: 14px auto;
-                    margin-left: 50%;
-                    padding: 10px;
-                    transform: translateX(-50%);
-				}
-			}
-		}
-    }
-</style>
-<style>
-    .sexGroup{
-        margin-left: 10px;
-    }
-</style>
-
diff --git a/src/views/oldMap/scriptManage/scriptRecord/command.vue b/src/views/oldMap/scriptManage/scriptRecord/command.vue
deleted file mode 100644
index 8b07f0832..000000000
--- a/src/views/oldMap/scriptManage/scriptRecord/command.vue
+++ /dev/null
@@ -1,123 +0,0 @@
-<template>
-  <div>
-    <div v-if="type==='isJinLu'">
-      <el-form-item :label="$t('scriptRecord.startStation')" class="conditionVO" prop="param.startStation">
-        <el-select v-model="commandData.param.startStation " :placeholder="$t('scriptRecord.startStationRules')" class="inputStyle" :disabled="isPause">
-          <el-option v-for="station in stationList" :key="station.code" :label="station.name" :value="station.code" />
-        </el-select>
-      </el-form-item>
-      <el-form-item :label="$t('scriptRecord.endStation')" class="conditionVO" prop="param.endStation">
-        <el-select v-model="commandData.param.endStation " :placeholder="$t('scriptRecord.endStationRules')" class="inputStyle" :disabled="isPause">
-          <el-option v-for="station in stationList" :key="station.code" :label="station.name" :value="station.code" />
-        </el-select>
-      </el-form-item>
-    </div>
-    <div v-if="type==='signal'">
-      <el-form-item :label="$t('scriptRecord.drivingMode')" class="conditionVO" prop="param.drivingMode">
-        <el-select v-model="commandData.param.drivingMode " :placeholder="$t('scriptRecord.drivingModeRules')" class="inputStyle" :disabled="isPause">
-          <el-option v-for="driveMode in driveModeList" :key="driveMode.id" :label="driveMode.name" :value="driveMode.id" />
-        </el-select>
-      </el-form-item>
-      <el-form-item v-if="commandData.param.drivingMode=='NRM'" :label="$t('scriptRecord.speed')" class="conditionVO" prop="param.speed">
-        <el-input-number v-model="commandData.param.speed" :min="0" />
-        <span> km/h</span>
-      </el-form-item>
-      <el-form-item :label="$t('scriptRecord.signal')" class="conditionVO" prop="param.signal">
-        <el-input v-model="signalName" disabled="disabled" style="width:130px" />
-        <el-button
-          :type="field === 'selectSingalCode' ? 'danger' : 'primary'"
-          size="mini"
-          @click="hover('selectSingalCode')"
-        >{{ $t('map.activate') }}</el-button>
-      </el-form-item>
-    </div>
-  </div>
-</template>
-<script>
-import {getDeviceCodeByDeviceType} from '@/api/simulation';
-export default {
-    props:{
-        type:{
-            type:String,
-            required:true
-        },
-        isPause:{
-            type:Boolean,
-            required:true
-        },
-        commandData:{
-            type:Object,
-            required:true
-        }
-    },
-    data() {
-        return {
-            stationList:[],
-            driveModeList:[
-                {id:'RM', name:'RM'},
-                {id:'NRM', name:'NRM'}
-            ],
-            field: '',
-            fieldS:'',
-            signalName:''
-        };
-    },
-    computed:{
-        drawWay() {
-            const drawWay = this.$route.query.drawWay;
-            return drawWay && JSON.parse(drawWay);
-        }
-    },
-    watch: {
-        '$store.state.menuOperation.selectedCount':function(em) {
-            const device = this.$store.state.menuOperation.selected;
-            if (device.code) {
-                this.deviceSelect(device);
-            }
-        }
-    },
-    mounted() {
-        this.getDeviceCode();
-    },
-    methods:{
-        getDeviceCode() {
-            const params = {deviceType:'StationStand'};
-            const group = this.$route.query.group;
-            if (!this.drawWay) {
-                getDeviceCodeByDeviceType(group, params).then(response =>{
-                    let resultData = response.data;
-                    resultData = JSON.parse(JSON.stringify(response.data).replace(/groupNumber/g, 'name'));
-                    this.stationList = resultData;
-                });
-            }
-        },
-        deviceSelect(em) {
-            if (this.field.toUpperCase() === 'selectSingalCode'.toUpperCase() && em._type.toUpperCase() === 'Signal'.toUpperCase()) {
-                this.commandData.param.signal = em.code;
-                this.signalName = em.name;
-                this.field = '';
-            }
-        },
-        hover(field) {
-            this.field = field === this.field ? '' : field;
-        },
-        resetButton() {
-            this.field = '';
-        },
-        resetData() {
-            switch (this.type) {
-            case 'isJinLu': {
-                this.commandData.param.startStation = '';
-                this.commandData.param.endStation = '';
-                break;
-            }
-            case 'signal': {
-                this.commandData.param.signal = '';
-                this.commandData.param.speed = '';
-                this.commandData.param.drivingMode = '';
-            }
-            }
-        }
-    }
-};
-</script>
diff --git a/src/views/oldMap/scriptManage/scriptRecord/getAction.vue b/src/views/oldMap/scriptManage/scriptRecord/getAction.vue
deleted file mode 100644
index 0d78946cd..000000000
--- a/src/views/oldMap/scriptManage/scriptRecord/getAction.vue
+++ /dev/null
@@ -1,259 +0,0 @@
-<template>
-  <el-scrollbar ref="elActionScrollbar" wrap-class="scrollbar-wrapper" class="scriptBottom" :style="{width:370+'px',height:size.height+'px'}">
-    <el-timeline :reverse="reverse" class="el_timeline">
-      <el-timeline-item v-for="(actionInfo,index) in actionInfoList" :key="index">
-        <el-card>
-          <div class="actionTable">
-            <span class="detail" v-html="actionInfo.detail" />
-            <span class="otherInfo" v-html="actionInfo.otherInfo" />
-            <span v-if="actionInfo.isCoversition">
-              <span class="roleClass">{{ actionInfo.memberName }}</span>
-              <span>{{ $t('scriptRecord.speakTo') }}</span>
-              <span class="roleClass">{{ actionInfo.targetName }}</span>
-              <span>: </span>
-              <span>{{ actionInfo.reply }}</span>
-            </span>
-            <span v-else>
-              <span class="roleClass">{{ actionInfo.memberName }}</span>
-              <span>{{ $t('scriptRecord.executeCommandTips') }}</span>
-              <span class="commandStyle">{{ actionInfo.command }}</span>
-            </span>
-          </div>
-          <div class="btnGroup">
-            <el-button v-if="actionInfo.visible" type="primary" size="mini" style="margin-left:10px;" @click="modifyAction(actionInfo.row)">{{ $t('scriptRecord.modifyConversitionButton') }}</el-button>
-            <!-- <el-button type="danger" size="mini" @click="deleteAction(actionInfo.id)">删除</el-button> -->
-          </div>
-        </el-card>
-      </el-timeline-item>
-    </el-timeline>
-  </el-scrollbar>
-</template>
-<script>
-import Cookies from 'js-cookie';
-import {deleteScriptAction, getAvailableDeviceCommand, getScriptRecord, getScriptAllAction, getScriptPlayMemberNew } from '@/api/simulation';
-import CMD from '@/scripts/cmdPlugin/CommandEnum';
-import CommandHandler from '@/scripts/cmdPlugin/CommandHandler';
-import ConstConfig from '@/scripts/ConstConfig';
-export default {
-    name: 'GetAction',
-    props: {
-        group: {
-            type: String,
-            required: true
-        },
-        size: {
-            type: Object,
-            required: true
-        }
-    },
-    data() {
-        return {
-            actionInfoList: [],
-            deviceCommandList: [],
-            reverse: false,
-            loading: true,
-            // behaviorName:"",
-            memberName: ''
-        };
-    },
-    computed:{
-        drawWay() {
-            const drawWay = this.$route.query.drawWay;
-            return drawWay && JSON.parse(drawWay);
-        }
-    },
-    watch: {
-        actionInfoList: function(val) {
-            this.$nextTick(function() {
-                var div = this.$refs['elActionScrollbar'].$refs['wrap'];
-                div.scrollTop = this.$refs['elActionScrollbar'].wrap.scrollHeight;
-            });
-        }
-    },
-    mounted() {
-        this.loadInitData();
-    },
-    methods: {
-        loadInitData() {
-            // const group=this.$route.query.group;
-            const data = {role: 'Driver'};
-            if (!this.drawWay) {
-                getAvailableDeviceCommand(data).then(response=>{
-                    this.deviceCommandList = response.data;
-                    this.loadOtherData(this.$route.query);
-                });
-            } else {
-                this.loadOtherData(this.$route.query);
-            }
-        },
-        covert(data, roleTypeList) {
-            let lastData = data;
-            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);
-            lastData.forEach(each=>{
-                const name = each.name == undefined ? '' : '-' + each.name;
-                const deviceName = each.deviceName == undefined ? '' : '-' + each.deviceName;
-                each.name = each.role + deviceName + name;
-            });
-            return lastData;
-        },
-        loadOtherData(obj) {
-            const group = obj.group;
-            if (this.drawWay) {
-                getScriptPlayMemberNew(this.group).then(response => {
-                    const lastData = JSON.stringify(response.data);
-                    const memberVOList = this.covert(lastData, ConstConfig.ConstSelect.roleTypeNew);
-                    getScriptAllAction(group).then(resp=>{
-                        this.actionInfoList = [];
-                        const actionList = resp.data;
-                        actionList.forEach(element => {
-                            const member = memberVOList.find(elem=>{ return elem.id == element.memberId; });
-                            const memberName = member.name;
-                            switch (element.type) {
-                            case 'Conversation':
-                            {
-                                const target = memberVOList.find(elem=>{ return elem.id == element.targetId; });
-                                const targetName = target.name;
-                                this.actionInfoList.push({id: element.id, isCoversition: true, memberName: memberName, targetName: targetName, reply: element.reply, row: element, visible: true});
-                                break;
-                            }
-                            case 'Command':
-                            {
-                                const command = CommandHandler.getScriptDefinition(element.operationType);
-                                let operateType = command.operate.split('_')[0];
-                                const data = command.operate.toUpperCase();
-                                if (operateType == 'CM') {
-                                    operateType = 'ControlConvertMenu';
-                                }
-                                const operateName = CMD[operateType]['CMD_' + data];
-                                const deviceTypeList = {Section:'区段', Switch:'道岔', Signal:'信号机', Stand:'站台', Station:'车站', TrainWindow:'车次窗', ControlConvertMenu:'控制模式'};
-                                const operateTypeName = deviceTypeList[operateType];
-                                this.actionInfoList.push({id: element.id, isCoversition: false, memberName: memberName, command: operateTypeName + '(' + operateName.label + ')', row: element, visible: false});
-                                break;
-                            }
-                            }
-                        });
-                    }).catch(error => {
-                        this.$message(error.message);
-                    });
-                }).catch(error => {
-                    this.$message(error.message);
-                });
-
-            } else {
-                getScriptRecord(group).then(response=>{
-                    this.$store.dispatch('scriptRecord/updateBgSet', response.data.bgSet);
-                    this.actionInfoList = [];
-                    // const roleTypeList = ConstConfig.ConstSelect.roleType;
-                    // let memberVOList = JSON.stringify(response.data.memberVOList);
-                    // roleTypeList.forEach(function(element) {
-                    //     const rolename = element.value;
-                    //     memberVOList = memberVOList.replace(new RegExp(rolename, 'g'), element.label);
-                    // });
-                    // memberVOList = JSON.parse(memberVOList);
-                    const lastData = JSON.stringify(response.data.memberVOList);
-                    const memberVOList = this.covert(lastData, ConstConfig.ConstSelect.roleType);
-
-                    const actionList = response.data.actionVOList;
-
-                    actionList.forEach(element => {
-
-                        const member = memberVOList.find(elem=>{ return elem.id == element.memberId; });
-
-                        const memberName = member.name ? ' - ' + member.name : '';
-                        switch (element.type) {
-                        case 'Conversation':
-                        {
-                            const target = memberVOList.find(elem=>{ return elem.id == element.targetId; });
-                            const targetName = target.name ? ' - ' + target.name : '';
-                            this.actionInfoList.push({id: element.id, isCoversition: true, memberName: member.role + memberName, targetName: target.role + targetName, reply: element.reply, row: element, visible: true});
-                            break;
-                        }
-                        case 'Command':
-                        {
-                            const deviceCommand = this.deviceCommandList.find(elem=>{ return elem.deviceCommand == element.deviceCommand; });
-                            this.actionInfoList.push({id: element.id, isCoversition: false, memberName: member.role + memberName, command: deviceCommand.label, row: element, visible: false});
-                        // switch (element.deviceCommand) {
-                        // case 'Train_Manual_Route_Blocking_Drive':
-                        // {
-                        //     this.actionInfoList.push({id: element.id, isCoversition: false, memberName: member.role + memberName, command: deviceCommand.label, row: element, visible: false});
-                        //     break;
-                        // }
-                        // case 'Train_Manual_Limit_Drive':
-                        // {
-                        //     this.actionInfoList.push({id: element.id, isCoversition: false, memberName: member.role + memberName, command: deviceCommand.label, row: element, visible: false});
-                        //     break;
-                        // }
-                        // }
-                        }
-                        }
-                    });
-                    if (response.data.mapLocation) {
-                        const mapLocation = {'offsetX': response.data.mapLocation.x, 'offsetY': response.data.mapLocation.y, 'scaleRate': response.data.mapLocation.scale};
-                        this.$store.dispatch('scriptRecord/updateMapLocation', mapLocation);
-                    }
-                    this.loading = false;
-                });
-            }
-        },
-        deleteAction(row) {
-            const group = this.$props.group;
-            if (!this.drawWay) {
-                deleteScriptAction(group, row).then(resp => {
-                    this.reloadTable();
-                    this.$message.success('删除行为动作成功');
-                }).catch(error => {
-                    this.$messageBox(`删除行为动作失败: ${error.message}`);
-                });
-            }
-        },
-        reloadTable() {
-            this.loadInitData();
-        },
-        modifyAction(row) {
-            this.$emit('setAction', row);
-        }
-    }
-};
-</script>
-<style rel="stylesheet/scss" lang="scss" scoped>
-    @import "src/styles/mixin.scss";
-    .actionTable{
-        width:280px;
-        padding: 15px 0px 10px 15px;
-        display: inline-block;
-        line-height: 200%;
-    }
-    .btnGroup{
-        padding: 10px 10px 10px 10px;
-        float: right;
-        vertical-align: top;
-        display: inline-block;
-    }
-    .el_timeline{
-        width: 350px;
-        margin-top:20px;
-        padding-left: 25px;
-    }
-    .roleClass{
-        color:#409EFF
-    }
-    .commandStyle{
-        color:#F00;
-    }
-    .scriptPane{
-        height: 100%;
-        padding-top:200px;
-    }
-    .scriptBottom{
-        margin-left:360px;
-        margin-top: 20px;
-    }
-</style>
diff --git a/src/views/orderauthor/rules/index.vue b/src/views/orderauthor/rules/index.vue
index 55d0cc7fe..5f6f90f0a 100644
--- a/src/views/orderauthor/rules/index.vue
+++ b/src/views/orderauthor/rules/index.vue
@@ -10,7 +10,7 @@
 import { listPermision, setLessonPermisson } from '@/api/management/author';
 import Detail from './detail';
 import Belong from './belong';
-import localStore from 'storejs';
+// import localStore from 'storejs';
 
 export default {
     name: 'Author',
diff --git a/src/views/planMonitor/detail.vue b/src/views/planMonitor/detail.vue
index 15193b23d..9c1b38699 100644
--- a/src/views/planMonitor/detail.vue
+++ b/src/views/planMonitor/detail.vue
@@ -50,7 +50,7 @@
 <script>
 import EditPlanName from './editTool/menus/editPlanName';
 import CreateEmptyPlan from './editTool/menus/createEmptyPlan';
-import { getRpListByUserMapId, publishRunPlan, releaseOrCancelRunPlan, previewRunPlan} from '@/api/designPlatform';
+import { publishRunPlan, releaseOrCancelRunPlan, previewRunPlan} from '@/api/designPlatform';
 import { getRpListByMapId, deleteRunPlan } from '@/api/runplan';
 import { launchFullscreen } from '@/utils/screen';
 import { UrlConfig } from '@/scripts/ConstDic';
@@ -186,31 +186,17 @@ export default {
         // },
         getRunPlanList() {
             this.loading = true;
-            if (/^\/design\/userlist/.test(this.$route.fullPath)) {
-                this.isCreate = false;
-                getRpListByUserMapId(this.$route.params.mapId).then((resp) => {
-                    this.runPlanList = resp.data;
-                    this.runPlanList.forEach(elem => {
-                        this.runPlanDict[elem.id] = elem.name;
-                    });
-                    this.loading = false;
-                }).catch(() => {
-                    this.$messageBox(this.$t('planMonitor.openRunPlan.getRunPlanListFail'));
-                    this.loading = false;
+            this.isCreate = true;
+            getRpListByMapId(this.$route.params.mapId).then((resp) => {
+                this.runPlanList = resp.data;
+                this.runPlanList.forEach(elem => {
+                    this.runPlanDict[elem.id] = elem.name;
                 });
-            } else {
-                this.isCreate = true;
-                getRpListByMapId(this.$route.params.mapId).then((resp) => {
-                    this.runPlanList = resp.data;
-                    this.runPlanList.forEach(elem => {
-                        this.runPlanDict[elem.id] = elem.name;
-                    });
-                    this.loading = false;
-                }).catch(() => {
-                    this.$messageBox(this.$t('planMonitor.openRunPlan.getRunPlanListFail'));
-                    this.loading = false;
-                });
-            }
+                this.loading = false;
+            }).catch(() => {
+                this.$messageBox(this.$t('planMonitor.openRunPlan.getRunPlanListFail'));
+                this.loading = false;
+            });
         },
         dispatchDialog() {
             this.$refs['createEmptyPlan'].doShow();
@@ -238,11 +224,7 @@ export default {
                 this.$store.dispatch('runPlan/refresh');
             } else {
                 const query = { lineCode: lineCode, mapId: this.$route.params.mapId, planId: planId, planName: planName };
-                if (/^\/design\/userlist/.test(this.$route.fullPath)) {
-                    this.$router.push({ path: `/plan/usertool`, query: query });
-                } else {
-                    this.$router.push({ path: `/plan/tool`, query: query });
-                }
+                this.$router.push({ path: `/plan/tool`, query: query });
             }
         },
         // 删除运行图
diff --git a/src/views/planMonitor/editTool/index.vue b/src/views/planMonitor/editTool/index.vue
index 4217cde34..186b1cbc2 100644
--- a/src/views/planMonitor/editTool/index.vue
+++ b/src/views/planMonitor/editTool/index.vue
@@ -213,7 +213,7 @@ export default {
             }
         },
         refreshRunPlanName(name) {
-        	this.$refs.schedule.refreshRunPlanName(name);
+            this.$refs.schedule.refreshRunPlanName(name);
         }
     }
 };
@@ -254,298 +254,4 @@ export default {
     .planEdit__tool {
         overflow: hidden !important;
     }
-
-    /* .planEdit__tool .el-dialog {
-        overflow: hidden !important;
-        background: rgba(202, 221, 253, 0.88);;
-        box-shadow: 1px hsla(240, 0%, 100%, 0.5) inset;
-        border: 2px solid #727375;
-        border-radius: 4px;
-        color: #000;
-        font-size: 14px;
-    }
-
-    .planEdit__tool .el-dialog .el-dialog__header {
-        height: 30px;
-        padding: 5px;
-    }
-
-    .planEdit__tool .el-dialog .el-dialog__footer {
-        background: #ECE9D8;
-        opacity: 1;
-    }
-
-    .planEdit__tool .el-dialog .el-dialog__body {
-        padding-top: 10px;
-        padding-bottom: 10px;
-        padding-left: 5px;
-        padding-right: 5px;
-        margin: 0px 3px 3px 3px;
-        border: 2px solid rgba(120, 121, 123, 0.5);
-        box-shadow: 1px hsla(240, 0%, 100%, 0.5) inset;
-        color: #000;
-        background: #ECE9D8;
-        opacity: 1;
-    }
-
-    .planEdit__tool .el-dialog .el-dialog__title {
-        font-size: 16px;
-    }
-
-    .planEdit__tool .el-dialog .el-dialog__headerbtn {
-        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;
-        top: 0px;
-        right: 3px;
-        line-height: 26px;
-        width: 26px;
-    }
-
-    .planEdit__tool .el-dialog .el-dialog__headerbtn .el-icon-close:before {
-        font-size: 16px;
-    }
-
-    .planEdit__tool .el-dialog .el-dialog__headerbtn .el-dialog__close {
-        color: #fff;
-    }
-
-    .planEdit__tool .el-dialog .el-tabs--top {
-        border: 2px outset #FEFEFD;
-        border-radius: 4px;
-    }
-
-    .planEdit__tool .el-dialog .el-tabs__item {
-        height: 30px;
-        line-height: 30px;
-        text-align: center;
-        color: #000 !important;
-        border-right: 2px outset #fff;
-        padding-left: 10px !important;
-        padding-right: 10px !important;
-    }
-
-    .planEdit__tool .el-dialog .el-tab-pane {
-        margin: 10px !important;
-    }
-
-    .planEdit__tool .el-dialog .el-tabs--card>.el-tabs__header .el-tabs__item.is-active {
-        border-bottom: none
-    }
-
-    .planEdit__tool .el-dialog .el-tabs--card>.el-tabs__header .el-tabs__item:not(.is-active) {
-        border-bottom: 2px inset #fff
-    }
-
-    .planEdit__tool .el-dialog .el-form {
-        background: #ECE9D8 !important;
-    }
-
-    .planEdit__tool .el-dialog .el-card {
-        background: #ECE9D8 !important;
-    }
-
-    .planEdit__tool .el-dialog .el-button {
-        height: 32px;
-        line-height: 32px;
-        padding: 0px;
-        width: 80px;
-        border: 2px outset #E2E2E2;
-        border-radius: 0px !important;
-        color: #000;
-        background: #ECE9D8;
-    }
-
-    .planEdit__tool .el-dialog .expand {
-        width: 120px;
-    }
-
-    .planEdit__tool .el-dialog .el-button:focus span {
-        border: 1px dashed gray;
-    }
-
-    .planEdit__tool .el-dialog .el-button:active {
-        border: 2px inset #E2E2E2;
-    }
-
-    .planEdit__tool .el-dialog .el-button:disabled {
-        border: 2px inset #E2E2E2;
-    }
-
-    .planEdit__tool .el-dialog .el-button:disabled span {
-        border: 0px;
-    }
-
-    .planEdit__tool .el-dialog .button-group {
-        margin-top: 10px;
-    }
-
-    .planEdit__tool .el-dialog .el-input {
-        border: 2px inset #E9E9E9;
-    }
-
-    .planEdit__tool .el-dialog .el-input .el-input__inner {
-        color: #000;
-        background: #fff !important;
-        border: 0px;
-        border-radius: 0px !important;
-        box-sizing: border-box;
-    }
-
-    .planEdit__tool .el-dialog .el-input.is-disabled .el-input__inner {
-        background: #F0F0F0 !important;
-    }
-
-    .planEdit__tool .el-dialog .el-textarea {
-        border: 2px inset #E9E9E9;
-        border-radius: 0px;
-    }
-
-    .planEdit__tool .el-dialog .el-textarea .el-textarea__inner {
-        color: #000;
-        background: #fff !important;
-        border: 0px;
-        border-radius: 0px !important;
-        box-sizing: border-box;
-    }
-
-    .planEdit__tool .el-dialog .el-textarea.is-disabled .el-textarea__inner {
-        background: #F0F0F0 !important;
-    }
-
-    .planEdit__tool .el-dialog .el-table {
-        border: 2px inset #E9E9E9;
-        color: #000 !important;
-    }
-
-    .planEdit__tool .el-dialog .el-table .cell {
-        line-height: unset !important;
-    }
-
-    .planEdit__tool .el-dialog .el-table th.is-leaf {
-        background: #ECE9D8 !important;
-        border-right: 1px solid #BDBDBD !important;
-        border-bottom: 1px solid #BDBDBD !important;
-        color: #000 !important;
-        height: 20px !important;
-        padding: 0px;
-    }
-
-    .planEdit__tool .el-dialog .el-table tr td {
-        height: 20px !important;
-        padding: 0px;
-    }
-
-    .planEdit__tool .el-dialog .el-table .el-table__empty-text {
-        top: 15px !important;
-    }
-
-    .planEdit__tool .el-dialog .current-row>td {
-        background: #316AC5 !important;
-        color: #fff !important;
-    }
-
-    .planEdit__tool .el-dialog .el-checkbox__inner {
-        border: 1px inset #dcdfe6 !important;
-    }
-
-    .planEdit__tool .el-dialog .el-checkbox__label {
-        color: #000 !important;
-    }
-
-    .planEdit__tool .el-dialog .el-checkbox.is-disabled .el-checkbox__inner {
-        background: #E6E6E6 !important;
-    }
-
-    .planEdit__tool .el-dialog .el-checkbox.is-disabled .el-checkbox__label {
-        color: #C5C9CC !important;
-    }
-
-    .planEdit__tool .el-dialog .el-checkbox__input.is-checked .el-checkbox__inner {
-        background: #fff !important;
-        border: 1px inset #dcdfe6 !important;
-    }
-
-    .planEdit__tool .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;
-    }
-
-    .planEdit__tool .el-dialog .el-radio__inner {
-        border: 1px inset #dcdfe6 !important;
-    }
-
-    .planEdit__tool .el-dialog .el-radio__label {
-        color: #000 !important;
-    }
-
-    .planEdit__tool .el-dialog .el-radio__input.is-checked .el-radio__inner {
-        background: #fff !important;
-        border: 1px inset #dcdfe6 !important;
-    }
-
-    .planEdit__tool .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%;
-    }
-
-    .planEdit__tool .el-dialog .el-radio.is-disabled .el-radio__inner {
-        background: #E6E6E6 !important;
-    }
-
-    .planEdit__tool .el-dialog .el-radio.is-disabled .el-radio__label {
-        color: #C5C9CC !important;
-    }
-
-    .planEdit__tool .el-dialog .base-label {
-        background: rgba(0, 0, 0, x);
-        position: relative;
-        left: -15px;
-        top: -18px;
-    }
-
-    .planEdit__tool .el-dialog .el-form-item label {
-        font-weight: normal !important;
-        color: #000 !important;
-    }
-
-    .planEdit__tool .el-dialog .context {
-        height: 100px;
-        border: 2px inset #E2E2E2;
-        overflow-y: scroll;
-    }
-
-    .planEdit__tool .el-dialog .table {
-        margin-top: 10px;
-    }
-
-    .planEdit__tool .el-dialog .notice {
-        margin-left: 62px;
-        line-height: 30px;
-    }
-
-    .planEdit__tool .el-dialog .button-group {
-        margin-top: 10px;
-    }
-
-    .planEdit__tool .el-dialog .el-tree__empty-block {
-        background: #E9E9E9 !important;
-        color: #000 !important;
-    } */
 </style>
diff --git a/src/views/planMonitor/editTool/menuBar.vue b/src/views/planMonitor/editTool/menuBar.vue
index 909c1546f..a3c2effe2 100644
--- a/src/views/planMonitor/editTool/menuBar.vue
+++ b/src/views/planMonitor/editTool/menuBar.vue
@@ -123,10 +123,6 @@ import { publishRunPlan, deleteRunPlan } from '@/api/designPlatform';
 export default {
     name: 'PlanMenuBar',
     props: {
-        // skinCode: {
-        // 	type: String,
-        // 	default: ''
-        // },
         planConvert: {
             type: Object,
             default: function() {
diff --git a/src/views/planMonitor/editTool/menus/addPlanningTrain.vue b/src/views/planMonitor/editTool/menus/addPlanningTrain.vue
index d53410eb2..090a58e71 100644
--- a/src/views/planMonitor/editTool/menus/addPlanningTrain.vue
+++ b/src/views/planMonitor/editTool/menus/addPlanningTrain.vue
@@ -13,7 +13,7 @@
     <el-row>
       <el-col :span="6" :offset="2" style="height: 30px; line-height: 30px;">{{ $t('planMonitor.serviceNumber2')+$t('global.colon') }}</el-col>
       <el-col :span="10" :offset="1">
-        <el-input v-model="serviceNumber" size="mini" />
+        <el-input v-model="serviceNumber" size="mini" maxlength="3" minlength="2" />
       </el-col>
     </el-row>
     <span slot="footer" class="dialog-footer">
@@ -60,7 +60,7 @@ export default {
         },
         handleCommit() {
             if (this.$route.query.planId || this.loadRunPlanId) {
-                if (this.serviceNumber.length == 2) {
+                if (this.serviceNumber.length >= 2 && this.serviceNumber.length <= 3) {
                     checkServiceNumberExist({ planId: this.$route.query.planId || this.loadRunPlanId, serviceNumber: this.serviceNumber }).then(resp => {
                         if (resp.data) {
                             this.$emit('dispatchDialog', {
@@ -75,20 +75,20 @@ export default {
 
                             this.doClose();
                         } else {
-                            this.handleConfirm();
+                            this.handleConfirm(true);
                         }
                     });
                 } else {
-                    this.$messageBox(this.$t('tip.serviceNumberLengthHint'));
+                    this.$messageBox('长度在二到三位');
                 }
             } else {
                 this.$messageBox(this.$t('tip.chooseToOpenTheRunGraph'));
             }
         },
-        handleConfirm() {
+        handleConfirm(isNew = false) {
             this.doClose();
             this.$store.dispatch('runPlan/addserviceNumber', this.serviceNumber);
-            this.$emit('dispatchDialog', { name: 'editPlanningTrain', params: { serviceNumber: this.serviceNumber } });
+            this.$emit('dispatchDialog', { name: 'editPlanningTrain', params: { serviceNumber: this.serviceNumber, isNew:isNew } });
         }
     }
 };
diff --git a/src/views/planMonitor/editTool/menus/addSmoothRunTime.vue b/src/views/planMonitor/editTool/menus/addSmoothRunTime.vue
index defda51df..b729aac41 100644
--- a/src/views/planMonitor/editTool/menus/addSmoothRunTime.vue
+++ b/src/views/planMonitor/editTool/menus/addSmoothRunTime.vue
@@ -13,7 +13,7 @@
     <div style="margin: 10px;">
       <el-row>
         <el-col :span="9" :offset="1">
-          <span>{{$t('global.startTime')+$t('global.colon')}}</span>
+          <span>{{ $t('global.startTime')+$t('global.colon') }}</span>
         </el-col>
         <el-col :span="14">
           <el-time-picker v-model="model.startTime" />
@@ -21,7 +21,7 @@
       </el-row>
       <el-row>
         <el-col :span="9" :offset="1">
-          <span>{{$t('global.endTime')+$t('global.colon')}}</span>
+          <span>{{ $t('global.endTime')+$t('global.colon') }}</span>
         </el-col>
         <el-col :span="14">
           <el-time-picker v-model="model.endTime" />
@@ -29,16 +29,16 @@
       </el-row>
       <el-row>
         <el-col :span="9" :offset="1">
-          <span>{{$t('planMonitor.trainRunningTimeInterval')+$t('global.colon')}}</span>
+          <span>{{ $t('planMonitor.trainRunningTimeInterval')+$t('global.colon') }}</span>
         </el-col>
         <el-col :span="14">
           <el-input v-model="model.runInterval" :placeholder="this.$t('rules.pleaseEnterContent')" />
-          <span>{{$t('global.colon')}}</span>
+          <span>{{ $t('global.colon') }}</span>
         </el-col>
       </el-row>
       <el-row>
         <el-col :span="9" :offset="1">
-          <span>{{$t('planMonitor.sizeOfTheLoopTrainProportion')+$t('global.colon')}}</span>
+          <span>{{ $t('planMonitor.sizeOfTheLoopTrainProportion')+$t('global.colon') }}</span>
         </el-col>
         <el-col :span="14">
           <el-select v-model="model.scale" :placeholder="this.$t('global.choose')">
@@ -48,28 +48,28 @@
       </el-row>
       <el-row>
         <el-col :span="9" :offset="1">
-          <span>{{$t('planMonitor.applicationRouteSelection')+$t('global.colon')}}</span>
+          <span>{{ $t('planMonitor.applicationRouteSelection')+$t('global.colon') }}</span>
         </el-col>
         <el-col :span="14">
           <el-radio-group v-model="model.direction">
-            <el-radio :label="0">{{$t('planMonitor.bothway')}}</el-radio>
-            <el-radio :label="1">{{$t('planMonitor.up')}}</el-radio>
-            <el-radio :label="2">{{$t('planMonitor.down')}}</el-radio>
+            <el-radio :label="0">{{ $t('planMonitor.bothway') }}</el-radio>
+            <el-radio :label="1">{{ $t('planMonitor.up') }}</el-radio>
+            <el-radio :label="2">{{ $t('planMonitor.down') }}</el-radio>
           </el-radio-group>
         </el-col>
       </el-row>
       <el-row style="margin-top: 20px">
         <el-table :data="model.smoothList" border :height="240">
           <el-table-column prop="startTime" :label="this.$t('global.startTime')" />
-          <el-table-column prop="stopTime" :label="this.$t('global.endTime')"/>
+          <el-table-column prop="stopTime" :label="this.$t('global.endTime')" />
           <el-table-column prop="runInterval" :label="this.$t('planMonitor.runningInterval')" />
           <el-table-column prop="scale" :label="this.$t('planMonitor.distributionRatio')" />
         </el-table>
       </el-row>
     </div>
     <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-button @click="handleCommit">{{ $t('global.confirm') }}</el-button>
+      <el-button @click="doClose">{{ $t('global.cancel') }}</el-button>
     </el-row>
   </el-dialog>
 </template>
@@ -77,38 +77,38 @@
 <script>
 
 export default {
-	name: 'AddSmoothRunTime',
-	components: {
-	},
-	data() {
-		return {
-			dialogShow: false,
-			loading: false,
-			model: {
-				useSame: false,
-				smoothList: []
-			},
-			scaleList: []
-		};
-	},
-	computed: {
-		title() {
-			return this.$t('planMonitor.addASmoothRunningTime');
-		}
-	},
-	mounted() {
-	},
-	methods: {
-		doShow() {
-			this.dialogShow = true;
-		},
-		doClose() {
-			this.loading = false;
-			this.dialogShow = false;
-		},
-		handleCommit() {
-		}
-	}
+    name: 'AddSmoothRunTime',
+    components: {
+    },
+    data() {
+        return {
+            dialogShow: false,
+            loading: false,
+            model: {
+                useSame: false,
+                smoothList: []
+            },
+            scaleList: []
+        };
+    },
+    computed: {
+        title() {
+            return this.$t('planMonitor.addASmoothRunningTime');
+        }
+    },
+    mounted() {
+    },
+    methods: {
+        doShow() {
+            this.dialogShow = true;
+        },
+        doClose() {
+            this.loading = false;
+            this.dialogShow = false;
+        },
+        handleCommit() {
+        }
+    }
 };
 </script>
 <style rel="stylesheet/scss" lang="scss" scoped>
diff --git a/src/views/planMonitor/editTool/menus/addTask.vue b/src/views/planMonitor/editTool/menus/addTask.vue
index 5d3471cf3..b0a4fd131 100644
--- a/src/views/planMonitor/editTool/menus/addTask.vue
+++ b/src/views/planMonitor/editTool/menus/addTask.vue
@@ -13,7 +13,7 @@
   >
     <el-row>
       <el-col :span="3" style="height: 28px;line-height: 28px;">
-        <el-radio v-model="addModel.addToFront" :label="true">{{ $t('planMonitor.addToTheFront') }}</el-radio>
+        <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>
@@ -37,26 +37,27 @@
     </el-row>
     <el-row style="margin-top: 5px;height: 28px;line-height: 28px;">
       <el-col :span="3">
-        <el-radio v-model="addModel.addToFront" :label="false">{{ $t('planMonitor.addToTheEnd') }}</el-radio>
+        <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-select v-model="addModel.defaultStopTime" size="mini" :placeholder="this.$t('global.choose')">
+        <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-select> -->
       </el-col>
       <el-col :span="3" style="margin-left: 20px;height: 28px;line-height: 28px;">
         <span>{{ $t('planMonitor.defaultRunLevel') }}</span>
       </el-col>
       <el-col :span="5">
-        <el-select v-model="addModel.defaultSpeedLevel" size="mini" :placeholder="this.$t('global.choose')">
+        <el-select v-model="defaultSpeedLevel" size="mini" :placeholder="this.$t('global.choose')">
           <el-option
             v-for="item in defaultSpeedLevelList"
             :key="item.value"
@@ -72,13 +73,19 @@
     </el-row>
     <el-row>
       <el-table
-        :data="addModel.routingList"
+        :data="routingList"
         border
         highlight-current-row
-        :height="280"
+        :height="230"
         @row-click="handleClick"
       >
-        <el-table-column prop="startStationCode" :label="this.$t('planMonitor.startingStation')">
+        <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>
@@ -88,7 +95,13 @@
             {{ formatName(scope.row.startSectionCode) }}
           </template>
         </el-table-column>
-        <el-table-column prop="endStationCode" :label="this.$t('planMonitor.terminal')">
+        <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>
@@ -105,7 +118,7 @@
       {{ $t('global.details')+$t('global.colon') }}
     </el-row>
     <el-row>
-      <el-table :data="addModel.arriveConfigList" border :height="180">
+      <el-table :data="addModel.arriveConfigList" border :height="230">
         <el-table-column prop="stationCode" :label="this.$t('planMonitor.station')">
           <template slot-scope="scope">
             {{ formatName(scope.row.stationCode) }}
@@ -117,13 +130,19 @@
           </template>
         </el-table-column>
         <el-table-column prop="arriveTime" :label="this.$t('planMonitor.arriveTime')" />
-        <el-table-column prop="stopTime" :label="this.$t('planMonitor.stopTime')">
+        <!-- prop="stopTime"  -->
+        <el-table-column :label="this.$t('planMonitor.stopTime')">
           <template slot-scope="scope">
-            <el-input v-model="scope.row.stopTime" placeholder="请输入时间" size="mini" @change="changeStopTime(scope.$index, scope.row.stopTime)" />
+            <el-input v-model="scope.row.stopTime" placeholder="请输入时间" size="mini" @input="changeStopTime(scope.$index, scope.row.stopTime)" />
           </template>
         </el-table-column>
         <el-table-column prop="departureTime" :label="this.$t('planMonitor.departureTime')" />
-        <el-table-column prop="speedLevel" :label="this.$t('planMonitor.runLevel')" />
+        <el-table-column :label="this.$t('planMonitor.runLevel')">
+          <template slot-scope="scope">
+            {{ scope.row.speedLevel }}
+            <el-input v-model="scope.row.speedLevelTime" placeholder="请输入运行等级" size="mini" @input="changeSpeedLevelTime(scope.$index, scope.row.speedLevelTime)" />
+          </template>
+        </el-table-column>
       </el-table>
     </el-row>
     <el-row>
@@ -139,9 +158,8 @@
 </template>
 
 <script>
-import { getRoutingList, querySectionListByRouting, getStationRunning, addPlanTrip, getMapStationRun } from '@/api/runplan';
+import { getRoutingList, addPlanTrip, getMapStationRun } from '@/api/runplan';
 import { formatTime, formatName } from '@/utils/runPlan';
-import { getUID } from '@/jmap/utils/Uid';
 
 export default {
     name: 'AddTask',
@@ -155,105 +173,100 @@ export default {
             showDefault: true,
             stopStationMap: {},
             params: {},
+            routingList: [],
+            startStationFilters:[],
+            endStationFilters:[],
+            defaultStopTime: '30',
+            defaultSpeedLevel: 'l3',
             addModel: {
-                taskIndex: '',
-                addToFront: false,
+                forward: false,
                 routingCode: '',
                 endStationCode: '',
                 startStationCode: '',
-                endSectionCode: '',
-                startSectionCode: '',
                 startTime: '00:00:00',
                 endTime: '',
-                planId: '',
+                arriveConfigList: [],
                 tripNumber: '',
-                serviceNumber: '',
-                defaultStopTime: '30',
-                defaultSpeedLevel: 'level3',
-                routingList: [],
-                arriveConfigList: []
+                planId: '',
+                serviceNumber: ''
             },
             tripNumberList: [{ value: '', label: this.$t('planMonitor.automatic') }],
-            defaultStopTimeList: [{ value: '30', label: this.$t('planMonitor.default') }, { value: '0', label: '0' }],
-            defaultSpeedLevelList: [{ value: 'level3', label: this.$t('planMonitor.default') }]
+            // defaultStopTimeList: [{ value: '30', label: this.$t('planMonitor.default') }, { value: '0', label: '0' }],
+            defaultSpeedLevelList: [
+                { value: 'l1', label: '等级一' },
+                { value: 'l2', label: '等级二' },
+                { value: 'l3', label: '等级三'},
+                { value: 'l4', label: '等级四' },
+                { value: 'l5', label: '等级五' }
+            ]
         };
     },
     computed: {
         title() {
             return this.$t('planMonitor.addTask');
-        },
-        isNewMap() {
-            return this.$route.path.includes('displayNew');
         }
     },
     watch: {
-        'addModel.routingCode': function () {
-            this.computedDetailList();
+        'addModel.routingCode': function (val) {
+            if (val) {
+                this.computedDetailList('routingCode');
+            }
         },
         'addModel.startTime': function () {
             this.computedDetailList();
         },
-        'addModel.defaultStopTime': function () {
-            this.computedDetailList();
+        'defaultStopTime': function () {
+            this.computedDetailList('defaultStopTime');
         },
-        'addModel.defaultSpeedLevel': function () {
-            this.computedDetailList();
+        'defaultSpeedLevel': function () {
+            this.computedDetailList('defaultSpeedLevel');
         }
     },
     methods: {
         loadInitData(params) {
             this.isPlan = params.isPlan;
-            this.addModel.taskIndex = getUID('task_');
+            // this.addModel.taskIndex = getUID('task_');
             this.addModel.serviceNumber = params.serviceNumber;
             this.addModel.planId = this.$route.query.planId;
-
+            this.addModel.arriveConfigList = [];
             const planId = this.$route.query.planId;
             if (planId) {
                 getRoutingList(planId).then(resp => {
-                    this.addModel.routingList = resp.data;
+                    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);
+                    this.endStationFilters = Object.values(endStationFilterMap);
                 });
             }
 
             const mapId = this.$route.query.mapId;
-            if (mapId && !this.isNewMap) {
-                getStationRunning(mapId).then(resp => { // 查询是否有站间运行时间
-                    const list = resp.data;
-                    list.forEach(elem => {
-                        this.stopStationMap[[elem.startSectionCode, elem.endSectionCode].toString()] = elem;
-                    });
-                    if (list && list.length) {
-                        list.forEach(elem => {
-                            if (!elem.runPlanLevelVO) {
-                                this.$alert(`${this.$t('planMonitor.tipOperationTime')}`, {
-                                    confirmButtonText: this.$t('global.confirm'),
-                                    callback: action => {
-                                        this.doClose();
-                                    }
-                                });
-                            }
-                        });
-
-                    }
-                });
-            } else if (mapId && this.isNewMap) {
+            if (mapId) {
                 getMapStationRun(mapId).then(resp =>{
                     const list = resp.data;
                     list.forEach(elem => {
                         this.stopStationMap[[elem.startSectionCode, elem.endSectionCode].toString()] = elem;
                     });
-                    if (list && list.length) {
-                        list.forEach(elem => {
-                            if (!elem.runPlanLevelVO) {
-                                this.$alert(`${this.$t('planMonitor.tipOperationTime')}`, {
-                                    confirmButtonText: this.$t('global.confirm'),
-                                    callback: action => {
-                                        this.doClose();
-                                    }
-                                });
-                            }
-                        });
-
-                    }
+                    // if (list && list.length) {
+                    //     list.forEach(elem => {
+                    //         if (!elem.runPlanLevelVO) {
+                    //             this.$alert(`${this.$t('planMonitor.tipOperationTime')}`, {
+                    //                 confirmButtonText: this.$t('global.confirm'),
+                    //                 callback: action => {
+                    //                     this.doClose();
+                    //                 }
+                    //             });
+                    //         }
+                    //     });
+                    // }
                 });
             }
         },
@@ -261,6 +274,12 @@ export default {
             this.loadInitData(params);
             this.dialogShow = true;
         },
+        filterStartStation(value, row) {
+            return row.startStationCode == value;
+        },
+        filterEndStation(value, row) {
+            return row.endStationCode == value;
+        },
         doClose() {
             this.loading = false;
             this.dialogShow = false;
@@ -277,67 +296,115 @@ export default {
             let runTime = 0;
             if (index < list.length - 1) {
                 const stopStationObj = this.stopStationMap[[list[index].sectionCode, list[index + 1].sectionCode].toString()];
-                console.log(stopStationObj, stopStationObj['l3']);
                 if (stopStationObj) {
                     if (stopStationObj.runPlanLevelVO) {
                         runTime = parseInt(stopStationObj.runPlanLevelVO[runLevel]);
-                    } else if (stopStationObj['l3']) {
-                        runTime = parseInt(stopStationObj['l3']);
+                    } 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;
         },
-        changeStopTime(indexs, time) {
-            let tempTime = this.computedTimeByString(this.addModel.startTime) / 1000 - 30;
-            const runLevel = this.addModel.defaultSpeedLevel || 'level3'; // 默认等级三
-            this.addModel.arriveConfigList.forEach((elem, index) => {
-                if (indexs == index) {
-                    elem.stopTime = time ? Number(time) : 0;
-                }
+        changeSpeedLevelTime(indexs, speedLevelTime) {
+            const arriveConfigList = Object.assign([], this.addModel.arriveConfigList);
+            let tempTime = this.computedTimeByString(this.addModel.startTime) / 1000;
+            arriveConfigList.forEach((elem, index) => {
                 elem.arriveTime = index ? formatTime(tempTime) : '';
-                elem.departureTime = index == this.addModel.arriveConfigList.length - 1 ? '' : formatTime(tempTime + elem.stopTime);
-                elem.speedLevel = this.addModel.defaultSpeedLevel == 'level3' ? this.$t('planMonitor.default') : '';
-                tempTime = tempTime + elem.stopTime + this.compuntedRunTime(this.addModel.arriveConfigList, index, runLevel);
+                if (index == indexs) { elem.speedLevelTime = speedLevelTime ? Number(speedLevelTime) : 0; }
+                elem.arriveTime = index ? formatTime(tempTime) : '';
+                if (index > 0) {
+                    elem.departureTime = index == arriveConfigList.length - 1 ? '' : formatTime(tempTime + elem.stopTime);
+                } else {
+                    elem.departureTime = formatTime(tempTime);
+                }
+                const realRunlevel = elem.speedLevelTime;
+                if (index > 0) {
+                    tempTime = tempTime + elem.stopTime + realRunlevel;
+                } else {
+                    tempTime = tempTime + realRunlevel;
+                }
             });
+            this.addModel.arriveConfigList = arriveConfigList;
             this.addModel.endTime = formatTime(tempTime - this.addModel.arriveConfigList[this.addModel.arriveConfigList.length - 1].stopTime);
         },
-        computedDetailList() {
+        changeStopTime(indexs, time) {
+            let tempTime = this.computedTimeByString(this.addModel.startTime) / 1000;
+            // const runLevel = this.defaultSpeedLevel || 'l3'; // 默认等级三
+            const arriveConfigList = Object.assign([], this.addModel.arriveConfigList);
+            arriveConfigList.forEach((elem, index) => {
+                if (index == indexs) { elem.stopTime = time ? Number(time) : 0; }
+                elem.arriveTime = index ? formatTime(tempTime) : '';
+                // const runLevelObj = this.defaultSpeedLevelList.find(speedLevel=>{ return speedLevel.value == runLevel; });
+                // elem.speedLevel = this.defaultSpeedLevel == 'l3' ? `${this.$t('planMonitor.default')}(${runLevelObj.label})` : runLevelObj.label;
+                if (index > 0) {
+                    elem.departureTime = index == arriveConfigList.length - 1 ? '' : formatTime(tempTime + elem.stopTime);
+                } else {
+                    elem.departureTime = formatTime(tempTime);
+                }
+                const realRunlevel = elem.speedLevelTime;
+                if (index > 0) {
+                    tempTime = tempTime + elem.stopTime + realRunlevel;
+                } else {
+                    tempTime = tempTime + realRunlevel;
+                }
+            });
+            this.addModel.arriveConfigList = arriveConfigList;
+            this.addModel.endTime = formatTime(tempTime - this.addModel.arriveConfigList[this.addModel.arriveConfigList.length - 1].stopTime);
+        },
+        computedDetailList(type = null) {
             if (this.addModel.routingCode) {
-                querySectionListByRouting({ planId: this.$route.query.planId, routingCode: this.addModel.routingCode }).then(resp => {
-                    const list = resp.data;
-                    const waitTime = Number(this.addModel.defaultStopTime) || 0; // 默认三十秒
-                    let tempTime = this.computedTimeByString(this.addModel.startTime) / 1000 - 30;
-                    const runLevel = this.addModel.defaultSpeedLevel || 'level3'; // 默认等级三
-                    list.forEach((elem, index) => {
-                        elem.arriveTime = index ? formatTime(tempTime) : '';
-                        elem.departureTime = index == list.length - 1 ? '' : formatTime(tempTime + waitTime);
-                        elem.speedLevel = this.addModel.defaultSpeedLevel == 'level3' ? `${this.$t('planMonitor.default')}(等级三)` : '';
-                        elem.stopTime = this.addModel.defaultStopTime != '0' ? 30 : 0;
-                        tempTime = tempTime + waitTime + this.compuntedRunTime(list, index, runLevel);
-                    });
+                const list = Object.assign([], this.addModel.arriveConfigList);
+                let tempTime = this.computedTimeByString(this.addModel.startTime) / 1000;
+                const runLevel = this.defaultSpeedLevel || 'l3'; // 默认等级三
+                list.forEach((elem, index) => {
+                    if (type == 'defaultStopTime' || type == 'routingCode') {
+                        elem.stopTime = parseInt(this.defaultStopTime);
+                    }
+                    elem.arriveTime = index ? formatTime(tempTime) : '';
+                    if (index > 0) {
+                        elem.departureTime = index == list.length - 1 ? '' : formatTime(tempTime + elem.stopTime);
+                    } else {
+                        elem.departureTime = formatTime(tempTime);
+                    }
+                    const runLevelObj = this.defaultSpeedLevelList.find(speedLevel=>{ return speedLevel.value == runLevel; });
+                    if (!elem.speedLevelTime || type == 'defaultSpeedLevel') {
+                        const realRunlevel = this.compuntedRunTime(list, index, runLevel);
+                        elem.speedLevelTime = realRunlevel;
+                    }
+                    elem.speedLevel = this.defaultSpeedLevel == 'l3' ? `${this.$t('planMonitor.default')}(${runLevelObj.label})` : runLevelObj.label;
+                    if (index > 0) {
+                        tempTime = tempTime + elem.stopTime + elem.speedLevelTime;
+                    } else {
+                        tempTime = tempTime + elem.speedLevelTime;
+                    }
 
-                    this.addModel.arriveConfigList = list;
-                    this.addModel.endTime = formatTime(tempTime - list[list.length - 1].stopTime);
                 });
+                this.addModel.endTime = formatTime(tempTime - list[list.length - 1].stopTime);
             }
         },
         handleClick(row, column, event) {
+            const arriveConfigList = [];
+            row.parkSectionCodeList.forEach(parkSectionCode=>{
+                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.startSectionCode = row.startSectionCode;
             this.addModel.endSectionCode = row.endSectionCode;
+            this.addModel.startSectionCode = row.startSectionCode;
             this.addModel.routingCode = row.code;
         },
         handleCommit() {
             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)
diff --git a/src/views/planMonitor/editTool/menus/components/dataTable.vue b/src/views/planMonitor/editTool/menus/components/dataTable.vue
index 4adf68074..e2d574646 100644
--- a/src/views/planMonitor/editTool/menus/components/dataTable.vue
+++ b/src/views/planMonitor/editTool/menus/components/dataTable.vue
@@ -3,6 +3,10 @@
     <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>
@@ -14,6 +18,7 @@
         :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" />
@@ -55,6 +60,11 @@ export default {
                 this.config.handleChange(row);
             }
         },
+        handleModify(row) {
+            if (this.config.handleModify) {
+                this.config.handleModify(row);
+            }
+        },
         setCurrentRow(row) {
             this.$refs.table.setCurrentRow(row);
         },
@@ -99,6 +109,14 @@ export default {
         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 {
diff --git a/src/views/planMonitor/editTool/menus/createEmptyPlan.vue b/src/views/planMonitor/editTool/menus/createEmptyPlan.vue
index a89d2047f..1ed6aa68f 100644
--- a/src/views/planMonitor/editTool/menus/createEmptyPlan.vue
+++ b/src/views/planMonitor/editTool/menus/createEmptyPlan.vue
@@ -220,22 +220,22 @@ export default {
                                         jsonData = that.planConvert.importData(wb.Sheets[index], jsonData);
                                     }
 
-                                    if (that.$route.query.lineCode == '02' && !jsonData[0].downTrack && !jsonData[0].upTrack) {
+                                    // 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();
-                                        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');
+                                        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.importRunGraphFailed')} ${error.message}`);
+                                    });
+                                    // }
                                 } catch (error) {
                                     that.loadingDig.close();
                                     that.$message.warning(`${that.$t('tip.parseRunGraphFailed')} ${error.message}`);
diff --git a/src/views/planMonitor/editTool/menus/deleteTask.vue b/src/views/planMonitor/editTool/menus/deleteTask.vue
index 5eeece4ca..6e4481fdc 100644
--- a/src/views/planMonitor/editTool/menus/deleteTask.vue
+++ b/src/views/planMonitor/editTool/menus/deleteTask.vue
@@ -11,14 +11,14 @@
     :close-on-click-modal="false"
   >
     <el-row>
-      <el-radio v-model="model.deleteBefore" :label="true">{{$t('planMonitor.deleteAllPreviousTasks')}}</el-radio>
+      <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-radio v-model="model.deleteBefore" :label="false">{{ $t('planMonitor.deleteAllSubsequentTasks') }}</el-radio>
     </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>
+      <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>
@@ -27,67 +27,68 @@
 import { deletePlanTrip } from '@/api/runplan';
 
 export default {
-	name: 'DeleteTask',
-	components: {
-	},
-	data() {
-		return {
-			dialogShow: false,
-			loading: false,
-			isPlan: false,
-			model: {
-				taskIndex: '',
-				deleteBefore: false,
-				tripNumber: '',
-				serviceNumber: ''
-			}
-		};
-	},
-	computed: {
-		title() {
-			return this.$t('planMonitor.deleteTask');
-		}
-	},
-	mounted() {
-	},
-	methods: {
-		doShow(params) {
-			this.isPlan = params.isPlan;
-			this.model.taskIndex = params.taskIndex;
-			this.model.tripNumber = params.tripNumber;
-			this.model.serviceNumber = params.serviceNumber;
-			this.dialogShow = true;
-		},
-		doClose() {
-			this.loading = false;
-			this.dialogShow = false;
-		},
-		handleCommit() {
-			if (this.isPlan) {
-				// 计划删除任务
-				this.$emit('dispatchOperate', { dialogName: 'editPlanningTrain', operate: 'handleConfirmDeleteTask', params: this.model });
-			} else {
-				// 直接删除任务
-				const model = {
-					planId: this.$route.query.planId,
-					SDTNumber: `${this.model.serviceNumber}${this.model.tripNumber}`,
-					deleteBefore: this.model.deleteBefore
-				};
+    name: 'DeleteTask',
+    components: {
+    },
+    data() {
+        return {
+            dialogShow: false,
+            loading: false,
+            isPlan: false,
+            model: {
+                routingCode: '',
+                deleteBefore: false,
+                tripNumber: '',
+                serviceNumber: ''
+            }
+        };
+    },
+    computed: {
+        title() {
+            return this.$t('planMonitor.deleteTask');
+        }
+    },
+    mounted() {
+    },
+    methods: {
+        doShow(params) {
+            this.isPlan = params.isPlan;
+            this.model.taskIndex = params.taskIndex;
+            this.model.tripNumber = params.tripNumber;
+            this.model.serviceNumber = params.serviceNumber;
+            this.model.routingCode = params.routingCode;
+            this.dialogShow = true;
+        },
+        doClose() {
+            this.loading = false;
+            this.dialogShow = false;
+        },
+        handleCommit() {
+            if (this.isPlan) {
+                // 计划删除任务
+                this.$emit('dispatchOperate', { dialogName: 'editPlanningTrain', operate: 'handleConfirmDeleteTask', params: this.model });
+            } else {
+                // 直接删除任务
+                const model = {
+                    planId: this.$route.query.planId,
+                    SDTNumber: `${this.model.serviceNumber}${this.model.tripNumber}`,
+                    deleteBefore: this.model.deleteBefore
+                };
 
-				deletePlanTrip(model).then(resp => {
-					this.$store.dispatch('runPlan/setSelected', {});
-					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();
-		}
-	}
+                deletePlanTrip(model).then(resp => {
+                    this.$store.dispatch('runPlan/setSelected', {});
+                    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>
diff --git a/src/views/planMonitor/editTool/menus/duplicateTrain.vue b/src/views/planMonitor/editTool/menus/duplicateTrain.vue
index db5230726..2648fd408 100644
--- a/src/views/planMonitor/editTool/menus/duplicateTrain.vue
+++ b/src/views/planMonitor/editTool/menus/duplicateTrain.vue
@@ -12,26 +12,26 @@
   >
     <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 :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="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="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>
+        <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>
+      <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>
@@ -40,57 +40,57 @@
 import { duplicateService } from '@/api/runplan';
 
 export default {
-	name: 'DuplicateTrain',
-	components: {
-	},
-	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.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'));
-				}
-				
-			});
-		}
-	}
+    name: 'DuplicateTrain',
+    components: {
+    },
+    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.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>
diff --git a/src/views/planMonitor/editTool/menus/editPlanningTrain.vue b/src/views/planMonitor/editTool/menus/editPlanningTrain.vue
index 077f0804c..a2c0c9448 100644
--- a/src/views/planMonitor/editTool/menus/editPlanningTrain.vue
+++ b/src/views/planMonitor/editTool/menus/editPlanningTrain.vue
@@ -62,156 +62,267 @@
 
 <script>
 import { formatName, formatTime } from '@/utils/runPlan';
-import { addPlanService } from '@/api/runplan';
-import { getUID } from '@/jmap/utils/Uid';
+import { addPlanService, updatePlanService, getRoutingBySDTNumber } from '@/api/runplan';
 
 export default {
-	name: 'EditPlanningTrain',
-	data() {
-		return {
-			dialogShow: false,
-			loading: false,
-			currentRow: {},
-			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);
-		},
-		loadInitData(params) {
-			this.model.planId = this.$route.query.planId;
-			this.model.serviceNumber = params.serviceNumber;
-			this.model.tripConfigList = [];
-			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; });
-				tripNumberList.forEach(tripNumber => {
-					const trainInfo = editData.trainMap[tripNumber];
-					const lastIndex = trainInfo.stationTimeList.length - 1;
-					const taskObj = {
-						taskIndex: getUID('task_'),
-						tripNumber: tripNumber,
-						startStationCode: trainInfo.stationTimeList[0].stationCode,
-						startTime: formatTime(trainInfo.stationTimeList[0].secondTime),
-						endStationCode: trainInfo.stationTimeList[lastIndex].stationCode,
-						endTime: formatTime(trainInfo.stationTimeList[lastIndex].secondTime),
-						arriveConfigList: []
-					};
-					this.model.tripConfigList.push(taskObj);
-				});
-			}
-		},
-		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: 'addTask', params: {
-					isPlan: true,
-					taskIndex: this.currentRow.taskIndex,
-					serviceNumber: this.model.serviceNumber,
-					tripNumber: this.currentRow.tripNumber
-				}
-			});
-		},
-		handleEditTask() {
-			if (this.currentRow.taskIndex) {
-				this.$emit('dispatchDialog', {
-					name: 'modifyingTask', params: {
-						isPlan: true,
-						serviceNumber: this.model.serviceNumber,
-						tripNumber: this.currentRow.tripNumber
-					}
-				});
-			} else {
-				this.$messageBox(this.$t('tip.selectAPieceOfData'));
-			}
-		},
-		handleDeleteTask() {
-			if (this.currentRow.taskIndex) {
-				this.$emit('dispatchDialog', {
-					name: 'deleteTask', params: {
-						isPlan: true,
-						taskIndex: this.currentRow.taskIndex,
-						serviceNumber: this.model.serviceNumber,
-						tripNumber: this.currentRow.tripNumber
-					}
-				});
-			} else {
-				this.$messageBox(this.$t('tip.selectAPieceOfData'));
-			}
-		},
-		handleConfirmAddTask(model) {
-			// let index = this.model.tripConfigList.findIndex(
-			//     elem => { return elem.taskIndex == this.currentRow.taskIndex }
-			// );
+    name: 'EditPlanningTrain',
+    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 model = {
+                planId: this.$route.query.planId,
+                SDTNumber: `${this.model.serviceNumber}${tripNumber}`
+            };
+            getRoutingBySDTNumber(model).then(resp => {
+                const taskObj = {
+                    tripNumber: tripNumber,
+                    startStationCode: resp.data.startStationCode,
+                    startTime: formatTime(trainInfo.stationTimeList[0].secondTime + 7200),
+                    endStationCode: resp.data.endStationCode,
+                    endTime: formatTime(trainInfo.stationTimeList[lastIndex].secondTime + 7200),
+                    routingCode : resp.data.code,
+                    endSectionCode:resp.data.endSectionCode,
+                    startSectionCode:resp.data.startSectionCode,
+                    arriveConfigList: []
+                    // parkSectionCodeList
+                };
+                const newstationTimeList = [];
+                let current = {};
+                trainInfo.stationTimeList.forEach((stationTime, index)=>{
+                    if (index % 2 == 0) {
+                        current = {};
+                        current.stationCode = stationTime.stationCode;
+                        current.arriveTime = stationTime.secondTime;
+                    } else {
+                        current.departureTime = stationTime.secondTime;
+                        newstationTimeList.push(current);
+                    }
+                });
+                newstationTimeList.forEach((newstationTime, index)=>{
+                    const newModel = {
+                        sectionCode:resp.data.parkSectionCodeList[index].sectionCode,
+                        stationCode:newstationTime.stationCode,
+                        speedLevel:'默认',
+                        arriveTime: formatTime(newstationTime.arriveTime + 7200),
+                        departureTime: formatTime(newstationTime.departureTime + 7200),
+                        stopTime:newstationTime.departureTime - newstationTime.arriveTime
+                    };
+                    if (index < newstationTimeList.length - 1) {
+                        newModel.speedLevelTime = newstationTimeList[index + 1].arriveTime - newstationTime.departureTime;
+                    }
+                    taskObj.arriveConfigList.push(newModel);
+                });
+                // arriveTime: ""
+                // departureTime: "07:00:00"
+                // speedLevel: "默认(等级三)"
+                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.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: 'addTask', params: {
+                    isPlan: true,
+                    taskIndex: this.currentRow.taskIndex,
+                    serviceNumber: this.model.serviceNumber,
+                    tripNumber: this.currentRow.tripNumber
+                }
+            });
+        },
+        handleEditTask() {
+            if (this.currentRow.routingCode || this.currentRow.tripNumber) {
+                this.$emit('dispatchDialog', {
+                    name: 'modifyingTask', params: {
+                        isPlan: true,
+                        serviceNumber: this.model.serviceNumber,
+                        tripNumber: this.currentRow.tripNumber,
+                        rowData:this.currentRow
+                    }
+                });
+            } else {
+                this.$messageBox(this.$t('tip.selectAPieceOfData'));
+            }
+        },
+        handleDeleteTask() {
+            if (this.currentRow.routingCode || this.currentRow.tripNumber) {
+                let index = -1;
+                if (this.currentRow.routingCode) {
+                    index = this.model.tripConfigList.findIndex(
+                        elem => {
+                            return elem.routingCode == this.currentRow.routingCode &&
+                            elem.startTime == this.currentRow.startTime &&
+                            elem.endTime == this.currentRow.endTime;
+                        }
+                    );
+                } else {
+                    index = this.model.tripConfigList.findIndex(
+                        elem => { return elem.tripNumber == this.currentRow.tripNumber; }
+                    );
+                }
+                this.model.tripConfigList.splice(index, 1);
+                // const tripConfigList = Object.assign([], this.model.tripConfigList);
+                // tripConfigList.forEach(tripConfig=>{
+                //     if (tripConfig.routingCode == model.routingCode) {
+                //         Object.assign(tripConfig, model);
+                //     }
+                // });
+                // this.model.tripConfigList = tripConfigList;
 
-			// if (index >= 0) {
-			//     if (!model.addToFront) {
-			//         index += 1;
-			//     }
+                // this.$emit('dispatchDialog', {
+                //     name: 'deleteTask', params: {
+                //         isPlan: true,
+                //         routingCode: this.currentRow.routingCode,
+                //         serviceNumber: this.model.serviceNumber,
+                //         tripNumber: this.currentRow.tripNumber
+                //     }
+                // });
+            } else {
+                this.$messageBox(this.$t('tip.selectAPieceOfData'));
+            }
+        },
+        handleConfirmUpdateTask(model) {
+            const tripConfigList = Object.assign([], this.model.tripConfigList);
+            tripConfigList.forEach(tripConfig=>{
+                if (tripConfig.routingCode == model.routingCode) {
+                    Object.assign(tripConfig, model);
+                }
+            });
+            this.model.tripConfigList = tripConfigList;
+        },
+        handleConfirmAddTask(model) {
+            // let index = this.model.tripConfigList.findIndex(
+            //     elem => { return elem.taskIndex == this.currentRow.taskIndex }
+            // );
 
-			//     this.model.tripConfigList = [...this.model.tripConfigList.slice(0, index), model, ...this.model.tripConfigList.slice(index)]
-			// } else {
-			//     this.model.tripConfigList.push(model);
-			// }
+            // if (index >= 0) {
+            //     if (!model.addToFront) {
+            //         index += 1;
+            //     }
 
-			if (model.addToFront) {
-				this.model.tripConfigList = [model, ...this.model.tripConfigList];
-			} else {
-				this.model.tripConfigList.push(model);
-			}
-		},
-		handleConfirmDeleteTask(model) {
-			const index = this.model.tripConfigList.findIndex(
-				elem => { return elem.taskIndex == this.currentRow.taskIndex; }
-			);
+            //     this.model.tripConfigList = [...this.model.tripConfigList.slice(0, index), model, ...this.model.tripConfigList.slice(index)]
+            // } else {
+            //     this.model.tripConfigList.push(model);
+            // }
+            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();
+                    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(() => {
+                        this.$messageBox(this.$t('tip.createPlanFailed'));
+                    });
+                } else {
+                    this.$messageBox('请增加任务');
+                }
+            } else {
+                if (this.model.tripConfigList.length > 0) {
+                    this.doClose();
+                    updatePlanService(this.$route.query.planId, this.model.serviceNumber, this.model).then(() => {
+                        this.$emit('refresh');
+                        // this.$emit('dispatchOperate', {
+                        // 	dialogName: 'openRunPlan', operate: 'loadRunPlanData', params: Object.assign({refresh: true}, this.$route.query)
+                        // });
+                        this.$message.success('修改计划成功');
+                    }).catch(() => {
+                        this.$messageBox('修改计划失败');
+                    });
+                } else {
+                    this.$messageBox('请增加任务');
+                }
+            }
 
-			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() {
-			this.doClose();
-			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(() => {
-				this.$messageBox(this.$t('tip.createPlanFailed'));
-			});
-		}
-	}
+        }
+    }
 };
 </script>
 <style rel="stylesheet/scss" lang="scss" scoped>
diff --git a/src/views/planMonitor/editTool/menus/editSmoothRunTime.vue b/src/views/planMonitor/editTool/menus/editSmoothRunTime.vue
index ba235e3a6..3bdf2344b 100644
--- a/src/views/planMonitor/editTool/menus/editSmoothRunTime.vue
+++ b/src/views/planMonitor/editTool/menus/editSmoothRunTime.vue
@@ -13,14 +13,14 @@
     <div style="margin: 10px;">
       <div style="border: 1px solid #B9B5A7">
         <el-row>
-          <span style="position: relative; top: -8px; left: 20px">{{$t('planMonitor.editSmoothRun.trainProportion')}}</span>
+          <span style="position: relative; top: -8px; left: 20px">{{ $t('planMonitor.editSmoothRun.trainProportion') }}</span>
           <el-col :offset="1">
-            <el-checkbox v-model="model.useSame">{{$t('planMonitor.editSmoothRun.allTheLoopTrainProportion')}}</el-checkbox>
+            <el-checkbox v-model="model.useSame">{{ $t('planMonitor.editSmoothRun.allTheLoopTrainProportion') }}</el-checkbox>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="9" :offset="1">
-            <span>{{$t('planMonitor.editSmoothRun.sizeOfTheLoopTrainProportion')}}</span>
+            <span>{{ $t('planMonitor.editSmoothRun.sizeOfTheLoopTrainProportion') }}</span>
           </el-col>
           <el-col :span="12">
             <el-select v-model="model.scale" :placeholder="$t('planMonitor.editSmoothRun.pleaseSelect')">
@@ -43,14 +43,14 @@
         </el-table>
       </el-row>
       <el-row type="flex" justify="center" class="button-group">
-        <el-button @click="handleAdd">{{$t('planMonitor.editSmoothRun.add')}}</el-button>
-        <el-button @click="handleDelete">{{$t('planMonitor.editSmoothRun.delete')}}</el-button>
-        <el-button @click="handleEdit">{{$t('planMonitor.editSmoothRun.modify')}}</el-button>
+        <el-button @click="handleAdd">{{ $t('planMonitor.editSmoothRun.add') }}</el-button>
+        <el-button @click="handleDelete">{{ $t('planMonitor.editSmoothRun.delete') }}</el-button>
+        <el-button @click="handleEdit">{{ $t('planMonitor.editSmoothRun.modify') }}</el-button>
       </el-row>
     </div>
     <el-row type="flex" justify="center" class="button-group">
-      <el-button style="padding: 0px; margin: 0px 30px" @click="handleCommit">{{$t('global.confirm')}}</el-button>
-      <el-button style="padding: 0px; margin: 0px 30px" @click="doClose">{{$t('global.cancel')}}</el-button>
+      <el-button style="padding: 0px; margin: 0px 30px" @click="handleCommit">{{ $t('global.confirm') }}</el-button>
+      <el-button style="padding: 0px; margin: 0px 30px" @click="doClose">{{ $t('global.cancel') }}</el-button>
     </el-row>
   </el-dialog>
 </template>
@@ -58,47 +58,47 @@
 <script>
 
 export default {
-	name: 'EditSmoothRunTime',
-	components: {
-	},
-	data() {
-		return {
-			dialogShow: false,
-			loading: false,
-			model: {
-				useSame: false,
-				smoothList: []
-			},
-			scaleList: []
-		};
-	},
-	computed: {
-		title() {
-			return this.$t('planMonitor.editSmoothRun.editSmoothRunTime');
-		}
-	},
-	mounted() {
-	},
-	methods: {
-		doShow() {
-			this.dialogShow = true;
-		},
-		doClose() {
-			this.loading = false;
-			this.dialogShow = false;
-		},
-		handleAdd() {
-			this.$emit('dispatchDialog', { name: 'addSmoothRunTime', params: {} });
-		},
-		handleDelete() {
-			this.$emit('dispatchDialog', { name: 'addSmoothRunTime', params: {} });
-		},
-		handleEdit() {
+    name: 'EditSmoothRunTime',
+    components: {
+    },
+    data() {
+        return {
+            dialogShow: false,
+            loading: false,
+            model: {
+                useSame: false,
+                smoothList: []
+            },
+            scaleList: []
+        };
+    },
+    computed: {
+        title() {
+            return this.$t('planMonitor.editSmoothRun.editSmoothRunTime');
+        }
+    },
+    mounted() {
+    },
+    methods: {
+        doShow() {
+            this.dialogShow = true;
+        },
+        doClose() {
+            this.loading = false;
+            this.dialogShow = false;
+        },
+        handleAdd() {
+            this.$emit('dispatchDialog', { name: 'addSmoothRunTime', params: {} });
+        },
+        handleDelete() {
+            this.$emit('dispatchDialog', { name: 'addSmoothRunTime', params: {} });
+        },
+        handleEdit() {
 
-		},
-		handleCommit() {
-		}
-	}
+        },
+        handleCommit() {
+        }
+    }
 };
 </script>
 <style rel="stylesheet/scss" lang="scss" scoped>
diff --git a/src/views/planMonitor/editTool/menus/editStationBetweenTime.vue b/src/views/planMonitor/editTool/menus/editStationBetweenTime.vue
index 0b0d81fec..b65896d48 100644
--- a/src/views/planMonitor/editTool/menus/editStationBetweenTime.vue
+++ b/src/views/planMonitor/editTool/menus/editStationBetweenTime.vue
@@ -11,8 +11,8 @@
     :close-on-click-modal="false"
   >
     <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-button @click="handleCommit">{{ $t('global.confirm') }}</el-button>
+      <el-button @click="doClose">{{ $t('global.cancel') }}</el-button>
     </el-row>
   </el-dialog>
 </template>
@@ -20,33 +20,33 @@
 <script>
 
 export default {
-	name: 'EditStationBetweenTime',
-	components: {
-	},
-	data() {
-		return {
-			dialogShow: false,
-			loading: false
-		};
-	},
-	computed: {
-		title() {
-			return this.$t('planMonitor.modifying.modifyTwoStationTime');
-		}
-	},
-	mounted() {
-	},
-	methods: {
-		doShow() {
-			this.dialogShow = true;
-		},
-		doClose() {
-			this.loading = false;
-			this.dialogShow = false;
-		},
-		handleCommit() {
-		}
-	}
+    name: 'EditStationBetweenTime',
+    components: {
+    },
+    data() {
+        return {
+            dialogShow: false,
+            loading: false
+        };
+    },
+    computed: {
+        title() {
+            return this.$t('planMonitor.modifying.modifyTwoStationTime');
+        }
+    },
+    mounted() {
+    },
+    methods: {
+        doShow() {
+            this.dialogShow = true;
+        },
+        doClose() {
+            this.loading = false;
+            this.dialogShow = false;
+        },
+        handleCommit() {
+        }
+    }
 };
 </script>
 <style rel="stylesheet/scss" lang="scss" scoped>
diff --git a/src/views/planMonitor/editTool/menus/lookup.vue b/src/views/planMonitor/editTool/menus/lookup.vue
index 6558b29b1..d393189ba 100644
--- a/src/views/planMonitor/editTool/menus/lookup.vue
+++ b/src/views/planMonitor/editTool/menus/lookup.vue
@@ -11,8 +11,8 @@
     :close-on-click-modal="false"
   >
     <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-button @click="handleCommit">{{ $t('global.confirm') }}</el-button>
+      <el-button @click="doClose">{{ $t('global.cancel') }}</el-button>
     </el-row>
   </el-dialog>
 </template>
@@ -20,33 +20,33 @@
 <script>
 
 export default {
-	name: 'LookUp',
-	components: {
-	},
-	data() {
-		return {
-			dialogShow: false,
-			loading: false
-		};
-	},
-	computed: {
-		title() {
-			return this.$t('planMonitor.modifying.search');
-		}
-	},
-	mounted() {
-	},
-	methods: {
-		doShow() {
-			this.dialogShow = true;
-		},
-		doClose() {
-			this.loading = false;
-			this.dialogShow = false;
-		},
-		handleCommit() {
-		}
-	}
+    name: 'LookUp',
+    components: {
+    },
+    data() {
+        return {
+            dialogShow: false,
+            loading: false
+        };
+    },
+    computed: {
+        title() {
+            return this.$t('planMonitor.modifying.search');
+        }
+    },
+    mounted() {
+    },
+    methods: {
+        doShow() {
+            this.dialogShow = true;
+        },
+        doClose() {
+            this.loading = false;
+            this.dialogShow = false;
+        },
+        handleCommit() {
+        }
+    }
 };
 </script>
 <style rel="stylesheet/scss" lang="scss" scoped>
diff --git a/src/views/planMonitor/editTool/menus/modifyService.vue b/src/views/planMonitor/editTool/menus/modifyService.vue
new file mode 100644
index 000000000..c3a040a33
--- /dev/null
+++ b/src/views/planMonitor/editTool/menus/modifyService.vue
@@ -0,0 +1,120 @@
+<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" />
+      </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',
+    data() {
+        return {
+            dialogShow:false,
+            isModifyServiceNumber:false,
+            serviceNumber:'',
+            tripNumber:'',
+            title:'',
+            oldServiceNumber:'',
+            oldTripNumber:''
+        };
+    },
+    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;
+        },
+        handleCommit() {
+            if (this.isModifyServiceNumber) {
+                const result = /^\d{2,}$/.test(this.serviceNumber);
+                if (this.serviceNumber && result) {
+                    updateServiceNumber(this.$route.query.planId, 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('请输入正确的计划号(两位以上数字)');
+                }
+
+            } else {
+                const result = /^\d{2,}$/.test(this.tripNumber);
+                if (this.tripNumber && result) {
+                    const SDTNumber = this.oldServiceNumber + this.oldTripNumber;
+                    updateTripNumber(this.$route.query.planId, 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/planMonitor/editTool/menus/modifyingBeginTime.vue b/src/views/planMonitor/editTool/menus/modifyingBeginTime.vue
index 863ba2db8..162ded887 100644
--- a/src/views/planMonitor/editTool/menus/modifyingBeginTime.vue
+++ b/src/views/planMonitor/editTool/menus/modifyingBeginTime.vue
@@ -11,48 +11,48 @@
     :close-on-click-modal="false"
   >
     <el-row>
-      <el-col :span="9" :offset="1" style="height: 32px; line-height: 32px;">{{$t('planMonitor.modifying.modifyStartTime')}}</el-col>
+      <el-col :span="9" :offset="1" style="height: 32px; line-height: 32px;">{{ $t('planMonitor.modifying.modifyStartTime') }}</el-col>
       <el-col :span="14">
         <el-time-picker v-model="beginTime" size="mini" :clearable="false" />
       </el-col>
     </el-row>
     <el-row type="flex" justify="center" style="margin-top: 20px">
-      <el-button @click="handleCommit">{{$t('global.confirm')}}</el-button>
-      <el-button @click="doClose">{{$t('global.cancel')}}</el-button>
+      <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: 'ModifyingBeginTime',
-	components: {
-	},
-	data() {
-		return {
-			dialogShow: false,
-			loading: false,
-			beginTime: ''
-		};
-	},
-	computed: {
-		title() {
-			return this.$t('planMonitor.modifying.modifyStartTimeTitle');
-		}
-	},
-	mounted() {
-	},
-	methods: {
-		doShow() {
-			this.dialogShow = true;
-		},
-		doClose() {
-			this.loading = false;
-			this.dialogShow = false;
-		},
-		handleCommit() {
-		}
-	}
+    name: 'ModifyingBeginTime',
+    components: {
+    },
+    data() {
+        return {
+            dialogShow: false,
+            loading: false,
+            beginTime: ''
+        };
+    },
+    computed: {
+        title() {
+            return this.$t('planMonitor.modifying.modifyStartTimeTitle');
+        }
+    },
+    mounted() {
+    },
+    methods: {
+        doShow() {
+            this.dialogShow = true;
+        },
+        doClose() {
+            this.loading = false;
+            this.dialogShow = false;
+        },
+        handleCommit() {
+        }
+    }
 };
 </script>
 <style rel="stylesheet/scss" lang="scss" scoped>
diff --git a/src/views/planMonitor/editTool/menus/modifyingRouting.vue b/src/views/planMonitor/editTool/menus/modifyingRouting.vue
index 58f1380d4..80cf50afe 100644
--- a/src/views/planMonitor/editTool/menus/modifyingRouting.vue
+++ b/src/views/planMonitor/editTool/menus/modifyingRouting.vue
@@ -13,14 +13,14 @@
     <div style="margin: 10px">
       <el-row>
         <el-col :span="8">
-          <span style="position:relative; left: 12px; top: 9px">{{$t('planMonitor.modifying.time')}}</span>
+          <span style="position:relative; left: 12px; top: 9px">{{ $t('planMonitor.modifying.time') }}</span>
           <div style="border: 1px solid #ADA99A">
             <el-radio-group v-model="timeType" style="margin: 10px">
               <el-row style="margin: 5px 0px">
-                <el-radio :label="1">{{$t('planMonitor.modifying.startStationTips')}}</el-radio>
+                <el-radio :label="1">{{ $t('planMonitor.modifying.startStationTips') }}</el-radio>
               </el-row>
               <el-row style="margin: 5px 0px">
-                <el-radio :label="2">{{$t('planMonitor.modifying.endStationTips')}}</el-radio>
+                <el-radio :label="2">{{ $t('planMonitor.modifying.endStationTips') }}</el-radio>
               </el-row>
             </el-radio-group>
           </div>
@@ -36,8 +36,8 @@
         </el-table>
       </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-button @click="handleCommit">{{ $t('global.confirm') }}</el-button>
+        <el-button @click="doClose">{{ $t('global.cancel') }}</el-button>
       </el-row>
     </div>
   </el-dialog>
@@ -46,35 +46,35 @@
 <script>
 
 export default {
-	name: 'ModifyingRouting',
-	components: {
-	},
-	data() {
-		return {
-			dialogShow: false,
-			loading: false,
-			timeType: '1',
-			routeDate: []
-		};
-	},
-	computed: {
-		title() {
-			return this.$t('planMonitor.modifying.modifyTaskRoute');
-		}
-	},
-	mounted() {
-	},
-	methods: {
-		doShow() {
-			this.dialogShow = true;
-		},
-		doClose() {
-			this.loading = false;
-			this.dialogShow = false;
-		},
-		handleCommit() {
-		}
-	}
+    name: 'ModifyingRouting',
+    components: {
+    },
+    data() {
+        return {
+            dialogShow: false,
+            loading: false,
+            timeType: '1',
+            routeDate: []
+        };
+    },
+    computed: {
+        title() {
+            return this.$t('planMonitor.modifying.modifyTaskRoute');
+        }
+    },
+    mounted() {
+    },
+    methods: {
+        doShow() {
+            this.dialogShow = true;
+        },
+        doClose() {
+            this.loading = false;
+            this.dialogShow = false;
+        },
+        handleCommit() {
+        }
+    }
 };
 </script>
 <style rel="stylesheet/scss" lang="scss" scoped>
diff --git a/src/views/planMonitor/editTool/menus/modifyingStationIntervalTime.vue b/src/views/planMonitor/editTool/menus/modifyingStationIntervalTime.vue
index bdcf16ab3..01937d923 100644
--- a/src/views/planMonitor/editTool/menus/modifyingStationIntervalTime.vue
+++ b/src/views/planMonitor/editTool/menus/modifyingStationIntervalTime.vue
@@ -32,56 +32,58 @@
             <span style="margin-left: 10px">{{ formatName(scope.row.endSectionCode) }}</span>
           </template>
         </el-table-column>
-        <el-table-column prop="directionCode" :label="$t('planMonitor.modifying.direction')" width="60">
+        <el-table-column prop="right" :label="$t('planMonitor.modifying.direction')" width="60">
           <template slot-scope="scope">
-            <span style="margin-left: 10px">{{ DirectionCodeMap[scope.row.directionCode] }}</span>
+            <span style="margin-left: 10px">{{ scope.row.right?'上行':'下行' }}</span>
           </template>
         </el-table-column>
         <el-table-column prop="distance" :label="$t('planMonitor.modifying.distance')" width="65">
           <template slot-scope="scope">
-            <span style="margin-left: 10px">{{ scope.row.distance/100 }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column prop="runPlanLevelVO" :label="$t('planMonitor.updateStation.level1')" width="70">
-          <template slot-scope="scope">
-            <span
-              style="margin-left: 10px"
-              :style="{color: scope.row.isEditStatus? 'red': 'black'}"
-            >{{ scope.row.runPlanLevelVO.level1 || '' }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column prop="runPlanLevelVO" :label="$t('planMonitor.updateStation.level2')" width="70">
-          <template slot-scope="scope">
-            <span
-              style="margin-left: 10px"
-              :style="{color: scope.row.isEditStatus? 'red': 'black'}"
-            >{{ scope.row.runPlanLevelVO.level2 || '' }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column prop="runPlanLevelVO" :label="$t('planMonitor.updateStation.level3')" width="70">
-          <template slot-scope="scope">
-            <span
-              style="margin-left: 10px"
-              :style="{color: scope.row.isEditStatus? 'red': 'black'}"
-            >{{ scope.row.runPlanLevelVO.level3 || '' }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column prop="runPlanLevelVO" :label="$t('planMonitor.updateStation.level4')" width="70">
-          <template slot-scope="scope">
-            <span
-              style="margin-left: 10px"
-              :style="{color: scope.row.isEditStatus? 'red': 'black'}"
-            >{{ scope.row.runPlanLevelVO.level4 || '' }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column prop="runPlanLevelVO" :label="$t('planMonitor.updateStation.level5')" width="70">
-          <template slot-scope="scope">
-            <span
-              style="margin-left: 10px"
-              :style="{color: scope.row.isEditStatus?'red': 'black'}"
-            >{{ scope.row.runPlanLevelVO.level5 || '' }}</span>
+            <span style="margin-left: 10px">{{ scope.row.distance }}</span>
           </template>
         </el-table-column>
+        <div>
+          <el-table-column prop="l1" :label="$t('planMonitor.updateStation.level1')" width="70">
+            <template slot-scope="scope">
+              <span
+                style="margin-left: 10px"
+                :style="{color: scope.row.isEditStatus? 'red': 'black'}"
+              >{{ scope.row.l1 || '' }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column prop="l2" :label="$t('planMonitor.updateStation.level2')" width="70">
+            <template slot-scope="scope">
+              <span
+                style="margin-left: 10px"
+                :style="{color: scope.row.isEditStatus? 'red': 'black'}"
+              >{{ scope.row.l2 || '' }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column prop="l3" :label="$t('planMonitor.updateStation.level3')" width="70">
+            <template slot-scope="scope">
+              <span
+                style="margin-left: 10px"
+                :style="{color: scope.row.isEditStatus? 'red': 'black'}"
+              >{{ scope.row.l3 || '' }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column prop="l2" :label="$t('planMonitor.updateStation.level4')" width="70">
+            <template slot-scope="scope">
+              <span
+                style="margin-left: 10px"
+                :style="{color: scope.row.isEditStatus? 'red': 'black'}"
+              >{{ scope.row.l4 || '' }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column prop="l2" :label="$t('planMonitor.updateStation.level5')" width="70">
+            <template slot-scope="scope">
+              <span
+                style="margin-left: 10px"
+                :style="{color: scope.row.isEditStatus? 'red': 'black'}"
+              >{{ scope.row.l5 || '' }}</span>
+            </template>
+          </el-table-column>
+        </div>
         <!-- <el-table-column :label="$t('planMonitor.modifying.operation')" width="100">
           <template slot-scope="scope">
             <el-button type="text" size="small" @click="handleUpdate(scope.row)">{{ $t('planMonitor.modifying.edit') }}</el-button>
@@ -90,7 +92,6 @@
       </el-table>
     </el-row>
     <div class="button-group" style="text-align: center; margin-top: 10px;">
-      <el-button type="primary" @click="handleSave">{{ $t('planMonitor.modifying.save') }}</el-button>
       <el-button @click="doClose">{{ $t('planMonitor.modifying.cancelAndQuit') }}</el-button>
     </div>
     <!-- <update-station-interval-time ref="updateStationIntervalTime" @handleConfirm="handleConfirm" /> -->
@@ -98,7 +99,7 @@
 </template>
 <script>
 import { formatName } from '@/utils/runPlan';
-import { getStationRunning, setStationRunning, getMapStationRun } from '@/api/runplan';
+import { setStationRunning, getMapStationRun } from '@/api/runplan';
 // import UpdateStationIntervalTime from './updateStationIntervalTime';
 
 export default {
@@ -125,9 +126,6 @@ export default {
     computed: {
         title() {
             return this.$t('planMonitor.modifying.modifyRunLevel');
-        },
-        isNewMap() {
-            return this.$route.path.includes('displayNew');
         }
     },
     mounted() {
@@ -144,33 +142,18 @@ export default {
             });
 
             this.stationIntervalData = [];
-            if (this.$route.query.lineCode || !this.isNewMap) {
-                getStationRunning(this.$route.query.mapId).then(resp => {
-                    const list = resp.data;
-                    list.forEach(elem => {
-                        elem.isEditStatus = false;
-                        if (!elem.runPlanLevelVO || elem.runPlanLevelVO.length <= 0) {
-                            elem.runPlanLevelVO = { stationRunningId: elem.id };
-                            Object.keys(this.runSpeedLevels).forEach(key => {
-                                elem.runPlanLevelVO[key] = parseInt((elem.distance / 100) / (this.runSpeedLevels[key] / 3.6));
-                                elem.isEditStatus = true;
-                            });
-                        }
-                    });
-                    this.stationIntervalData = list;
-                });
-            } else if (this.$route.query.lineCode || this.isNewMap) {
+            if (this.$route.query.lineCode) {
                 getMapStationRun(this.$route.query.mapId).then(resp =>{
                     const list = resp.data;
                     list.forEach(elem => {
                         elem.isEditStatus = false;
-                        if (!elem.runPlanLevelVO || elem.runPlanLevelVO.length <= 0) {
-                            elem.runPlanLevelVO = { stationRunningId: elem.id };
-                            Object.keys(this.runSpeedLevels).forEach(key => {
-                                elem.runPlanLevelVO[key] = parseInt((elem.distance / 100) / (this.runSpeedLevels[key] / 3.6));
-                                elem.isEditStatus = true;
-                            });
-                        }
+                        // if (!elem.runPlanLevelVO || elem.runPlanLevelVO.length <= 0) {
+                        //     elem.runPlanLevelVO = { stationRunningId: elem.id };
+                        //     Object.keys(this.runSpeedLevels).forEach(key => {
+                        //         elem.runPlanLevelVO[key] = parseInt((elem.distance / 100) / (this.runSpeedLevels[key] / 3.6));
+                        //         elem.isEditStatus = true;
+                        //     });
+                        // }
                     });
                     this.stationIntervalData = list;
                 });
diff --git a/src/views/planMonitor/editTool/menus/modifyingTask.vue b/src/views/planMonitor/editTool/menus/modifyingTask.vue
index 867052e32..8db9d6158 100644
--- a/src/views/planMonitor/editTool/menus/modifyingTask.vue
+++ b/src/views/planMonitor/editTool/menus/modifyingTask.vue
@@ -18,7 +18,7 @@
             <span>{{ $t('planMonitor.modifying.tripNumber') }}</span>
           </el-col>
           <el-col :span="15">
-            <el-select v-model="editModel.tripNumber" size="mini" style="display: inline-black" :placeholder="$t('planMonitor.modifying.pleaseSelect')">
+            <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"
@@ -42,7 +42,8 @@
             <span>{{ $t('planMonitor.modifying.defaultStopTime') }}</span>
           </el-col>
           <el-col :span="12">
-            <el-select
+            <el-input-number v-model="defaultStopTime" placeholder="请输入时间" size="mini" :controls="false" :min="0" />
+            <!-- <el-select
               v-model="editModel.defaultStopTime"
               style="display: inline-black"
               size="mini"
@@ -54,7 +55,7 @@
                 :label="item.label"
                 :value="item.value"
               />
-            </el-select>
+            </el-select> -->
           </el-col>
         </el-row>
       </el-col>
@@ -64,7 +65,7 @@
             <span>{{ $t('planMonitor.modifying.serviceNumber') }}</span>
           </el-col>
           <el-col :span="13">
-            <el-input v-model="editModel.serviceNumber" size="mini" />
+            <el-input v-model="serviceNumber" size="mini" disabled />
           </el-col>
         </el-row>
       </el-col>
@@ -171,7 +172,7 @@
       {{ $t('planMonitor.modifying.route') }}
     </el-row>
     <el-row>
-      <el-table :data="editModel.routingList" border :height="140">
+      <el-table :data="routingList" border :height="140">
         <el-table-column prop="startStationCode" :label="$t('planMonitor.modifying.startingStation')">
           <template slot-scope="scope">
             {{ formatName(scope.row.startStationCode) }}
@@ -192,21 +193,31 @@
       {{ $t('planMonitor.modifying.detail') }}
     </el-row>
     <el-row>
-      <el-table :data="editModel.arriveConfigList" border :height="260">
-        <el-table-column prop="stationCode" :label="$t('planMonitor.modifying.station')">
+      <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="$t('planMonitor.modifying.section')">
+        <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 prop="arriveTime" :label="$t('planMonitor.modifying.arrivalTime')" />
-        <el-table-column prop="stopTime" :label="$t('planMonitor.modifying.stopTime')" />
-        <el-table-column prop="departureTime" :label="$t('planMonitor.modifying.departureTime')" />
-        <el-table-column prop="speedLevel" :label="$t('planMonitor.modifying.runLevel')" />
+        <el-table-column prop="arriveTime" :label="this.$t('planMonitor.arriveTime')" />
+        <!-- prop="stopTime"  -->
+        <el-table-column :label="this.$t('planMonitor.stopTime')">
+          <template slot-scope="scope">
+            <el-input v-model="scope.row.stopTime" placeholder="请输入时间" size="mini" @input="changeStopTime(scope.$index, scope.row.stopTime)" />
+          </template>
+        </el-table-column>
+        <el-table-column prop="departureTime" :label="this.$t('planMonitor.departureTime')" />
+        <el-table-column :label="this.$t('planMonitor.runLevel')">
+          <template slot-scope="scope">
+            {{ scope.row.speedLevel }}
+            <el-input v-model="scope.row.speedLevelTime" placeholder="请输入运行等级" size="mini" @input="changeSpeedLevelTime(scope.$index, scope.row.speedLevelTime)" />
+          </template>
+        </el-table-column>
       </el-table>
     </el-row>
     <el-row>
@@ -221,7 +232,7 @@
   </el-dialog>
 </template>
 <script>
-import { getRoutingBySDTNumber, querySectionListByRouting, getStationRunning, updatePlanTrip, getMapStationRun } from '@/api/runplan';
+import { getRoutingBySDTNumber, updatePlanTrip, getMapStationRun } from '@/api/runplan';
 import { formatTime, formatName } from '@/utils/runPlan';
 
 export default {
@@ -242,52 +253,58 @@ export default {
             loading: false,
             isPlan: false,
             PlanConvert: {},
+            parkSectionCodeList:[],
             stopStationMap: {},
+            defaultStopTime: 0,
+            defaultSpeedLevel: 'l3',
+            routingList: [],
+            tripNumber: '',
+            serviceNumber: '',
+            planId: '',
             editModel: {
-                taskIndex: '',
                 routingCode: '',
-                defaultStopTime: '',
-                defaultSpeedLevel: '',
-                tripNumber: '',
-                serviceNumber: '',
+                endStationCode: '',
+                startStationCode: '',
                 startTime: '00:00:00',
                 endTime: '',
-                routingList: [],
-                arriveConfigList: [],
-
-                serialNumber: '',
-                trainManual: false,
-                serialManual: false,
-                clearGuest: false,
-                continuationPlan: false,
-                firstTrain: false,
-                lastTrain: false,
-                inStock: false,
-                outStock: false
+                arriveConfigList: []
+                // serialNumber: '',
+                // trainManual: false,
+                // serialManual: false,
+                // clearGuest: false,
+                // continuationPlan: false,
+                // firstTrain: false,
+                // lastTrain: false,
+                // inStock: false,
+                // outStock: false
             },
             tripNumberList: [{ value: '', label: this.$t('planMonitor.modifying.automatic') }],
-            defaultStopTimeList: [{ value: '', label: this.$t('planMonitor.modifying.default') }],
-            defaultSpeedLevelList: [{ value: '', label: this.$t('planMonitor.modifying.default') }],
-            serialNumberList: []
+            // defaultStopTimeList: [{ value: '', label: this.$t('planMonitor.modifying.default') }],
+            // defaultSpeedLevelList: [{ value: '', label: this.$t('planMonitor.modifying.default') }],
+            serialNumberList: [],
+            defaultSpeedLevelList: [
+                { value: 'l1', label: '等级一' },
+                { value: 'l2', label: '等级二' },
+                { value: 'l3', label: '等级三'},
+                { value: 'l4', label: '等级四' },
+                { value: 'l5', label: '等级五' }
+            ]
         };
     },
     computed: {
         title() {
             return this.$t('planMonitor.modifying.modifyTask');
-        },
-        isNewMap() {
-            return this.$route.path.includes('displayNew');
         }
     },
     watch: {
         'editModel.startTime': function () {
             this.computedDetailList();
         },
-        'editModel.defaultStopTime': function () {
-            this.computedDetailList();
+        'defaultStopTime': function () {
+            this.computedDetailList('defaultStopTime');
         },
-        'editModel.defaultSpeedLevel': function () {
-            this.computedDetailList();
+        'defaultSpeedLevel': function () {
+            this.computedDetailList('defaultSpeedLevel');
         }
     },
     methods: {
@@ -311,78 +328,52 @@ export default {
                         runTime = parseInt(stopStationObj.runPlanLevelVO[runLevel]);
                     } else if (stopStationObj['l3']) {
                         runTime = parseInt(stopStationObj['l3']);
-                    } else {
-                        // this.$messageBox(`${this.$t('planMonitor.modifying.setMessageTip1')} ${stopStationObj.startSectionCode} ${this.$t('planMonitor.modifying.setMessageTip2')} ${stopStationObj.endSectionCode} ${this.$t('planMonitor.modifying.setMessageTip3')}`);
-                        this.$alert(`${this.$t('planMonitor.tipOperationTime')}`, {
-                            confirmButtonText: this.$t('global.confirm'),
-                            callback: action => {
-                                this.doClose();
-                            }
-                        });
                     }
                 }
             }
 
             return runTime;
         },
-        computedDetailList() {
-            this.editModel.arriveConfigList = [];
+        computedDetailList(type = null) {
             if (this.editModel.routingCode) {
-                querySectionListByRouting({ planId: this.$route.query.planId || this.loadRunPlanId, routingCode: this.editModel.routingCode }).then(rest => {
-                    const list = rest.data;
-                    const waitTime = this.editModel.defaultStopTime || 30; // 默认三十秒
-                    let tempTime = this.computedTimeByString(this.editModel.startTime) / 1000 - 30;
-                    const runLevel = this.editModel.defaultSpeedLevel || 'level3'; // 默认等级三
-                    list.forEach((elem, index) => {
-                        elem.arriveTime = index ? formatTime(tempTime) : '';
-                        elem.departureTime = index == list.length - 1 ? '' : formatTime(tempTime + waitTime);
-                        elem.stopTime = this.editModel.defaultSpeedLevel || this.$t('planMonitor.modifying.default');
-                        elem.speedLevel = this.editModel.defaultStopTime || this.$t('planMonitor.modifying.default');
-                        tempTime = tempTime + waitTime + this.compuntedRunTime(list, index, runLevel);
-                    });
-
-                    if (this.editModel.routingList && this.editModel.routingList.length > 0) {
-                        const row = this.editModel.routingList[0];
-                        const startSection = this.$store.getters['map/getDeviceByCode'](row.startSectionCode);
-                        if (startSection && startSection.isReentryTrack) {
-                            list.shift();
-                        }
-
-                        const endSection = this.$store.getters['map/getDeviceByCode'](row.endSectionCode);
-                        if (endSection && endSection.isReentryTrack) {
-                            list.pop();
-                        }
+                const list = Object.assign([], this.editModel.arriveConfigList);
+                let tempTime = this.computedTimeByString(this.editModel.startTime) / 1000;
+                const runLevel = this.defaultSpeedLevel || 'l3'; // 默认等级三
+                list.forEach((elem, index) => {
+                    if (type == 'defaultStopTime' || type == 'routingCode') {
+                        elem.stopTime = parseInt(this.defaultStopTime);
+                    }
+                    elem.arriveTime = index ? formatTime(tempTime) : '';
+                    if (index > 0) {
+                        elem.departureTime = index == list.length - 1 ? '' : formatTime(tempTime + elem.stopTime);
+                    } else {
+                        elem.departureTime = formatTime(tempTime);
+                    }
+                    const runLevelObj = this.defaultSpeedLevelList.find(speedLevel=>{ return speedLevel.value == runLevel; });
+                    if (!elem.speedLevelTime || type == 'defaultSpeedLevel') {
+                        const realRunlevel = this.compuntedRunTime(list, index, runLevel);
+                        elem.speedLevelTime = realRunlevel;
+                    }
+                    elem.speedLevel = this.defaultSpeedLevel == 'l3' ? `${this.$t('planMonitor.default')}(${runLevelObj.label})` : runLevelObj.label;
+                    if (index > 0) {
+                        tempTime = tempTime + elem.stopTime + elem.speedLevelTime;
+                    } else {
+                        tempTime = tempTime + elem.speedLevelTime;
                     }
 
-                    this.editModel.arriveConfigList = list;
-                    this.editModel.endTime = formatTime(tempTime - waitTime);
                 });
+                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.editModel.taskIndex = params.taskIndex;
-            this.editModel.serviceNumber = params.serviceNumber;
-            this.editModel.tripNumber = params.tripNumber;
+            this.tripNumber = params.tripNumber;
+            this.serviceNumber = params.serviceNumber;
+            this.planId = this.$route.query.planId;
             this.PlanConvert = this.$theme.loadPlanConvert(lineCode);
-
-            const editData = this.$store.state.runPlan.editData[this.editModel.serviceNumber];
-            if (editData) {
-                const tripNumberList = Object.keys(editData.trainMap).sort((a, b) => { return editData.trainMap[a].oldIndex - editData.trainMap[b].oldIndex; });
-                const trainInfo = editData.trainMap[tripNumberList[0]];
-                this.editModel.startTime = formatTime(trainInfo.stationTimeList[0].secondTime + this.PlanConvert.TranslationTime);
-            }
-
-            if (mapId && !this.isNewMap) {
-                getStationRunning(mapId).then(resp => {
-                    const list = resp.data;
-                    list.forEach(elem => {
-                        this.stopStationMap[[elem.startSectionCode, elem.endSectionCode].toString()] = elem;
-                    });
-                });
-            } else if (mapId && this.isNewMap) {
+            if (mapId) {
                 getMapStationRun(mapId).then(resp => {
                     const list = resp.data;
                     list.forEach(elem => {
@@ -390,22 +381,130 @@ export default {
                     });
                 });
             }
-            const model = {
-                planId: this.$route.query.planId || this.loadRunPlanId,
-                SDTNumber: `${this.editModel.serviceNumber}${this.editModel.tripNumber}`
-            };
-
-            this.editModel.routingList = [];
-            getRoutingBySDTNumber(model).then(resp => { // 根据车次号查询交路
-                const routingObj = resp.data;
-                this.editModel.routingCode = routingObj.code;
-                this.editModel.routingList.push(routingObj);
+            // this.routingList
+            if (params.rowData && params.rowData.arriveConfigList.length > 0) {
+                this.editModel.arriveConfigList = params.rowData.arriveConfigList;
+                this.editModel.routingCode = params.rowData.routingCode;
+                this.editModel.startStationCode = params.rowData.startStationCode;
+                this.editModel.endStationCode = params.rowData.endStationCode;
+                this.editModel.startTime = params.rowData.startTime;
+                this.editModel.endTime = params.rowData.endTime;
+                this.editModel.endSectionCode = params.rowData.endSectionCode;
+                this.editModel.startSectionCode = params.rowData.startSectionCode;
+                this.routingList = [];
+                this.routingList.push({
+                    code:params.rowData.routingCode,
+                    startStationCode:params.rowData.startStationCode,
+                    endStationCode:params.rowData.endStationCode,
+                    endSectionCode:params.rowData.endSectionCode,
+                    startSectionCode:params.rowData.startSectionCode
+                });
                 this.computedDetailList();
+                this.dialogShow = true;
+            } else {
+                const model = {
+                    planId: this.$route.query.planId || this.loadRunPlanId,
+                    SDTNumber: `${this.serviceNumber}${this.tripNumber}`
+                };
+                this.editModel.routingList = [];
+                getRoutingBySDTNumber(model).then(resp => { // 根据车次号查询交路
+                    // const routingObj = resp.data;
+                    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,
+                            startStationCode: resp.data.startStationCode,
+                            startTime: formatTime(trainInfo.stationTimeList[0].secondTime + 7200),
+                            endStationCode: resp.data.endStationCode,
+                            endTime: formatTime(trainInfo.stationTimeList[lastIndex].secondTime + 7200),
+                            routingCode : resp.data.code,
+                            endSectionCode:resp.data.endSectionCode,
+                            startSectionCode:resp.data.startSectionCode,
+                            arriveConfigList: []
+                            // parkSectionCodeList
+                        };
+                        const newstationTimeList = [];
+                        let current = {};
+                        trainInfo.stationTimeList.forEach((stationTime, index)=>{
+                            if (index % 2 == 0) {
+                                current = {};
+                                current.stationCode = stationTime.stationCode;
+                                current.arriveTime = stationTime.secondTime;
+                            } else {
+                                current.departureTime = stationTime.secondTime;
+                                newstationTimeList.push(current);
+                            }
+                        });
+                        newstationTimeList.forEach((newstationTime, index)=>{
+                            const newModel = {
+                                sectionCode:resp.data.parkSectionCodeList[index].sectionCode,
+                                stationCode:newstationTime.stationCode,
+                                speedLevel:'默认',
+                                arriveTime: formatTime(newstationTime.arriveTime + 7200),
+                                departureTime: formatTime(newstationTime.departureTime + 7200),
+                                stopTime:newstationTime.departureTime - newstationTime.arriveTime
+                            };
+                            if (index < newstationTimeList.length - 1) {
+                                newModel.speedLevelTime = newstationTimeList[index + 1].arriveTime - newstationTime.departureTime;
+                            }
+                            this.editModel.arriveConfigList.push(newModel);
+                        });
+                        this.dialogShow = true;
+                        this.computedDetailList();
+                    }
+                });
+            }
+        },
+        changeStopTime(indexs, time) {
+            let tempTime = this.computedTimeByString(this.editModel.startTime) / 1000;
+            // const runLevel = this.defaultSpeedLevel || 'l3'; // 默认等级三
+            const arriveConfigList = Object.assign([], this.editModel.arriveConfigList);
+            arriveConfigList.forEach((elem, index) => {
+                if (index == indexs) { elem.stopTime = time ? Number(time) : 0; }
+                elem.arriveTime = index ? formatTime(tempTime) : '';
+                // const runLevelObj = this.defaultSpeedLevelList.find(speedLevel=>{ return speedLevel.value == runLevel; });
+                // elem.speedLevel = this.defaultSpeedLevel == 'l3' ? `${this.$t('planMonitor.default')}(${runLevelObj.label})` : runLevelObj.label;
+                if (index > 0) {
+                    elem.departureTime = index == arriveConfigList.length - 1 ? '' : formatTime(tempTime + elem.stopTime);
+                } else {
+                    elem.departureTime = formatTime(tempTime);
+                }
+                const realRunlevel = elem.speedLevelTime;
+                if (index > 0) {
+                    tempTime = tempTime + elem.stopTime + realRunlevel;
+                } else {
+                    tempTime = tempTime + realRunlevel;
+                }
             });
+            this.editModel.arriveConfigList = arriveConfigList;
+            this.editModel.endTime = formatTime(tempTime - this.editModel.arriveConfigList[this.editModel.arriveConfigList.length - 1].stopTime);
+        },
+        changeSpeedLevelTime(indexs, speedLevelTime) {
+            const arriveConfigList = Object.assign([], this.editModel.arriveConfigList);
+            let tempTime = this.computedTimeByString(this.editModel.startTime) / 1000;
+            arriveConfigList.forEach((elem, index) => {
+                elem.arriveTime = index ? formatTime(tempTime) : '';
+                if (index == indexs) { elem.speedLevelTime = speedLevelTime ? Number(speedLevelTime) : 0; }
+                elem.arriveTime = index ? formatTime(tempTime) : '';
+                if (index > 0) {
+                    elem.departureTime = index == arriveConfigList.length - 1 ? '' : formatTime(tempTime + elem.stopTime);
+                } else {
+                    elem.departureTime = formatTime(tempTime);
+                }
+                const realRunlevel = elem.speedLevelTime;
+                if (index > 0) {
+                    tempTime = tempTime + elem.stopTime + realRunlevel;
+                } else {
+                    tempTime = tempTime + realRunlevel;
+                }
+            });
+            this.editModel.arriveConfigList = arriveConfigList;
+            this.editModel.endTime = formatTime(tempTime - this.editModel.arriveConfigList[this.editModel.arriveConfigList.length - 1].stopTime);
         },
         doShow(params) {
             this.loadInitData(params);
-            this.dialogShow = true;
         },
         doClose() {
             this.loading = false;
@@ -415,16 +514,17 @@ export default {
             return {
                 planId: this.$route.query.planId || this.loadRunPlanId,
                 routingCode: this.editModel.routingCode,
-                tripNumber: this.editModel.tripNumber,
+                tripNumber: this.tripNumber,
                 startTime: this.editModel.startTime,
                 endTime: this.editModel.endTime,
                 arriveConfigList: this.editModel.arriveConfigList,
-                SDTNumber: `${this.editModel.serviceNumber}${this.editModel.tripNumber}`
+                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 => {
diff --git a/src/views/planMonitor/editTool/menus/offLine.vue b/src/views/planMonitor/editTool/menus/offLine.vue
index 87877251c..59b990dca 100644
--- a/src/views/planMonitor/editTool/menus/offLine.vue
+++ b/src/views/planMonitor/editTool/menus/offLine.vue
@@ -27,44 +27,47 @@
 <script>
 
 export default {
-	name: 'OffLine',
-	components: {
-	},
-	data() {
-		return {
-			dialogShow: false,
-			loading: false,
-			params: {}
-		};
-	},
-	computed: {
-		title() {
-			return this.$t('planMonitor.updateStation.deletePlanCar');
-		},
-		width() {
-			if (this.params.width) {
-				return this.params.width;
-			} else {
-				return 400;
-			}
-		}
-	},
-	mounted() {
-	},
-	methods: {
-		doShow(params) {
-			this.params = params || {};
-			this.dialogShow = true;
-		},
-		doClose() {
-			this.loading = false;
-			this.dialogShow = false;
-		},
-		handleCommit() {
-			this.$emit('handleConfirm', this.params);
-			this.doClose();
-		}
-	}
+    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>
diff --git a/src/views/planMonitor/editTool/menus/parameter/baseParameter.vue b/src/views/planMonitor/editTool/menus/parameter/baseParameter.vue
index d8e2aec7d..314358a35 100644
--- a/src/views/planMonitor/editTool/menus/parameter/baseParameter.vue
+++ b/src/views/planMonitor/editTool/menus/parameter/baseParameter.vue
@@ -21,50 +21,50 @@
     </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>
+      <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>
+      <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>
+      <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: {
-	}
+    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>
diff --git a/src/views/planMonitor/editTool/menus/parameter/baseStation.vue b/src/views/planMonitor/editTool/menus/parameter/baseStation.vue
index 67974391d..5e7ecc026 100644
--- a/src/views/planMonitor/editTool/menus/parameter/baseStation.vue
+++ b/src/views/planMonitor/editTool/menus/parameter/baseStation.vue
@@ -7,28 +7,28 @@
       </el-table>
     </el-col>
     <el-col :span="10" :offset="1">
-      <el-button style="margin-top: 20px" @click="handleModifyingStationProperty">{{$t('planMonitor.modifyAttribute')}}</el-button>
+      <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: {} });
-		}
-	}
+    name: 'BaseStation',
+    components: {
+    },
+    data() {
+        return {
+            stationData: []
+        };
+    },
+    mounted() {
+    },
+    methods: {
+        handleModifyingStationProperty() {
+            this.$emit('dispatchDialog', { name: 'modifyingStationProperty', params: {} });
+        }
+    }
 };
 </script>
 <style rel="stylesheet/scss" lang="scss" scoped>
diff --git a/src/views/planMonitor/editTool/menus/quickLoopsIncrease.vue b/src/views/planMonitor/editTool/menus/quickLoopsIncrease.vue
index c6aa68460..02d3feae9 100644
--- a/src/views/planMonitor/editTool/menus/quickLoopsIncrease.vue
+++ b/src/views/planMonitor/editTool/menus/quickLoopsIncrease.vue
@@ -11,8 +11,8 @@
     :close-on-click-modal="false"
   >
     <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-button @click="handleCommit">{{ $t('global.confirm') }}</el-button>
+      <el-button @click="doClose">{{ $t('global.cancel') }}</el-button>
     </el-row>
   </el-dialog>
 </template>
@@ -20,33 +20,33 @@
 <script>
 
 export default {
-	name: 'QuickLoopsIncrease',
-	components: {
-	},
-	data() {
-		return {
-			dialogShow: false,
-			loading: false
-		};
-	},
-	computed: {
-		title() {
-			return this.$t('planMonitor.updateStation.quicklyAddLoop');
-		}
-	},
-	mounted() {
-	},
-	methods: {
-		doShow() {
-			this.dialogShow = true;
-		},
-		doClose() {
-			this.loading = false;
-			this.dialogShow = false;
-		},
-		handleCommit() {
-		}
-	}
+    name: 'QuickLoopsIncrease',
+    components: {
+    },
+    data() {
+        return {
+            dialogShow: false,
+            loading: false
+        };
+    },
+    computed: {
+        title() {
+            return this.$t('planMonitor.updateStation.quicklyAddLoop');
+        }
+    },
+    mounted() {
+    },
+    methods: {
+        doShow() {
+            this.dialogShow = true;
+        },
+        doClose() {
+            this.loading = false;
+            this.dialogShow = false;
+        },
+        handleCommit() {
+        }
+    }
 };
 </script>
 <style rel="stylesheet/scss" lang="scss" scoped>
diff --git a/src/views/planMonitor/editTool/menus/quickTaskIncrease.vue b/src/views/planMonitor/editTool/menus/quickTaskIncrease.vue
index 900be6f22..2b1c46ef8 100644
--- a/src/views/planMonitor/editTool/menus/quickTaskIncrease.vue
+++ b/src/views/planMonitor/editTool/menus/quickTaskIncrease.vue
@@ -11,8 +11,8 @@
     :close-on-click-modal="false"
   >
     <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-button @click="handleCommit">{{ $t('global.confirm') }}</el-button>
+      <el-button @click="doClose">{{ $t('global.cancel') }}</el-button>
     </el-row>
   </el-dialog>
 </template>
@@ -20,33 +20,33 @@
 <script>
 
 export default {
-	name: 'QuickTaskIncrease',
-	components: {
-	},
-	data() {
-		return {
-			dialogShow: false,
-			loading: false
-		};
-	},
-	computed: {
-		title() {
-			return this.$t('planMonitor.updateStation.quicklyAddTask');
-		}
-	},
-	mounted() {
-	},
-	methods: {
-		doShow() {
-			this.dialogShow = true;
-		},
-		doClose() {
-			this.loading = false;
-			this.dialogShow = false;
-		},
-		handleCommit() {
-		}
-	}
+    name: 'QuickTaskIncrease',
+    components: {
+    },
+    data() {
+        return {
+            dialogShow: false,
+            loading: false
+        };
+    },
+    computed: {
+        title() {
+            return this.$t('planMonitor.updateStation.quicklyAddTask');
+        }
+    },
+    mounted() {
+    },
+    methods: {
+        doShow() {
+            this.dialogShow = true;
+        },
+        doClose() {
+            this.loading = false;
+            this.dialogShow = false;
+        },
+        handleCommit() {
+        }
+    }
 };
 </script>
 <style rel="stylesheet/scss" lang="scss" scoped>
diff --git a/src/views/planMonitor/editTool/menus/routingSelection.vue b/src/views/planMonitor/editTool/menus/routingSelection.vue
index cc130af96..87c8e7e74 100644
--- a/src/views/planMonitor/editTool/menus/routingSelection.vue
+++ b/src/views/planMonitor/editTool/menus/routingSelection.vue
@@ -20,33 +20,33 @@
 <script>
 
 export default {
-	name: 'RoutingSelection',
-	components: {
-	},
-	data() {
-		return {
-			dialogShow: false,
-			loading: false
-		};
-	},
-	computed: {
-		title() {
-			return this.$t('planMonitor.updateStation.routeSelect');
-		}
-	},
-	mounted() {
-	},
-	methods: {
-		doShow() {
-			this.dialogShow = true;
-		},
-		doClose() {
-			this.loading = false;
-			this.dialogShow = false;
-		},
-		handleCommit() {
-		}
-	}
+    name: 'RoutingSelection',
+    components: {
+    },
+    data() {
+        return {
+            dialogShow: false,
+            loading: false
+        };
+    },
+    computed: {
+        title() {
+            return this.$t('planMonitor.updateStation.routeSelect');
+        }
+    },
+    mounted() {
+    },
+    methods: {
+        doShow() {
+            this.dialogShow = true;
+        },
+        doClose() {
+            this.loading = false;
+            this.dialogShow = false;
+        },
+        handleCommit() {
+        }
+    }
 };
 </script>
 <style rel="stylesheet/scss" lang="scss" scoped>
diff --git a/src/views/planMonitor/editTool/menus/selectDeleteRoute.vue b/src/views/planMonitor/editTool/menus/selectDeleteRoute.vue
index 7bcfa7a75..f54774653 100644
--- a/src/views/planMonitor/editTool/menus/selectDeleteRoute.vue
+++ b/src/views/planMonitor/editTool/menus/selectDeleteRoute.vue
@@ -11,8 +11,8 @@
     :close-on-click-modal="false"
   >
     <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-button @click="handleCommit">{{ $t('global.confirm') }}</el-button>
+      <el-button @click="doClose">{{ $t('global.cancel') }}</el-button>
     </el-row>
   </el-dialog>
 </template>
@@ -20,33 +20,33 @@
 <script>
 
 export default {
-	name: 'SelectDeleteRoute',
-	components: {
-	},
-	data() {
-		return {
-			dialogShow: false,
-			loading: false
-		};
-	},
-	computed: {
-		title() {
-			return this.$t('planMonitor.updateStation.selectDeleteRoute');
-		}
-	},
-	mounted() {
-	},
-	methods: {
-		doShow() {
-			this.dialogShow = true;
-		},
-		doClose() {
-			this.loading = false;
-			this.dialogShow = false;
-		},
-		handleCommit() {
-		}
-	}
+    name: 'SelectDeleteRoute',
+    components: {
+    },
+    data() {
+        return {
+            dialogShow: false,
+            loading: false
+        };
+    },
+    computed: {
+        title() {
+            return this.$t('planMonitor.updateStation.selectDeleteRoute');
+        }
+    },
+    mounted() {
+    },
+    methods: {
+        doShow() {
+            this.dialogShow = true;
+        },
+        doClose() {
+            this.loading = false;
+            this.dialogShow = false;
+        },
+        handleCommit() {
+        }
+    }
 };
 </script>
 <style rel="stylesheet/scss" lang="scss" scoped>
diff --git a/src/views/planMonitor/editTool/menus/selectPrintArea.vue b/src/views/planMonitor/editTool/menus/selectPrintArea.vue
index 054d90be6..70a08fd5e 100644
--- a/src/views/planMonitor/editTool/menus/selectPrintArea.vue
+++ b/src/views/planMonitor/editTool/menus/selectPrintArea.vue
@@ -11,8 +11,8 @@
     :close-on-click-modal="false"
   >
     <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-button @click="handleCommit">{{ $t('global.confirm') }}</el-button>
+      <el-button @click="doClose">{{ $t('global.cancel') }}</el-button>
     </el-row>
   </el-dialog>
 </template>
@@ -20,33 +20,33 @@
 <script>
 
 export default {
-	name: 'SelectPrintArea',
-	components: {
-	},
-	data() {
-		return {
-			dialogShow: false,
-			loading: false
-		};
-	},
-	computed: {
-		title() {
-			return this.$t('planMonitor.updateStation.selectPrintArea');
-		}
-	},
-	mounted() {
-	},
-	methods: {
-		doShow() {
-			this.dialogShow = true;
-		},
-		doClose() {
-			this.loading = false;
-			this.dialogShow = false;
-		},
-		handleCommit() {
-		}
-	}
+    name: 'SelectPrintArea',
+    components: {
+    },
+    data() {
+        return {
+            dialogShow: false,
+            loading: false
+        };
+    },
+    computed: {
+        title() {
+            return this.$t('planMonitor.updateStation.selectPrintArea');
+        }
+    },
+    mounted() {
+    },
+    methods: {
+        doShow() {
+            this.dialogShow = true;
+        },
+        doClose() {
+            this.loading = false;
+            this.dialogShow = false;
+        },
+        handleCommit() {
+        }
+    }
 };
 </script>
 <style rel="stylesheet/scss" lang="scss" scoped>
diff --git a/src/views/planMonitor/editTool/menus/updateStationIntervalTime.vue b/src/views/planMonitor/editTool/menus/updateStationIntervalTime.vue
index 2d2d971b2..f0c3f258d 100644
--- a/src/views/planMonitor/editTool/menus/updateStationIntervalTime.vue
+++ b/src/views/planMonitor/editTool/menus/updateStationIntervalTime.vue
@@ -33,70 +33,70 @@
 
 <script>
 export default {
-	name: 'UpdateStationIntervalTime',
-	components: {
-	},
-	data() {
-		return {
-			dialogShow: false,
-			loading: false,
-			editModel: {},
-			runPlanLevelVO: {}
-		};
-	},
-	computed: {
-		title() {
-			return this.$t('planMonitor.updateStation.updateData');
-		},
-		rules() {
-			return {
-				level1: [
-					{ required: true, message: this.$t('planMonitor.updateStation.pleaseInputLevel1'), trigger: 'blur' }
-				],
-				level2: [
-					{ required: true, message: this.$t('planMonitor.updateStation.pleaseInputLevel2'), trigger: 'blur' }
-				],
-				level3: [
-					{ required: true, message: this.$t('planMonitor.updateStation.pleaseInputLevel3'), trigger: 'blur' }
-				],
-				level4: [
-					{ required: true, message: this.$t('planMonitor.updateStation.pleaseInputLevel4'), trigger: 'blur' }
-				],
-				level5: [
-					{ required: true, message: this.$t('planMonitor.updateStation.pleaseInputLevel5'), trigger: 'blur' }
-				]
-			};
-		}
-	},
-	mounted() {
-	},
-	methods: {
-		doShow(params) {
-			this.editModel = params || {};
-			this.runPlanLevelVO = Object.assign({}, this.editModel.runPlanLevelVO || {});
-			this.dialogShow = true;
-		},
-		doClose() {
-			this.loading = false;
-			this.dialogShow = false;
-		},
-		handleCommit() {
-			this.$refs['form'].validate((valid) => {
-				if (valid) {
-					const model = {
-						level1: this.runPlanLevelVO.level1,
-						level2: this.runPlanLevelVO.level2,
-						level3: this.runPlanLevelVO.level3,
-						level4: this.runPlanLevelVO.level4,
-						level5: this.runPlanLevelVO.level5,
-						stationRunningId: this.runPlanLevelVO.stationRunningId
-					};
-					this.$emit('handleConfirm', model);
-					this.doClose();
-				}
-			});
-		}
-	}
+    name: 'UpdateStationIntervalTime',
+    components: {
+    },
+    data() {
+        return {
+            dialogShow: false,
+            loading: false,
+            editModel: {},
+            runPlanLevelVO: {}
+        };
+    },
+    computed: {
+        title() {
+            return this.$t('planMonitor.updateStation.updateData');
+        },
+        rules() {
+            return {
+                level1: [
+                    { required: true, message: this.$t('planMonitor.updateStation.pleaseInputLevel1'), trigger: 'blur' }
+                ],
+                level2: [
+                    { required: true, message: this.$t('planMonitor.updateStation.pleaseInputLevel2'), trigger: 'blur' }
+                ],
+                level3: [
+                    { required: true, message: this.$t('planMonitor.updateStation.pleaseInputLevel3'), trigger: 'blur' }
+                ],
+                level4: [
+                    { required: true, message: this.$t('planMonitor.updateStation.pleaseInputLevel4'), trigger: 'blur' }
+                ],
+                level5: [
+                    { required: true, message: this.$t('planMonitor.updateStation.pleaseInputLevel5'), trigger: 'blur' }
+                ]
+            };
+        }
+    },
+    mounted() {
+    },
+    methods: {
+        doShow(params) {
+            this.editModel = params || {};
+            this.runPlanLevelVO = Object.assign({}, this.editModel.runPlanLevelVO || {});
+            this.dialogShow = true;
+        },
+        doClose() {
+            this.loading = false;
+            this.dialogShow = false;
+        },
+        handleCommit() {
+            this.$refs['form'].validate((valid) => {
+                if (valid) {
+                    const model = {
+                        level1: this.runPlanLevelVO.level1,
+                        level2: this.runPlanLevelVO.level2,
+                        level3: this.runPlanLevelVO.level3,
+                        level4: this.runPlanLevelVO.level4,
+                        level5: this.runPlanLevelVO.level5,
+                        stationRunningId: this.runPlanLevelVO.stationRunningId
+                    };
+                    this.$emit('handleConfirm', model);
+                    this.doClose();
+                }
+            });
+        }
+    }
 };
 </script>
 <style rel="stylesheet/scss" lang="scss" scoped>
diff --git a/src/views/planMonitor/editTool/schedule.vue b/src/views/planMonitor/editTool/schedule.vue
index 04761d1ea..f23d41005 100644
--- a/src/views/planMonitor/editTool/schedule.vue
+++ b/src/views/planMonitor/editTool/schedule.vue
@@ -12,15 +12,18 @@
       />
       <data-table
         ref="tripTable"
+        style="margin-top: 3px;"
         class="data_table_box"
         :config="tripNumberConfig"
         @touch="trainNumTouch"
       />
     </div>
+    <modify-service ref="modifyService" />
   </div>
 </template>
 
 <script>
+import ModifyService from './menus/modifyService';
 import { mapGetters } from 'vuex';
 import { timeFormat } from '@/utils/date';
 import { getStationList, queryRunPlan } from '@/api/runplan';
@@ -34,7 +37,8 @@ import echarts from 'echarts';
 export default {
     name: 'PlanSchedule',
     components: {
-        DataTable
+        DataTable,
+        ModifyService
     },
     props: {
         planConvert: {
@@ -76,6 +80,8 @@ export default {
                 showHeader: false,
                 highlightCurrentRow: true,
                 handleChange: this.serviceNumberChange,
+                handleModify:this.serviceNumberModify,
+                handleTips:'单击数字选择表号，双击数字修改表号,<br/>有车次信息变动 车次号会重新自动排列',
                 showClose: false,
                 columns: [
                     {
@@ -90,6 +96,8 @@ export default {
                 showHeader: false,
                 highlightCurrentRow: true,
                 handleChange: this.tripNumberChange,
+                handleModify:this.tripNumberModify,
+                handleTips:'单击数字选择车次号，双击数字修改车次号,<br/>有车次信息变动 车次号会重新自动排列',
                 showClose: false,
                 columns: [
                     {
@@ -265,6 +273,16 @@ export default {
         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 = {};
@@ -335,7 +353,7 @@ export default {
         },
         async analyticalServiceNumber(data) {
             this.serviceNumberConfig.data = Object.keys(data || {})
-                .sort((a, b) => { return data[a].oldIndex - data[b].oldIndex; })
+                .sort((a, b) => { return parseInt(data[a].serviceNumber) - parseInt(data[b].serviceNumber); })
                 .map(serviceNumber => { return { serviceNumber }; });
         },
         async analyticalTripNumber(data) {
diff --git a/src/views/planMonitor/editTool/userindex.vue b/src/views/planMonitor/editTool/userindex.vue
deleted file mode 100644
index 1fd5355bc..000000000
--- a/src/views/planMonitor/editTool/userindex.vue
+++ /dev/null
@@ -1,485 +0,0 @@
-<template>
-  <div class="plan-tool" style="width: 100%; height: 100%;">
-    <menu-bar ref="menuBar" :plan-convert="PlanConvert" @dispatchDialog="dispatchDialog" />
-    <schedule
-      ref="schedule"
-      :line-code="lineCode"
-      :plan-convert="PlanConvert"
-      :max-height="height"
-      :max-width="width"
-    />
-    <status-bar ref="statusBar" @dispatchDialog="dispatchDialog" @showTrain="showTrain" />
-
-    <!-- <open-run-plan ref="openRunPlan" :skin-code="skinCode" @dispatchDialog="dispatchDialog" /> -->
-    <!-- <create-empty-plan ref="createEmptyPlan" :plan-convert="PlanConvert" @dispatchOperate="dispatchOperate" @dispatchDialog="dispatchDialog" /> -->
-    <parameter ref="parameter" />
-    <off-line ref="offLine" @handleConfirm="handleConfirm" @dispatchDialog="dispatchDialog" />
-    <!-- <add-planning-train ref="addPlanningTrain" @dispatchDialog="dispatchDialog" /> -->
-    <!-- <edit-planning-train
-      ref="editPlanningTrain"
-      @dispatchDialog="dispatchDialog"
-      @dispatchOperate="dispatchOperate"
-    /> -->
-    <!-- <edit-smooth-run-time ref="editSmoothRunTime" @dispatchDialog="dispatchDialog" /> -->
-    <!-- <add-smooth-run-time ref="addSmoothRunTime" @dispatchDialog="dispatchDialog" /> -->
-    <duplicate-train ref="duplicateTrain" @dispatchDialog="dispatchDialog" @dispatchOperate="dispatchOperate" />
-    <!-- <modifying-routing ref="modifyingRouting" @dispatchDialog="dispatchDialog" /> -->
-    <!-- <modifying-begin-time ref="modifyingBeginTime" /> -->
-
-    <systerm-out ref="systermOut" />
-    <!-- <add-task ref="addTask" @dispatchOperate="dispatchOperate" /> -->
-    <!-- <delete-task ref="deleteTask" @dispatchOperate="dispatchOperate" /> -->
-    <!-- <modifying-task ref="modifyingTask" @dispatchOperate="dispatchOperate" /> -->
-
-    <!-- <edit-station-between-time ref="editStationBetweenTime" /> -->
-
-    <!-- <modifying-station-interval-time ref="modifyingStationIntervalTime" /> -->
-  </div>
-</template>
-
-<script>
-// import TitleBar from './titleBar';
-import MenuBar from './menuBar';
-import StatusBar from './statusBar';
-import Schedule from './schedule';
-// import OpenRunPlan from './menus/openRunPlan';
-// import CreateEmptyPlan from './menus/createEmptyPlan';
-import Parameter from './menus/parameter/index';
-import OffLine from './menus/offLine';
-// import AddPlanningTrain from './menus/addPlanningTrain';
-// import EditPlanningTrain from './menus/editPlanningTrain';
-import DuplicateTrain from './menus/duplicateTrain';
-import SystermOut from './menus/systermOut';
-// import AddTask from './menus/addTask';
-// import DeleteTask from './menus/deleteTask';
-// import ModifyingTask from './menus/modifyingTask';
-// import ModifyingRouting from './menus/modifyingRouting';
-// import ModifyingBeginTime from './menus/modifyingBeginTime';
-// import EditStationBetweenTime from './menus/editStationBetweenTime';
-// import AddSmoothRunTime from './menus/addSmoothRunTime';
-// import EditSmoothRunTime from './menus/editSmoothRunTime';
-// import ModifyingStationIntervalTime from './menus/modifyingStationIntervalTime';
-import { deletePlanService } from '@/api/runplan';
-
-export default {
-    name: 'Menus',
-    components: {
-        MenuBar,
-        StatusBar,
-        Schedule,
-        // OpenRunPlan,
-        // CreateEmptyPlan,
-        Parameter,
-        OffLine,
-        // AddPlanningTrain,
-        // EditPlanningTrain,
-        DuplicateTrain,
-        SystermOut
-        // AddTask,
-        // DeleteTask,
-        // ModifyingTask,
-        // ModifyingRouting,
-        // ModifyingBeginTime,
-        // EditStationBetweenTime,
-        // AddSmoothRunTime,
-        // EditSmoothRunTime,
-        // ModifyingStationIntervalTime
-    },
-    data() {
-        return {
-            PlanConvert: {}
-        };
-    },
-    computed: {
-        lineCode() {
-            return this.$route.query.lineCode || '02';
-        },
-        width() {
-            return this.$store.state.app.width;
-        },
-        height() {
-            return this.$store.state.app.height;
-        }
-    },
-    created() {
-        this.PlanConvert = this.$theme.loadPlanConvert(this.lineCode);
-    },
-    methods: {
-        setPosition() {
-            this.$nextTick(() => {
-                this.$refs.schedule.setPosition();
-            });
-        },
-        dispatchDialog(dialogObj) {
-            this.$nextTick(() => {
-                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.$route.query.planId,
-                    serviceNumber: params.serviceNumber
-                };
-                deletePlanService(model).then(resp => {
-                    this.$message.success(this.$t('tip.deletePlanSuccessfully'));
-                    this.$store.dispatch('runPlan/setSelected', {});
-                    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();
-            }
-        }
-    }
-};
-</script>
-
-<style>
-    .plan-tool {
-        position: absolute;
-    }
-
-    .plan-tool .pop-menu {
-        background: #F0F0F0;
-    }
-
-    .plan-tool .pop-menu span {
-        color: #000;
-    }
-
-    .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;
-    }
-
-    /* .planEdit__tool .el-dialog {
-        overflow: hidden !important;
-        background: rgba(202, 221, 253, 0.88);;
-        box-shadow: 1px hsla(240, 0%, 100%, 0.5) inset;
-        border: 2px solid #727375;
-        border-radius: 4px;
-        color: #000;
-        font-size: 14px;
-    }
-
-    .planEdit__tool .el-dialog .el-dialog__header {
-        height: 30px;
-        padding: 5px;
-    }
-
-    .planEdit__tool .el-dialog .el-dialog__footer {
-        background: #ECE9D8;
-        opacity: 1;
-    }
-
-    .planEdit__tool .el-dialog .el-dialog__body {
-        padding-top: 10px;
-        padding-bottom: 10px;
-        padding-left: 5px;
-        padding-right: 5px;
-        margin: 0px 3px 3px 3px;
-        border: 2px solid rgba(120, 121, 123, 0.5);
-        box-shadow: 1px hsla(240, 0%, 100%, 0.5) inset;
-        color: #000;
-        background: #ECE9D8;
-        opacity: 1;
-    }
-
-    .planEdit__tool .el-dialog .el-dialog__title {
-        font-size: 16px;
-    }
-
-    .planEdit__tool .el-dialog .el-dialog__headerbtn {
-        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;
-        top: 0px;
-        right: 3px;
-        line-height: 26px;
-        width: 26px;
-    }
-
-    .planEdit__tool .el-dialog .el-dialog__headerbtn .el-icon-close:before {
-        font-size: 16px;
-    }
-
-    .planEdit__tool .el-dialog .el-dialog__headerbtn .el-dialog__close {
-        color: #fff;
-    }
-
-    .planEdit__tool .el-dialog .el-tabs--top {
-        border: 2px outset #FEFEFD;
-        border-radius: 4px;
-    }
-
-    .planEdit__tool .el-dialog .el-tabs__item {
-        height: 30px;
-        line-height: 30px;
-        text-align: center;
-        color: #000 !important;
-        border-right: 2px outset #fff;
-        padding-left: 10px !important;
-        padding-right: 10px !important;
-    }
-
-    .planEdit__tool .el-dialog .el-tab-pane {
-        margin: 10px !important;
-    }
-
-    .planEdit__tool .el-dialog .el-tabs--card>.el-tabs__header .el-tabs__item.is-active {
-        border-bottom: none
-    }
-
-    .planEdit__tool .el-dialog .el-tabs--card>.el-tabs__header .el-tabs__item:not(.is-active) {
-        border-bottom: 2px inset #fff
-    }
-
-    .planEdit__tool .el-dialog .el-form {
-        background: #ECE9D8 !important;
-    }
-
-    .planEdit__tool .el-dialog .el-card {
-        background: #ECE9D8 !important;
-    }
-
-    .planEdit__tool .el-dialog .el-button {
-        height: 32px;
-        line-height: 32px;
-        padding: 0px;
-        width: 80px;
-        border: 2px outset #E2E2E2;
-        border-radius: 0px !important;
-        color: #000;
-        background: #ECE9D8;
-    }
-
-    .planEdit__tool .el-dialog .expand {
-        width: 120px;
-    }
-
-    .planEdit__tool .el-dialog .el-button:focus span {
-        border: 1px dashed gray;
-    }
-
-    .planEdit__tool .el-dialog .el-button:active {
-        border: 2px inset #E2E2E2;
-    }
-
-    .planEdit__tool .el-dialog .el-button:disabled {
-        border: 2px inset #E2E2E2;
-    }
-
-    .planEdit__tool .el-dialog .el-button:disabled span {
-        border: 0px;
-    }
-
-    .planEdit__tool .el-dialog .button-group {
-        margin-top: 10px;
-    }
-
-    .planEdit__tool .el-dialog .el-input {
-        border: 2px inset #E9E9E9;
-    }
-
-    .planEdit__tool .el-dialog .el-input .el-input__inner {
-        color: #000;
-        background: #fff !important;
-        border: 0px;
-        border-radius: 0px !important;
-        box-sizing: border-box;
-    }
-
-    .planEdit__tool .el-dialog .el-input.is-disabled .el-input__inner {
-        background: #F0F0F0 !important;
-    }
-
-    .planEdit__tool .el-dialog .el-textarea {
-        border: 2px inset #E9E9E9;
-        border-radius: 0px;
-    }
-
-    .planEdit__tool .el-dialog .el-textarea .el-textarea__inner {
-        color: #000;
-        background: #fff !important;
-        border: 0px;
-        border-radius: 0px !important;
-        box-sizing: border-box;
-    }
-
-    .planEdit__tool .el-dialog .el-textarea.is-disabled .el-textarea__inner {
-        background: #F0F0F0 !important;
-    }
-
-    .planEdit__tool .el-dialog .el-table {
-        border: 2px inset #E9E9E9;
-        color: #000 !important;
-    }
-
-    .planEdit__tool .el-dialog .el-table .cell {
-        line-height: unset !important;
-    }
-
-    .planEdit__tool .el-dialog .el-table th.is-leaf {
-        background: #ECE9D8 !important;
-        border-right: 1px solid #BDBDBD !important;
-        border-bottom: 1px solid #BDBDBD !important;
-        color: #000 !important;
-        height: 20px !important;
-        padding: 0px;
-    }
-
-    .planEdit__tool .el-dialog .el-table tr td {
-        height: 20px !important;
-        padding: 0px;
-    }
-
-    .planEdit__tool .el-dialog .el-table .el-table__empty-text {
-        top: 15px !important;
-    }
-
-    .planEdit__tool .el-dialog .current-row>td {
-        background: #316AC5 !important;
-        color: #fff !important;
-    }
-
-    .planEdit__tool .el-dialog .el-checkbox__inner {
-        border: 1px inset #dcdfe6 !important;
-    }
-
-    .planEdit__tool .el-dialog .el-checkbox__label {
-        color: #000 !important;
-    }
-
-    .planEdit__tool .el-dialog .el-checkbox.is-disabled .el-checkbox__inner {
-        background: #E6E6E6 !important;
-    }
-
-    .planEdit__tool .el-dialog .el-checkbox.is-disabled .el-checkbox__label {
-        color: #C5C9CC !important;
-    }
-
-    .planEdit__tool .el-dialog .el-checkbox__input.is-checked .el-checkbox__inner {
-        background: #fff !important;
-        border: 1px inset #dcdfe6 !important;
-    }
-
-    .planEdit__tool .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;
-    }
-
-    .planEdit__tool .el-dialog .el-radio__inner {
-        border: 1px inset #dcdfe6 !important;
-    }
-
-    .planEdit__tool .el-dialog .el-radio__label {
-        color: #000 !important;
-    }
-
-    .planEdit__tool .el-dialog .el-radio__input.is-checked .el-radio__inner {
-        background: #fff !important;
-        border: 1px inset #dcdfe6 !important;
-    }
-
-    .planEdit__tool .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%;
-    }
-
-    .planEdit__tool .el-dialog .el-radio.is-disabled .el-radio__inner {
-        background: #E6E6E6 !important;
-    }
-
-    .planEdit__tool .el-dialog .el-radio.is-disabled .el-radio__label {
-        color: #C5C9CC !important;
-    }
-
-    .planEdit__tool .el-dialog .base-label {
-        background: rgba(0, 0, 0, x);
-        position: relative;
-        left: -15px;
-        top: -18px;
-    }
-
-    .planEdit__tool .el-dialog .el-form-item label {
-        font-weight: normal !important;
-        color: #000 !important;
-    }
-
-    .planEdit__tool .el-dialog .context {
-        height: 100px;
-        border: 2px inset #E2E2E2;
-        overflow-y: scroll;
-    }
-
-    .planEdit__tool .el-dialog .table {
-        margin-top: 10px;
-    }
-
-    .planEdit__tool .el-dialog .notice {
-        margin-left: 62px;
-        line-height: 30px;
-    }
-
-    .planEdit__tool .el-dialog .button-group {
-        margin-top: 10px;
-    }
-
-    .planEdit__tool .el-dialog .el-tree__empty-block {
-        background: #E9E9E9 !important;
-        color: #000 !important;
-    } */
-</style>
diff --git a/src/views/planMonitor/editToolAUS/components/drawer.vue b/src/views/planMonitor/editToolAUS/components/drawer.vue
new file mode 100644
index 000000000..2aa0e4195
--- /dev/null
+++ b/src/views/planMonitor/editToolAUS/components/drawer.vue
@@ -0,0 +1,146 @@
+<template>
+	<div class="drawer" :class="{visible}" tabindex="-1">
+		<div class="drawer__wrapper" @click.self="doClose">
+			<div class="layer" :class="[direction]" :style="{width: width+'px'}">
+				<div class="title">
+					<span>
+						<slot name="title" />
+					</span>
+					<i class="el-icon-close" @click.stop="doClose" />
+				</div>
+				<div class="container">
+					<slot />
+				</div>
+			</div>
+		</div>
+	</div>
+</template>
+<script>
+export default {
+	props: {
+		direction: {
+			type: String,
+			default: 'ltr'
+		},
+		title: {
+			type: String,
+			default: ''
+		},
+		width: {
+			type: Number,
+			default: 360
+		},
+		visible: {
+			type: Boolean,
+			default: false
+		}
+	},
+	data() {
+		return {
+
+		}
+	},
+	methods: {
+		doClose() {
+			this.$emit('before-close');
+		}
+	}
+}
+</script>
+<style lang="scss" scoped>
+	.visible {
+		visibility: visible !important;
+		.layer {
+			transform: translateX(0) !important;
+		}
+	}
+
+	.ltr {
+		transition: all .3s cubic-bezier(.7, .3, .1, 1);
+		position: absolute;
+		height: 100%;
+		top: 0;
+		left: 0;
+		transform: translateX(-100%);
+	}
+
+	.rtl {
+		transition: all .3s cubic-bezier(.7, .3, .1, 1);
+		position: absolute;
+		height: 100%;
+		top: 0;
+		right: 0;
+		transform: translateX(100%);
+	}
+
+	.drawer {
+		position: fixed;
+		z-index: 2001;
+		top: 0;
+		right: 0;
+		bottom: 0;
+		left: 0;
+		overflow: hidden;
+		margin: 0;
+		visibility: hidden;
+
+		&__wrapper {
+			position: absolute;
+			left: 0;
+			right: 0;
+			top: 0;
+			bottom: 0;
+			height: 100%;
+			width: 100%;
+			background: rgba(0,0,0,0.5);
+
+			.layer {
+				background: #fff;
+				border: 1px solid #eee;
+				box-shadow: 0 8px 10px -5px rgba(0,0,0,.2), 0 16px 24px 2px rgba(0,0,0,.14), 0 6px 30px 5px rgba(0,0,0,.12);
+				overflow: hidden;
+
+				.title {
+					display: flex;
+					justify-content: space-between;
+					align-items: center;
+					font-size: 18px;
+					width: 100%;
+					padding: 0 10px;
+					height: 40px;
+					background: rgba(240,240, 240, 0.4);
+
+					i {
+						cursor: pointer;
+						padding: 3px;
+					}
+				}
+
+				.container {
+					overflow-y: auto;
+					width: 100%;
+					height: calc(100% - 40px);
+
+					&::-webkit-scrollbar {
+						width: 5px;
+						height: 5px;
+					}
+					&::-webkit-scrollbar-track {
+						background: rgb(239, 239, 239);
+						border-radius: 2px;
+					}
+					&::-webkit-scrollbar-thumb {
+						background: #bfbfbf;
+						border-radius: 10px;
+					}
+					&::-webkit-scrollbar-thumb:hover {
+						background: #666;
+					}
+					&::-webkit-scrollbar-corner {
+						background: #fff;
+					}
+				}
+			}
+		}
+	}
+</style>
diff --git a/src/views/planMonitor/editToolAUS/index.vue b/src/views/planMonitor/editToolAUS/index.vue
deleted file mode 100644
index c4f5b36e5..000000000
--- a/src/views/planMonitor/editToolAUS/index.vue
+++ /dev/null
@@ -1,99 +0,0 @@
-<template>
-  <div class="plan-tool">
-    <schedule
-      ref="schedule"
-      :line-code="lineCode"
-      :plan-convert="PlanConvert"
-      :max-height="height"
-      :max-width="width"
-    />
-  </div>
-</template>
-
-<script>
-import Schedule from './schedule';
-
-export default {
-    components: {
-		Schedule
-    },
-    data() {
-        return {
-            PlanConvert: {}
-        };
-    },
-    computed: {
-        lineCode() {
-            return '00';
-        },
-        width() {
-            return this.$store.state.app.width - 2;
-        },
-        height() {
-            return this.$store.state.app.height - 72;
-        }
-    },
-    created() {
-        this.PlanConvert = this.$theme.loadPlanConvert(this.lineCode);
-    },
-    methods: {
-        setPosition() {
-            this.$nextTick(() => {
-                this.$refs.schedule.setPosition();
-            });
-		},
-        dispatchDialog(dialogObj) {
-            this.$nextTick(() => {
-                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);
-                }
-            });
-		}
-    }
-};
-</script>
-
-<style>
-    .plan-tool {
-        position: absolute;
-    }
-
-    .plan-tool .pop-menu {
-        background: #F0F0F0;
-    }
-
-    .plan-tool .pop-menu span {
-        color: #000;
-    }
-
-    .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/planMonitor/editToolAUS/line/index.vue b/src/views/planMonitor/editToolAUS/line/index.vue
new file mode 100644
index 000000000..b055adfee
--- /dev/null
+++ b/src/views/planMonitor/editToolAUS/line/index.vue
@@ -0,0 +1,173 @@
+<template>
+	<div class="line">
+		<el-menu class="menus" default-active="2-1" :collapse="true">
+			<el-submenu index="2">
+				<template slot="title">
+					<i class="el-icon-document" />
+				</template>
+				<el-menu-item-group>
+					<span slot="title">线路列表</span>
+					<el-tree :data="lineList" :props="defaultProps" @node-click="onSelectLine">
+						<template slot-scope="{data}">
+							<span class="flex" style="padding-right: 20px">
+								<span><i class="el-icon-document"/>&ensp;{{data.name}}</span>
+							</span>
+						</template>
+					</el-tree>
+				</el-menu-item-group>
+			</el-submenu>
+		</el-menu>
+		<div class="container">
+			<el-card class="card" shadow="never">
+				<div slot="header" class="clearfix">
+					<span>{{ title||'请选择线路' }}</span>
+				</div>
+				<stations :list="stationList" @select="onSelectStation">
+					<template slot-scope="{data}">
+						<div class="line">公里标：{{data.kmRange}}m</div>
+						<div class="line">中转站：{{data.transferable? '是': '否'}}</div>
+						<div class="line">上行容量：{{data.upReception}}</div>
+						<div class="line">下行容量：{{data.downReception}}</div>
+					</template>
+				</stations>
+			</el-card>
+		</div>
+		<modify ref="modfiy" @update="onUpdateStation" />
+	</div>
+</template>
+
+<script>
+import Drawer from '../components/drawer.vue';
+import Stations from './stations';
+import Modify from './modify';
+import { listLines, listStations, updateStation } from '@/api/rpTools';
+
+export default {
+	components: {
+		Drawer,
+		Stations,
+		Modify
+	},
+	data() {
+		return {
+			defaultProps: {
+				children: 'children',
+				label: 'name'
+			},
+			lineList: [],
+			stationList: []
+		}
+	},
+	computed: {
+		lineId() {
+			return this.$route.query.lineId;
+		},
+		title() {
+			return this.$route.query.title;
+		}
+	},
+	watch: {
+		$route: function() {
+			this.refreshStationList();
+		}
+	},
+	mounted() {
+		this.loadInitData();
+		this.refreshStationList();
+	},
+	methods: {
+		loadInitData() {
+			listLines().then(resp => {
+				this.lineList = resp.data;
+			}).catch(error => {
+				console.error(error);
+				this.$message.info(error.message);
+			})
+		},
+		refreshStationList() {
+			if (this.lineId) {
+				listStations(this.lineId).then(resp => {
+					this.stationList = resp.data;
+				}).catch(error => {
+					console.error(error);
+					this.$message.info(error.message);
+				})
+			}
+		},
+		onSelectLine(el) {
+			this.$router.replace({ path: 'AUSline', query: { lineId: el.id, title: el.name }});
+		},
+		onSelectStation(el) {
+			this.$refs.modfiy.doShow(el);
+		},
+		onUpdateStation(el) {
+			updateStation(el.id, el).then(resp => {
+				this.refreshStationList();
+				this.$message.success('修改成功。')
+			}).catch(error => {
+				console.error(error);
+				this.$message.info(error.message);
+			})
+		}
+	}
+}
+</script>
+
+<style lang="scss" scoped>
+	.line {
+		width: 100%;
+		height: 100%;
+		display: flex;
+		justify-content: space-between;
+
+		.menus {
+			height: 100%;
+		}
+
+		.container {
+			flex: 1;
+			.card {
+				width: 60%;
+				margin: auto;
+				height: calc(100% - 10px);
+				/deep/ {
+					.el-card__body {
+						height: calc(100% - 50px);
+						overflow-y: auto;
+
+						&::-webkit-scrollbar {
+							width: 5px;
+							height: 5px;
+						}
+						&::-webkit-scrollbar-track {
+							background: rgb(239, 239, 239);
+							border-radius: 2px;
+						}
+						&::-webkit-scrollbar-thumb {
+							background: #bfbfbf;
+							border-radius: 10px;
+						}
+						&::-webkit-scrollbar-thumb:hover {
+							background: #666;
+						}
+						&::-webkit-scrollbar-corner {
+							background: #fff;
+						}
+					}
+				}
+
+				.line {
+					line-height: 28px;
+					height: 28px;
+				}
+			}
+		}
+	}
+
+	.flex {
+		width: 100%;
+		display: flex;
+		justify-content: space-between;
+		align-items: center;
+	}
+</style>
diff --git a/src/views/planMonitor/editToolAUS/line/modify.vue b/src/views/planMonitor/editToolAUS/line/modify.vue
new file mode 100644
index 000000000..08020c0cf
--- /dev/null
+++ b/src/views/planMonitor/editToolAUS/line/modify.vue
@@ -0,0 +1,116 @@
+<template>
+	<drawer :visible.sync="drawer" direction="rtl" :width="600" @before-close="e => drawer=false">
+		<template slot="title">修改车站信息</template>
+		<div class="container" v-if="model">
+			<el-form class="form" :model="model" :rules="rules" ref="form" label-width="100px" >
+				<el-form-item label="车站名称" prop="name">
+					<el-input v-model="model.name"></el-input>
+				</el-form-item>
+				<el-form-item label="公里标" prop="kmRange">
+					<el-input-number v-model="model.kmRange" controls-position="right" :min="0" /><span>m</span>
+				</el-form-item>
+
+				<el-form-item label="中转站" prop="transferable">
+					<el-checkbox v-model="model.transferable" />
+				</el-form-item>
+				<el-form-item label="上行容量" prop="upReception">
+					<el-input-number v-model="model.upReception" controls-position="right" :min="1" />
+				</el-form-item>
+				<el-form-item label="上行容量" prop="downReception">
+					<el-input-number v-model="model.downReception" controls-position="right" :min="1" />
+				</el-form-item>
+			</el-form>
+			<div class="footer">
+				<el-button type="primary" @click="doSubmit('form')">更新</el-button>
+				<el-button @click="drawer=false">取消</el-button>
+			</div>
+		</div>
+	</drawer>
+</template>
+
+<script>
+import Drawer from '../components/drawer.vue';
+
+export default {
+	components: {
+		Drawer
+	},
+	data() {
+		return {
+			drawer: false,
+			model: {
+				id: '',
+				name: '',
+				kmRange: 0,
+				transferable: false,
+				upReception: 1,
+				downReception: 1
+			}
+		}
+	},
+	computed: {
+		rules() {
+			return {
+				name: [
+					{ required: true, message: '请输入车站名称', trigger: 'blur' }
+				],
+				kmRange: [
+            		{ required: true, type: 'number', min: 0,  message: '车站公里标不能小于0', trigger: 'blur' }
+				],
+				transferable: [
+					{ required: true, message: '请选择是否中转站', trigger: 'blur' },
+				],
+				upReception: [
+            		{ required: true, type: 'number', min: 1,  message: '请输入上行容量', trigger: 'blur' }
+				],
+				downReception: [
+            		{ required: true, type: 'number', min: 1,  message: '请输入下行容量', trigger: 'blur' }
+				]
+			}
+		}
+	},
+	methods: {
+		doShow(model) {
+			this.model = {
+				id: model.id,
+				name: model.name,
+				kmRange: model.kmRange,
+				transferable: model.transferable,
+				upReception: model.upReception,
+				downReception: model.downReception
+			};
+			this.drawer = true;
+		},
+		doClose() {
+			this.drawer = false;
+			this.model = null;
+		},
+		doSubmit(name) {
+			this.$refs[name].validate((valid) => {
+				if (valid) {
+					this.$emit('update', {...this.model});
+					this.drawer = false;
+				}
+			});
+		}
+	}
+}
+</script>
+
+<style lang="scss" scoped>
+	.container {
+		height: calc(100% - 20px);
+		.form {
+			padding: 30px;
+		}
+
+		.footer {
+			position: absolute;
+			bottom: 0;
+			width: 100%;
+			text-align: right;
+			padding: 5px 20px;
+			background: #f1f1f1;
+		}
+	}
+</style>
diff --git a/src/views/planMonitor/editToolAUS/line/stations.vue b/src/views/planMonitor/editToolAUS/line/stations.vue
new file mode 100644
index 000000000..044f3ff48
--- /dev/null
+++ b/src/views/planMonitor/editToolAUS/line/stations.vue
@@ -0,0 +1,52 @@
+<template>
+	<div class="container">
+		<template v-if="list.length" >
+			<el-card class="el" v-for="(el,i) in list" :key="i" shadow="hover">
+				<div slot="header" class="clearfix">
+					<span>{{el.name}}</span>
+				</div>
+				<div style="padding: 30px 80px">
+					<slot :data="el" />
+				</div>
+				<div class="clearfix" style="text-align:right">
+					<el-button type="text" @click.stop="onSelect(el)">编辑</el-button>
+				</div>
+			</el-card>
+		</template>
+		<template v-else>
+			<span>暂无数据</span>
+		</template>
+	</div>
+</template>
+
+<script>
+export default {
+	props: {
+		list: {
+			type: Array,
+			required: true
+		}
+	},
+	data() {
+		return {
+		}
+	},
+	methods: {
+		onSelect(el) {
+			this.$emit('select', el)
+		}
+	}
+}
+</script>
+
+<style lang="scss" scoped>
+	.container {
+		padding: 10px 50px;
+		.el {
+			padding: 30px 50px;
+			&:not(:last-child) {
+				margin-bottom: 10px;
+			}
+		}
+	}
+</style>
diff --git a/src/views/planMonitor/editToolAUS/monitor.js b/src/views/planMonitor/editToolAUS/monitor.js
deleted file mode 100644
index c37087877..000000000
--- a/src/views/planMonitor/editToolAUS/monitor.js
+++ /dev/null
@@ -1,360 +0,0 @@
-import echarts from 'echarts';
-import { DeviceMenu } from '@/scripts/ConstDic';
-import { timeFormat } from '@/utils/date';
-
-export default {
-	data() {
-		return {
-			createModel: {
-				endStationCode: '',
-				startStationCode: '',
-				startTime: ''
-			},
-			selected: null,
-			dragging: false
-		}
-	},
-	watch: {
-		myChart: function() {
-			this.listenersBind();
-		}
-	},
-	beforeDestroy() {
-		this.listenersOff();
-	},
-	methods: {
-		getStationByCoord1(stations, y) {
-			for(var i = stations.length-1; i >= 0; i--) {
-				const station = stations[i];
-				const edge = this.planConvert.EdgeHeight
-				const preKm = i == 0? edge*2: Math.abs(station.kmRange-stations[i-1].kmRange)/2;
-				const nxtKm = i == stations.length-1? edge: Math.abs(station.kmRange-stations[i+1].kmRange)/2;
-				const min = edge + station.kmRange - preKm;
-				const max = edge + station.kmRange + nxtKm;
-				if (y >= min && y <= max) {
-					return station;
-				}
-			}
-			return null;
-		},
-		getStationByCoord(stations, y) {
-			for(var i = stations.length-1; i >= 0; i--) {
-				const station = stations[i];
-				const edge = this.planConvert.EdgeHeight;
-				const rate = this.planConvert.CoordMultiple;
-
-				const preKm = i == 0? edge*2: rate/2;
-				const nxtKm = i == stations.length-1? edge: rate/2;
-				const min = edge + i*rate - preKm;
-				const max = edge + i*rate + nxtKm;
-
-				if (y >= min && y <= max) {
-					return station;
-				}
-			}
-			return null;
-		},
-		pixelExecCb(e, cb) {
-			const event = e.componentType ? e.event: e;
-			const myChart = this.myChart;
-			const pointInPixel = [event.offsetX, event.offsetY]
-			if (myChart.containPixel('grid', pointInPixel) && this.planConvert) {
-				const pointInGrid = myChart.convertFromPixel({seriesIndex:0},pointInPixel);
-				const xIndex = pointInGrid[0];
-				const yIndex = pointInGrid[1];
-				const option = myChart.getOption();
-				const minY = option.yAxis[0].min;
-				const xVal = option.xAxis[0].data[xIndex];
-				const yObj = this.getStationByCoord(this.stations, yIndex-minY);
-				if (yObj && cb) {
-					cb({yObj, xVal, pointInPixel, e});
-				}
-			}
-		},
-		listenersBind() {
-			if (this.myChart) {
-				const zr = 	this.myChart.getZr();
-
-				zr.on('click', this.onClick, this)
-				this.myChart.on('mousedown', this.onMouseDown);
-				this.myChart.on('mouseover', this.onMouseOver);
-				this.myChart.on('mouseup', this.onMouseUP);
-				this.myChart.on('datazoom', this.onUpdatePosition);
-				window.addEventListener('resize', this.onUpdatePosition);
-			}
-		},
-		listenersOff() {
-			if (this.myChart) {
-				const zr = this.myChart.getZr();
-
-				zr.off('click', this.onClick);
-				this.myChart.off('mousedown', this.onMouseDown);
-				this.myChart.off('mouseover', this.onMouseOver);
-				this.myChart.off('mouseup', this.onMouseUP);
-				this.myChart.off('datazoom', this.onUpdatePosition);
-				window.removeEventListener('resize', this.onUpdatePosition);
-			}
-		},
-		onUpdatePosition(e) {
-			const option = this.myChart.getOption();
-			const elements = option.graphic[0].elements
-			const graphic = echarts.util.map(elements, (item) => {
-				return { position: this.myChart.convertToPixel('grid', item.data) };
-			})
-			this.myChart.setOption({graphic});
-		},
-		onClick(e) {
-			switch(this.action) {
-				case 'Add':
-					this.pixelExecCb(e, this.handleCreateMark);
-					break;
-			}
-		},
-		onMouseDown(e) {
-			switch(this.action) {
-				case 'Edit':
-					this.pixelExecCb(e, this.handlePopDialog);
-					break;
-			}
-		},
-		onMouseOver(e) {
-			this.pixelExecCb(e, this.handleSelectLine);
-		},
-		onMouseUP(e) {
-			switch(this.action) {
-				case 'Translate':
-					if (this.dragging) {
-						this.dragging = false;
-						this.handleTranslate(this.createModel)
-					}
-				break;
-			}
-		},
-		onShapePointDragging(e) {
-			if (this.selected) {
-				this.dragging = true;
-
-				this.myChart.dispatchAction({
-					type: 'showTip',
-					seriesIndex: this.selected.seriesIndex,
-					dataIndex: this.selected.dataIndex
-				});
-
-				this.pixelExecCb(e, this.handleDragging);
-			}
-		},
-		setLineLight() {
-			if (this.selected) {
-				this.myChart.setOption({
-					series: {
-						name: this.selected.seriesName,
-						symbolSize: 10,
-						showAllSymbol: true,
-						lineStyle: {
-							width: 2,
-							color: 'red'
-						}
-					}
-				});
-			}
-		},
-		setLineReset() {
-			if (this.selected) {
-				this.myChart.setOption({
-					series: {
-						name: this.selected.seriesName,
-						symbolSize: 6,
-						showAllSymbol: 'auto',
-						lineStyle: {
-							width: 1,
-							color: '#000'
-						}
-					}
-				});
-			}
-		},
-		clearGraphic(labels) {
-			const option = this.myChart.getOption();
-			const elements = option.graphic[0].elements;
-			option.graphic[0].elements = elements.filter(el => { return !labels.includes(el.subType)});
-			this.myChart.setOption(option, {notMerge: true});
-		},
-		createDragGraphicObj(point) {
-			return {
-				type: 'circle',
-				subType: 'drag',
-				position: this.myChart.convertToPixel('grid', point),
-				data: [...point],
-				shape: {
-					cx: 0,
-					cy: 0,
-					r: 10
-				},
-				style: {
-					fill: 'rgba(0,0,0,0.0)'
-				},
-				draggable: 'horizontal',
-				ondrag: echarts.util.curry(this.onShapePointDragging),
-				z: 100
-			}
-		},
-		createMarkPointObj(point) {
-			return {
-				type: 'group',
-			 	subType: 'mark',
-				z: 100,
-				position: point,
-				point,
-				children: [
-					{
-						type: 'circle',
-						z: 100,
-						shape: {
-							cx: 0,
-							cy: 0,
-							r: 5
-						},
-						style: {
-							fill: 'rgba(0,0,0,0.3)'
-						}
-					},
-					{
-						type: 'circle',
-						z: 100,
-						shape: {
-							cx: 0,
-							cy: 0,
-							r: 10
-						},
-						style: {
-							fill: 'rgba(0,0,0,0.3)'
-						}
-					}
-				]
-			}
-		},
-		handlePopDialog({e, pointInPixel}) {
-			if (e.componentType == "series" &&
-				e.componentSubType == "line" &&
-				e.seriesName.includes('run-')) {
-				const value = e.value;
-				const point = {
-					x: pointInPixel[0],
-					y: pointInPixel[1]
-				}
-				const option = this.myChart.getOption();
-				const dataList = option.series[e.seriesIndex].data;
-				const length = dataList.length;
-				const nxt = dataList[e.dataIndex+1];
-				const pre = dataList[e.dataIndex-1];
-
-				this.selected =	{
-					dataIndex: e.dataIndex,
-					seriesIndex: e.seriesIndex,
-					seriesName: e.seriesName,
-					seriesId: e.seriesName.replace('run-', ''),
-					depTime: e.dataIndex < length - 1? nxt[0] - value[0]: 0,
-					runTime: e.dataIndex < length - 1? nxt[0] - value[0]: 0,
-					stationCode: value[2],
-					_x: value[0],
-					dx: 0,
-					time: 0
-				}
-
-				if (e.dataIndex == length - 1 ||
-					e.dataIndex < length - 1 && value[1] == nxt[1]) {
-					this.$store.dispatch('menuOperation/setPopMenu', { position: point, menu: DeviceMenu.planJustDeparture });
-				} else if (e.dataIndex == 0 ||
-					e.dataIndex > 0 && value[1] == pre[1]) {
-					this.$store.dispatch('menuOperation/setPopMenu', { position: point, menu: DeviceMenu.planJustArrival });
-				}
-			}
-		},
-		handleSelectLine({e}) {
-			if (e.componentType == "series" &&
-				e.componentSubType == "line" &&
-				e.seriesName.includes('run-')) {
-				const value = e.value;
-				const option = this.myChart.getOption();
-				const dataList = option.series[e.seriesIndex].data;
-				const length = dataList.length;
-				const nxt = dataList[e.dataIndex+1];
-				const pre = dataList[e.dataIndex-1];
-
-				if (this.selected &&
-					this.selected.seriesName != e.seriesName) {
-					this.setLineReset();
-				}
-
-				this.selected =	{
-					dataIndex: e.dataIndex,
-					seriesIndex: e.seriesIndex,
-					seriesName: e.seriesName,
-					seriesId: e.seriesName.replace('run-', ''),
-					depTime: e.dataIndex < length - 1? nxt[0] - value[0]: 0,
-					runTime: e.dataIndex < length - 1? nxt[0] - value[0]: 0,
-					stationCode: value[2],
-					_x: value[0],
-					dx: 0,
-					time: 0
-				}
-
-				this.setLineLight();
-
-				switch(this.action) {
-					case 'Translate':
-						this.handleCreateDrag({e})
-						break;
-				}
-			}
-		},
-		handleCreateDrag({e}) {
-			const option = this.myChart.getOption();
-			const filters = option.graphic[0].elements.filter(el => { return el.subType != 'drag'});
-
-			filters.push(this.createDragGraphicObj(e.value))
-			option.graphic[0].elements = filters;
-
-			this.myChart.setOption(option, {notMerge: true});
-		},
-		handleCreateMark({pointInPixel, yObj, xVal}) {
-			const myChart = this.myChart;
-			const option = this.myChart.getOption();
-			const graphic = option.graphic;
-			const elements = graphic[0].elements;
-
-			elements.push(this.createMarkPointObj(pointInPixel))
-
-			myChart.setOption(option, {notMerge: true});
-
-			const filters = elements.filter(el => { return el.subType == 'mark'});
-
-			if (filters.length == 1) {
-				this.createModel.startStationCode = yObj.code;
-				this.createModel.startTime = timeFormat(xVal);
-			} else if (filters.length >= 2) {
-				this.createModel.endStationCode = yObj.code;
-				this.handleCreate(this.createModel);
-			}
-		},
-		handleDragging({e, xVal}) {
-			this.selected.dx = xVal - this.selected._x;
-			this.selected.time +=  this.selected.dx;
-			this.selected._x = xVal;
-
-			const option = this.myChart.getOption();
-			const model = option.series[this.selected.seriesIndex]
-			if (model) {
-				model.data.forEach(el => {
-					el[0] += this.selected.dx;
-				});
-			}
-
-			if (e.target && e.target.position) {
-				e.target.data.x += this.selected.dx;
-			}
-
-			this.myChart.setOption(option, {notMerge: true});
-		}
-	}
-}
diff --git a/src/views/planMonitor/editToolAUS/schedule.vue b/src/views/planMonitor/editToolAUS/schedule.vue
deleted file mode 100644
index 6104f2357..000000000
--- a/src/views/planMonitor/editToolAUS/schedule.vue
+++ /dev/null
@@ -1,550 +0,0 @@
-<template>
-  <div id="PlanSchedule">
-	<el-card class="box-card">
-		<div slot="header" class="clearfix">
-			<div class="menus">
-				<span style="font-size:22px;padding:0 17px;">Plan</span>
-				<el-button-group v-model="active">
-					<el-button v-for="(el,i) in buttonList"
-						:type="active == i? 'primary':''"
-						:key="i" @click="handleBtnSelect(el,i)">{{el.name}}</el-button>
-				</el-button-group>
-				<el-button-group style="margin-left: 20px">
-					<el-button :type="selected?'danger':'info'" icon="el-icon-delete" @click="handleRemove" />
-				</el-button-group>
-			</div>
-		</div>
-		<div :id="runPlanId" />
-	</el-card>
-	<plan-just-running :selected="selected" @justRunning="handleJustRunning" />
-	<plan-just-stop :selected="selected" @justStop="handleJustStop"/>
-  </div>
-</template>
-
-<script>
-import echarts from 'echarts';
-import PlanJustRunning from './dialog/planJustRunning.vue';
-import PlanJustStop from './dialog/planJustStop.vue';
-import Monitor from './monitor.js';
-import { mapGetters } from 'vuex';
-import { timeFormat } from '@/utils/date';
-import { getStationList } from '@/api/runplan';
-import { getRpTools, addRpTrip, delRpTrip,  justTripNoRunning, justTripNoStop, translateTripNo} from '@/api/rpTools';
-import { getPublishMapInfo } from '@/api/jmap/map';
-
-export default {
-	components: {
-		PlanJustRunning,
-		PlanJustStop
-	},
-    props: {
-        planConvert: {
-            type: Object,
-            required: true
-        },
-        maxWidth: {
-            type: Number,
-            required: true
-        },
-        maxHeight: {
-            type: Number,
-            required: true
-        },
-        loadRunPlanId: {
-            type: String,
-            default() {
-                return '';
-            }
-        },
-        loadRunPlanName: {
-            type: String,
-            default() {
-                return '';
-            }
-        }
-	},
-	mixins: [Monitor],
-    data() {
-        return {
-            height: 0,
-            mapName: 'XXX',
-            runPlanId: 'plan-tool',
-            myChart: null,
-			kmRangeCoordMap: {},
-			stationsObj: {},
-			active: -1,
-			action: '',
-			buttonList: [
-				{
-					name: 'Add',
-					type: 'Add'
-				},
-				{
-					name: 'Translate',
-					type: 'Translate'
-				},
-				{
-					name: 'Edit',
-					type: 'Edit'
-				}
-			]
-        };
-    },
-    computed: {
-        ...mapGetters('rpTools', [
-            'stations'
-        ]),
-        planId() {
-            return this.$route.query.planId;
-		},
-		mapId() {
-			return 9;
-		},
-		option() {
-			return {
-                title: {
-                    text: '',
-                    left: 'center',
-                    top: '10px'
-                },
-                grid: {
-                    top: '60px',
-                    left: '160px',
-                    right: '100px',
-                    bottom: '80px',
-                    containLabel: true,
-                    backgroundColor: 'floralwhite'
-                },
-                toolbox: {
-                },
-                tooltip: {
-                    trigger: 'item',
-                    axisPointer: {
-                        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
-                            }
-                        },
-                        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
-                        }
-                    },
-                    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
-				},
-				graphic: [{
-					id: 'shape',
-					elements: []
-				}],
-                series: [],
-                dataZoom: [
-                    {
-						type: 'inside',
-						zoomOnMouseWheel : 'ctrl',
-						moveOnMouseMove : 'ctrl',
-						moveOnMouseWheel: 'ctrl'
-                    },
-                    {
-						type: 'slider',
-        			    filterMode: 'empty',
-                        bottom: '20px'
-                    }
-                ]
-			}
-		}
-    },
-    watch: {
-        maxWidth() {
-            this.setPosition();
-        },
-        maxHeight() {
-            this.setPosition();
-        },
-        '$store.state.rpTools.planSizeCount': function () {
-            this.reSize({ width: this.$store.state.rpTools.width, height: this.$store.state.rpTools.height });
-        },
-        '$store.state.rpTools.refreshCount': function() {
-            this.loadChartPage();
-        },
-        $route() {
-            this.$nextTick(() => {
-                this.loadChartPage();
-            });
-        },
-        loadRunPlanId() {
-            this.loadChartPage();
-        }
-    },
-    mounted() {
-        this.setPosition();
-        this.loadChartPage();
-    },
-    beforeDestroy() {
-        this.destroy();
-    },
-    methods: {
-        setPosition() {
-            this.$nextTick(() => {
-                const width = this.maxWidth;
-                const height = this.maxHeight;
-                this.$store.dispatch('rpTools/resize', { width, height });
-            });
-		},
-		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;
-                    }
-                    this.myChart = echarts.init(document.getElementById(this.runPlanId));
-					this.myChart.setOption(this.option, {notMerge: true});
-                    this.reSize({ width: this.$store.state.rpTools.width, height: this.$store.state.rpTools.height });
-                    resolve(true);
-                } catch (error) {
-                    reject(error);
-                }
-            });
-        },
-        async loadChartPage() {
-            try {
-                this.$store.dispatch('rpTools/clear').then(() => {
-                    this.loadInitChart().then(() => {
-                        if (this.mapId) {
-							getStationList(this.mapId).then(resp => {
-								const stations = resp.data.filter(el => {
-									return ['车辆段', '停车场'].findIndex(it => {
-										return el.name.includes(it)
-									}) < 0;
-								});
-
-								this.stationsObj = {};
-								stations.forEach(item => {
-									this.stationsObj[Math.floor(item.kmRange)] = item;
-								});
-
-								this.$store.dispatch('rpTools/setStations', stations).then(() => {
-									this.loadInitData();
-									this.myChart && this.myChart.showLoading();
-									getRpTools().then(rest => {
-										this.$store.dispatch('rpTools/setPlanData', rest.data).then(() => {
-											this.loadChartData();
-											this.myChart && this.myChart.hideLoading();
-										});
-									}).catch(() => {
-										this.myChart && this.myChart.hideLoading();
-										this.$messageBox(this.$t('error.obtainOperationGraphFailed'));
-									});
-								});
-							}).catch(() => {
-								this.$messageBox(this.$t('tip.requestingStationDataFailed'));
-								this.$store.dispatch('rpTools/setStations', []);
-							});
-                        }
-                    });
-                });
-            } catch (error) {
-                this.$messageBox(this.$t('error.loadingOperationGraphFailed'));
-            }
-        },
-		async loadInitData() {
-            await this.xAxisInit();
-            await this.yAxisInit();
-            await this.loadInitChart();
-        },
-		async loadChartData() {
-            try {
-				const stations = this.$store.state.rpTools.stations;
-				const planData = this.$store.state.rpTools.planData;
-				const option = this.myChart.getOption();
-
-				option.series = [];
-				option.graphic[0].elements = [];
-
-				this.kmRangeCoordMap = this.planConvert.convertStationsToMap(stations);
-				this.pushModels(option.series, [this.planConvert.initializeYaxis(this.stations)]);
-				this.pushModels(option.series, this.planConvert.convertDataToModels(planData, stations, this.kmRangeCoordMap, { width: 0.5, color: '#000' }));
-
-				this.myChart.setOption(option, {notMerge: true});
-            } catch (error) {
-                this.$messageBox(this.$t('error.loadingOperationGraphFailed') + this.$t('global.colon') + error.message);
-            }
-		},
-        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;
-		},
-		destroy() {
-            if (this.myChart && this.myChart.isDisposed) {
-				this.myChart.dispose();
-                this.myChart = null;
-            }
-		},
-        xAxisPointFormat(params) {
-            return timeFormat(params.value);
-        },
-        yAxisPointFormat(params) {
-            return this.planConvert.computedFormatYAxis(this.stations, params);
-        },
-        xAxisLableFormat(value, index) {
-            if (value % 60 === 0) {
-                return timeFormat(value);
-			}
-        },
-        yAxisLableFormat(value, index) {
-            return '';
-        },
-        xAxisInit() {
-            const list = [];
-            for (var time = 0 + this.planConvert.TranslationTime; time < 3600 * 24 + this.planConvert.TranslationTime; time++) {
-                list.push(time);
-            }
-
-            const startValue = 3600 * 6;
-            const offsetTime = 3600 / 6;
-
-            this.option.xAxis[0].data = list;
-            if (!this.option.dataZoom[0].startValue) {
-                this.option.dataZoom[0].startValue = this.option.dataZoom[1].startValue = startValue - offsetTime;
-            }
-
-            if (!this.option.dataZoom[0].endValue) {
-                this.option.dataZoom[0].endValue = this.option.dataZoom[1].endValue = startValue + offsetTime;
-            }
-        },
-        yAxisInit() {
-            if (Object.keys(this.planConvert).length) {
-                this.pushModels(this.option.series, [this.planConvert.initializeYaxis(this.stations)]);
-                this.option.yAxis.min = this.planConvert.computedYaxisMinValue(this.stations);
-                this.option.yAxis.max = this.planConvert.computedYaxisMaxValue(this.stations);
-            }
-        },
-        axisTooltip(param) {
-            let data = '';
-            const arr = [];
-			const station = this.stations.find(el => { return el.code == param.value[2] })||{ name: '', kmRange: ''};
-			if (!arr.includes(`${param.data[0]}${param.data[1]}`)) {
-				arr.push(`${param.data[0]}${param.data[1]}`);
-					const list = [
-						`Station name: ${station.name}<br>`,
-						`Kilometer post: ${station.kmRange} m <br>`,
-						`Arrival Time: ${timeFormat(param.data[0] + this.planConvert.TranslationTime)}<br>`,
-						`Train number: ${param.seriesName}${param.data[3]}`,
-						`<hr size=1 style="margin: 3px 0">`
-					];
-					data += list.join('');
-			}
-            return data;
-        },
-        reSize(opt) {
-            if (this.myChart) {
-                this.myChart.resize({
-                    width: opt.width,
-                    height: opt.height,
-                    silent: false
-                });
-            }
-		},
-		handleBtnSelect(el, i) {
-			if (this.active != i) {
-				this.handleCancle();
-				this.active = i;
-				this.action = el.type;
-			} else {
-				this.handleCancle();
-			}
-		},
-		handleCancle() {
-            this.clearGraphic(['drag', 'mark']);
-            this.setLineReset();
-			this.active = -1;
-			this.action = '';
-			this.selected = null;
-		},
-		handleCreate(data) {
-			if (this.myChart) {
-				addRpTrip(data).then(resp => {
-					getRpTools().then(rest => {
-						this.$store.dispatch('rpTools/setPlanData', rest.data).then(() => {
-							this.loadChartData();
-						});
-					}).catch(() => {
-						this.$messageBox(this.$t('error.obtainOperationGraphFailed'));
-					});
-				}).catch(error => {
-					this.$message(error.message);
-					this.clearGraphic(['mark']);
-				})
-			}
-        },
-        handleTranslate(data) {
-            if (this.selected) {
-				const model = {
-					seconds : this.selected.time
-				}
-
-                translateTripNo(this.selected.seriesId, model).then(resp => {
-					getRpTools().then(rest => {
-						this.$store.dispatch('rpTools/setPlanData', rest.data).then(() => {
-							this.loadChartData();
-						});
-					}).catch(() => {
-						this.$messageBox(this.$t('error.obtainOperationGraphFailed'));
-					});
-				}).catch(error => {
-					this.$message(error.message);
-				});
-            }
-        },
-		handleJustRunning(time) {
-			if (this.selected) {
-				const model = {
-					seconds: time,
-					stationCode: this.selected.stationCode
-				}
-
-				justTripNoRunning(this.selected.seriesId, model).then(resp => {
-					getRpTools().then(rest => {
-						this.$store.dispatch('rpTools/setPlanData', rest.data).then(() => {
-							this.loadChartData();
-						});
-					}).catch(() => {
-						this.$messageBox(this.$t('error.obtainOperationGraphFailed'));
-					});
-				}).catch(error => {
-					this.$message(error.message);
-				})
-			}
-		},
-		handleJustStop(time){
-			if (this.selected) {
-				const model = {
-					seconds: time,
-					stationCode: this.selected.stationCode
-				}
-
-				justTripNoStop(this.selected.seriesId, model).then(resp => {
-					getRpTools().then(rest => {
-						this.$store.dispatch('rpTools/setPlanData', rest.data).then(() => {
-							this.loadChartData();
-						});
-					}).catch(() => {
-						this.$messageBox(this.$t('error.obtainOperationGraphFailed'));
-					});
-				}).catch(error => {
-					this.$message(error.message);
-				})
-			}
-        },
-        handleRemove() {
-			if (this.myChart && this.selected) {
-				delRpTrip(this.selected.seriesId).then(resp => {
-					getRpTools().then(rest => {
-						this.$store.dispatch('rpTools/setPlanData', rest.data).then(() => {
-							this.loadChartData();
-							this.handleCancle();
-						});
-					}).catch(() => {
-						this.$messageBox(this.$t('error.obtainOperationGraphFailed'));
-					});
-				}).catch(error => {
-					this.$message(error.message);
-				})
-			}
-		}
-    }
-};
-</script>
-<style scoped rel="stylesheet/scss" lang="scss">
-    @import "src/styles/mixin.scss";
-
-    #PlanSchedule {
-        z-index: 0;
-        width: 100%;
-        height: 100%;
-        position: relative;
-
-		.menus {
-			margin: 0 80px;
-			display: flex;
-			justify-content: flex-end;
-			align-items: center;
-		}
-    }
-</style>
diff --git a/src/views/planMonitor/editToolAUS/tool/dialog/planCreate.vue b/src/views/planMonitor/editToolAUS/tool/dialog/planCreate.vue
new file mode 100644
index 000000000..95bdca82c
--- /dev/null
+++ b/src/views/planMonitor/editToolAUS/tool/dialog/planCreate.vue
@@ -0,0 +1,74 @@
+<template>
+  <el-dialog v-dialogDrag  append-to-body title="Create Run Plan" :visible.sync="dialogShow" width="30%" :close-on-click-modal="false" :before-close="doClose">
+    <el-form ref="form" label-width="100px" :model="formModel" :rules="rules">
+		<el-form-item label="Name" prop="name">
+			<el-input v-model="formModel.name" placeholder="Please Input Run Plan Name." />
+		</el-form-item>
+		<el-form-item label="Lines" prop="maps">
+			 <el-select v-model="formModel.maps" multiple filterable placeholder="Please Select Lines.">
+				<el-option v-for="item in lineList" :key="item.id" :label="item.name" :value="item.id" />
+			</el-select>
+		</el-form-item>
+	</el-form>
+    <span slot="footer" class="dialog-footer">
+      <el-button @click="dialogShow = false">{{ $t('map.cancel') }}</el-button>
+      <el-button type="primary" @click="doConfirm">{{ $t('map.confirm') }}</el-button>
+    </span>
+  </el-dialog>
+</template>
+
+<script>
+import { MenuEnum } from '../../utils.js';
+
+export default {
+	props: {
+		lineList: {
+			type: Array,
+			required: true
+		}
+	},
+    data() {
+        return {
+            dialogShow: false,
+			formModel: {
+				name: '',
+				maps: []
+			},
+			rules: {
+				name: [
+					{
+						required: true, message: 'Please Input Run Plan Name.', trigger: 'blur'
+					}
+				],
+				maps: [
+					{
+						required: true, type: 'array', message: 'Please Select Lines.', trigger: 'change'
+					}
+				]
+			}
+        };
+	},
+	watch: {
+		selected: function(val) {
+		}
+    },
+    methods: {
+        doShow() {
+			this.formModel.name = '';
+			this.formModel.lineList = [];
+			this.dialogShow = true;
+        },
+        doClose() {
+            this.dialogShow = false;
+		},
+		doConfirm() {
+			this.$refs.form.validate((valid) => {
+				if(valid) {
+					this.$emit('createPlan', this.formModel);
+					this.doClose();
+				}
+			});
+		}
+    }
+};
+</script>
diff --git a/src/views/planMonitor/editToolAUS/tool/dialog/planExport.vue b/src/views/planMonitor/editToolAUS/tool/dialog/planExport.vue
new file mode 100644
index 000000000..d9620e7d9
--- /dev/null
+++ b/src/views/planMonitor/editToolAUS/tool/dialog/planExport.vue
@@ -0,0 +1,271 @@
+<template>
+	<el-dialog title="Export" fullscreen  append-to-body :visible.sync="show" :before-close="doClose">
+		<div class="export">
+			<div :id="canvasId" />
+		</div>
+		<span slot="footer" class="dialog-footer">
+			<el-button @click="doClose">取 消</el-button>
+			<el-button type="primary" @click="doExport">确 定</el-button>
+		</span>
+	</el-dialog>
+</template>
+
+<script>
+import * as utils from '../../utils'
+import echarts from 'echarts';
+import { timeFormat } from '@/utils/date';
+
+export default {
+	props: {
+		planUtil: {
+            type: Object,
+            required: true
+		},
+		width: {
+			type: Number,
+			default: 5000,
+		},
+		height: {
+			type: Number,
+			default: 800
+		},
+		title: {
+			type: String,
+			default: ''
+		},
+		canvasId: {
+			type: String,
+			default: 'canvas-export'
+		}
+	},
+	data() {
+		return {
+			myChart: null,
+			planData: {},
+			show: false
+		}
+	},
+	computed: {
+		option() {
+			return {
+				title: {
+                    text: this.title,
+                    left: 'center',
+                    top: '10px'
+                },
+				grid: {
+					top: '60px',
+					left: '160px',
+					right: '100px',
+					bottom: '60px',
+					containLabel: true,
+					backgroundColor: 'floralwhite'
+				},
+				xAxis: [
+					{
+						type: 'category',
+						boundaryGap: false,
+						data: [],
+						axisLine: {
+							onZero: false,
+							lineStyle: {
+								width: 1
+							}
+						},
+						axisLabel: {
+							formatter: (value, index) => { return timeFormat(value); },
+							textStyle: {
+								color: '#333'
+							}
+						}
+					}
+				],
+				yAxis: {
+					type: 'value',
+					splitLine: {
+						show: false
+					},
+					axisTick: {
+						inside: true,
+						show: false
+					},
+					axisLine: {
+						onZero: false,
+						lineStyle: {
+							width: 1
+						}
+					},
+					axisLabel: {
+						show:true,
+						inside:true,
+						formatter: (value, index) => { return '' }
+					},
+					minInterval: 0.1,
+					maxInterval: 1,
+					min: 0,
+					max: 0
+				},
+				graphic: [{
+					id: 'shape',
+					elements: []
+				}],
+				series: [],
+                dataZoom: [
+                    {
+						show: false,
+                      	fiterMode: 'filter',
+						handleSize: '80%',
+                        handleStyle: {
+                            color: '#fff',
+                            shadowBlur: 3,
+                            shadowColor: 'rgba(0, 0, 0, 0.6)',
+                            shadowOffsetX: 2,
+                            shadowOffsetY: 2
+                        }
+                    }
+                ]
+			}
+		}
+	},
+	methods: {
+		loadInitChart() {
+            return new Promise((resolve, reject) => {
+                try {
+                    if (this.myChart && this.myChart.isDisposed) {
+                        this.myChart.clear();
+                    }
+
+					this.myChart = echarts.init(document.getElementById(this.canvasId));
+					this.myChart.setOption(this.option, true);
+					this.reSize({ width: this.width, height: this.height });
+                    resolve(true);
+                } catch (error) {
+                    reject(error);
+                }
+            });
+		},
+		loadChartPage(stations) {
+            try {
+				if (this.myChart) {
+					this.stations = stations;
+					this.xAxisInit(stations);
+					this.yAxisInit(stations);
+
+					this.myChart.setOption(this.option, true);
+				}
+            } catch (error) {
+                this.$message.info(error.message);
+            }
+        },
+		loadChartData(planData) {
+            try {
+				const option = this.myChart.getOption();
+
+				option.title.text = this.title;
+				option.series = [];
+                option.graphic[0].elements = [];
+
+				this.planData = planData;
+
+                this.pushModels(option.series, [this.planUtil.initializeYaxis(this.stations)]);
+                this.pushModels(option.series, this.planUtil.parseDataToSeries(this.myChart, planData, this.stations));
+				this.pushModels(option.graphic[0].elements, this.planUtil.parseDataToGraph(this.myChart, planData, this.stations));
+
+				this.myChart.setOption(option, true);
+            } catch (error) {
+                this.$messageBox(error.message);
+            }
+        },
+        xAxisInit(stations) {
+			const option = this.option;
+			const startValue = this.planUtil.MinTime + this.planUtil.TranslationTime;
+            const endValue = this.planUtil.MaxTime + this.planUtil.TranslationTime;
+			const list = [];
+
+            for (var time = startValue; time <= endValue; time++) {
+                list.push(time);
+            }
+
+			option.xAxis[0].data = list;
+			option.dataZoom[0].startValue = this.planUtil.MinTime + this.planUtil.TranslationTime;
+			option.dataZoom[0].endValue = this.planUtil.MaxTime + this.planUtil.TranslationTime;
+        },
+        yAxisInit(stations) {
+			const option = this.option;
+            if (Object.keys(this.planUtil).length) {
+				this.pushModels(option.series, [this.planUtil.initializeYaxis(stations)]);
+
+                option.yAxis.min = this.planUtil.computedYaxisMinValue(stations);
+				option.yAxis.max = this.planUtil.computedYaxisMaxValue(stations);
+            }
+        },
+        reSize({width, height}) {
+            if (this.myChart) {
+                this.myChart.resize({ width, height, silent: false });
+            }
+		},
+		destroy() {
+            if (this.myChart && this.myChart.isDisposed) {
+                this.myChart.dispose();
+                this.myChart = null;
+            }
+		},
+		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;
+		},
+		doShow(stations, planData) {
+			this.show = true;
+			this.$nextTick(() => {
+				this.loadInitChart().then(resp => {
+					this.loadChartPage(stations);
+					this.loadChartData(planData);
+				});
+			})
+		},
+		doClose() {
+			this.show = false;
+			this.destroy();
+		},
+		doExport() {
+			const urlObject = window.URL || window.webkitURL || window;
+			const export_blob = utils.dataURItoBlob(this.myChart.getDataURL({
+				pixelRatio: 2,
+				backgroundColor: '#fff'
+			}), 'png');
+			const save_link = document.createElementNS("http://www.w3.org/1999/xhtml", "a");
+			save_link.href = urlObject.createObjectURL(export_blob);
+			save_link.download = 'plan.png';
+			save_link.click();
+			this.doClose();
+		}
+	}
+}
+</script>
+
+<style lang="scss" scoped>
+	.export {
+		width: 100%;
+		overflow-y: auto;
+		background: #fff;
+	}
+</style>
diff --git a/src/views/planMonitor/editToolAUS/tool/dialog/planJustRunning.vue b/src/views/planMonitor/editToolAUS/tool/dialog/planJustRunning.vue
new file mode 100644
index 000000000..0a18c2f20
--- /dev/null
+++ b/src/views/planMonitor/editToolAUS/tool/dialog/planJustRunning.vue
@@ -0,0 +1,104 @@
+<template>
+  <el-dialog v-dialogDrag append-to-body title="Modify run time" :visible.sync="dialogShow" width="30%" :close-on-click-modal="false" :before-close="doClose">
+    <el-form ref="form" label-width="160px" :model="formModel" :rules="rules">
+		<el-form-item label="Running time" prop="time">
+			<el-input-number v-model="formModel.time" controls-position="right" :min="0" />
+			<span style="padding-left: 10px">s</span>
+		</el-form-item>
+	</el-form>
+	<span slot="footer" class="dialog-footer">
+      <el-button @click="dialogShow = false">{{ $t('map.cancel') }}</el-button>
+      <el-button type="primary" @click="doConfirm">{{ $t('map.confirm') }}</el-button>
+    </span>
+  </el-dialog>
+</template>
+
+<script>
+import { MenuEnum } from '../../utils.js';
+
+export default {
+	props: {
+		selected: {
+			type: Object,
+			default() {
+				return null
+			}
+		},
+		stations: {
+			type: Array,
+			default() {
+				return []
+			}
+		},
+		config: {
+			type: Object,
+			required: true
+		}
+	},
+    data() {
+		var validator = (rule, value, callback) => {
+			const sig = this.selected.direction == 1? -1: 1;
+			const stations =  this.stations;
+			const offset = Math.abs(
+				this.stations[this.selected.stationIndex].kmRange -
+				this.stations[this.selected.stationIndex+1*sig].kmRange
+			)
+			const min = Math.floor(offset / (this.config.maxSpeed * 1000/3600));
+			const max = Math.floor(offset / 1);
+
+			if (value < min) {
+				callback(new Error('Below minimum run time.'));
+			} else if (value > max) {
+				callback(new Error('Run time above maximum.'));
+			} else {
+				callback()
+			}
+		}
+
+        return {
+			dialogShow: false,
+			formModel: {
+				time: 0,
+			},
+			rules: {
+				time: [
+					{
+						required: true, type: 'number', min: 0, message: 'Please select the arrival time.', trigger: 'blur'
+					},
+					{
+						validator: validator, trigger: 'blur'
+					}
+				],
+			}
+        };
+	},
+	watch: {
+        '$store.state.menuOperation.menuCount': function (val) {
+            if (this.$store.getters['menuOperation/checkDialogIsOpen'](MenuEnum.planJustRunning)) {
+                this.doShow(this.$store.state.menuOperation.menuPosition);
+            } else {
+                this.doClose();
+            }
+		},
+		selected: function(val) {
+			if (val)  this.formModel.time = val.runTime;
+		}
+    },
+    methods: {
+        doShow() {
+            this.dialogShow = true;
+        },
+        doClose() {
+            this.dialogShow = false;
+		},
+		doConfirm() {
+			this.$refs.form.validate((valid) => {
+				if(valid) {
+					this.$emit('justRunning', this.formModel.time);
+					this.doClose();
+				}
+			});
+		}
+    }
+};
+</script>
diff --git a/src/views/planMonitor/editToolAUS/dialog/planJustStop.vue b/src/views/planMonitor/editToolAUS/tool/dialog/planJustStop.vue
similarity index 68%
rename from src/views/planMonitor/editToolAUS/dialog/planJustStop.vue
rename to src/views/planMonitor/editToolAUS/tool/dialog/planJustStop.vue
index 154ad05ca..e0bc09a51 100644
--- a/src/views/planMonitor/editToolAUS/dialog/planJustStop.vue
+++ b/src/views/planMonitor/editToolAUS/tool/dialog/planJustStop.vue
@@ -2,7 +2,7 @@
   <el-dialog v-dialogDrag  append-to-body title="Modify stop time" :visible.sync="dialogShow" width="30%" :close-on-click-modal="false" :before-close="doClose">
     <el-form ref="form" label-width="160px" :model="formModel" :rules="rules">
 		<el-form-item label="Stop time" prop="time">
-			<el-input-number v-model="formModel.time" controls-position="right" :min="0" :max="3600"/>
+			<el-input-number v-model="formModel.time" controls-position="right" :min="0" :max="12*3600" />
 			<span style="padding-left: 10px">s</span>
 		</el-form-item>
 	</el-form>
@@ -14,7 +14,7 @@
 </template>
 
 <script>
-import { DeviceMenu } from '@/scripts/ConstDic';
+import { MenuEnum } from '../../utils.js';
 
 export default {
 	props: {
@@ -23,22 +23,41 @@ export default {
 			default() {
 				return null
 			}
+		},
+		config: {
+			type: Object,
+			required: true
 		}
 	},
     data() {
+		var validator = (rule, value, callback) => {
+			if (value > 0 && value <= this.config.minStopTime) {
+				callback(new Error(`Stop time cannot be within 0-${this.config.minStopTime} seconds.`));
+			} else {
+				callback()
+			}
+		}
+
         return {
             dialogShow: false,
 			formModel: {
 				time: 0
 			},
 			rules: {
-				time: { required: true, message: 'Please select the stop time.', trigger: 'change' },
+				time: [
+					{
+						required: true, type: 'number',  min: 0, max: 12*3600, message: 'Please select the stop time.', trigger: 'blur'
+					},
+					{
+						validator: validator, trigger: 'blur'
+					}
+				],
 			}
         };
 	},
 	watch: {
         '$store.state.menuOperation.menuCount': function (val) {
-            if (this.$store.getters['menuOperation/checkDialogIsOpen'](DeviceMenu.planJustDeparture)) {
+            if (this.$store.getters['menuOperation/checkDialogIsOpen'](MenuEnum.planJustStop)) {
                 this.doShow(this.$store.state.menuOperation.menuPosition);
             } else {
                 this.doClose();
@@ -57,8 +76,10 @@ export default {
 		},
 		doConfirm() {
 			this.$refs.form.validate((valid) => {
-				this.$emit('justStop', this.formModel.time);
-				this.doClose();
+				if(valid) {
+					this.$emit('justStop', this.formModel.time);
+					this.doClose();
+				}
 			});
 		}
     }
diff --git a/src/views/planMonitor/editToolAUS/dialog/planJustRunning.vue b/src/views/planMonitor/editToolAUS/tool/dialog/planJustTurnback.vue
similarity index 68%
rename from src/views/planMonitor/editToolAUS/dialog/planJustRunning.vue
rename to src/views/planMonitor/editToolAUS/tool/dialog/planJustTurnback.vue
index 57b9473d0..818709d1c 100644
--- a/src/views/planMonitor/editToolAUS/dialog/planJustRunning.vue
+++ b/src/views/planMonitor/editToolAUS/tool/dialog/planJustTurnback.vue
@@ -1,8 +1,8 @@
 <template>
-  <el-dialog v-dialogDrag append-to-body title="Modify run time" :visible.sync="dialogShow" width="30%" :close-on-click-modal="false" :before-close="doClose">
+  <el-dialog v-dialogDrag append-to-body title="Modify turn back time" :visible.sync="dialogShow" width="30%" :close-on-click-modal="false" :before-close="doClose">
     <el-form ref="form" label-width="160px" :model="formModel" :rules="rules">
-		<el-form-item label="Running time" prop="time">
-			<el-input-number v-model="formModel.time" controls-position="right" :min="0" :max="3600"/>
+		<el-form-item label="Turn back time" prop="time">
+			<el-input-number v-model="formModel.time" controls-position="right" :min="0" />
 			<span style="padding-left: 10px">s</span>
 		</el-form-item>
 	</el-form>
@@ -14,7 +14,7 @@
 </template>
 
 <script>
-import { DeviceMenu } from '@/scripts/ConstDic';
+import { MenuEnum } from '../../utils.js';
 
 export default {
 	props: {
@@ -23,6 +23,10 @@ export default {
 			default() {
 				return null
 			}
+		},
+		config: {
+			type: Object,
+			required: true
 		}
 	},
     data() {
@@ -32,13 +36,17 @@ export default {
 				time: 0,
 			},
 			rules: {
-				time: { required: true, message: 'Please select the arrival time.', trigger: 'change' },
+				time: [
+					{
+						required: true, type: 'number', min: 0, message: 'Please select turn back time.', trigger: 'blur'
+					}
+				],
 			}
         };
 	},
 	watch: {
         '$store.state.menuOperation.menuCount': function (val) {
-            if (this.$store.getters['menuOperation/checkDialogIsOpen'](DeviceMenu.planJustArrival)) {
+            if (this.$store.getters['menuOperation/checkDialogIsOpen'](MenuEnum.planJustTurnBack)) {
                 this.doShow(this.$store.state.menuOperation.menuPosition);
             } else {
                 this.doClose();
@@ -57,8 +65,10 @@ export default {
 		},
 		doConfirm() {
 			this.$refs.form.validate((valid) => {
-				this.$emit('justRunning', this.formModel.time);
-				this.doClose();
+				if(valid) {
+					this.$emit('justTurnBack', this.formModel.time);
+					this.doClose();
+				}
 			});
 		}
     }
diff --git a/src/views/planMonitor/editToolAUS/tool/dialog/planSetParams.vue b/src/views/planMonitor/editToolAUS/tool/dialog/planSetParams.vue
new file mode 100644
index 000000000..a0449c62e
--- /dev/null
+++ b/src/views/planMonitor/editToolAUS/tool/dialog/planSetParams.vue
@@ -0,0 +1,127 @@
+<template>
+  <el-dialog v-dialogDrag  append-to-body title="Modification of train diagram parameters" :visible.sync="dialogShow" width="30%" :close-on-click-modal="false" :before-close="doClose">
+    <el-form ref="form" label-width="200px" :model="formModel" :rules="rules">
+		<el-form-item label="Average speed" prop="averageSpeed">
+			<el-input-number v-model="formModel.averageSpeed" controls-position="right" :min="20" :max="60" />
+			<span style="padding-left: 10px">km/h</span>
+		</el-form-item>
+		<el-form-item label="Maximum speed" prop="maxSpeed">
+			<el-input-number v-model="formModel.maxSpeed" controls-position="right" :min="50" :max="80" />
+			<span style="padding-left: 10px">km/h</span>
+		</el-form-item>
+		<el-form-item label="Default stop time" prop="stopTime">
+			<el-input-number v-model="formModel.stopTime" controls-position="right" :min="10" :max="120" />
+			<span style="padding-left: 10px">s</span>
+		</el-form-item>
+		<el-form-item label="Minimum stop time" prop="minStopTime">
+			<el-input-number v-model="formModel.minStopTime" controls-position="right" :min="10" :max="30" />
+			<span style="padding-left: 10px">s</span>
+		</el-form-item>
+		<el-form-item label="Minimum interval time" prop="minIntervalTime">
+			<el-input-number v-model="formModel.minIntervalTime" controls-position="right" :min="30" :max="360" />
+			<span style="padding-left: 10px">s</span>
+		</el-form-item>
+		<el-form-item label="Turn back time" prop="turnBackTime">
+			<el-input-number v-model="formModel.turnBackTime" controls-position="right" :min="60" :max="180" />
+			<span style="padding-left: 10px">s</span>
+		</el-form-item>
+	</el-form>
+    <span slot="footer" class="dialog-footer">
+      <el-button @click="dialogShow = false">{{ $t('map.cancel') }}</el-button>
+      <el-button type="primary" @click="doConfirm">{{ $t('map.confirm') }}</el-button>
+    </span>
+  </el-dialog>
+</template>
+
+<script>
+import { MenuEnum } from '../../utils.js';
+
+export default {
+	props: {
+		config: {
+			type: Object,
+			required: true
+		}
+	},
+    data() {
+        return {
+            dialogShow: false,
+			formModel: {
+				averageSpeed: 40,
+				maxSpeed: 70,
+				stopTime: 30,
+				minStopTime: 10,
+				minIntervalTime: 180,
+				turnBackTime: 90
+			},
+			rules: {
+				averageSpeed: [
+					{
+						required: true,  type: 'number',  min: 20, max: 60, message: 'Please select the stop time.', trigger: 'blur'
+					}
+				],
+				maxSpeed: [
+					{
+						required: true, type: 'number',  min: 50, max: 80, message: 'Please select the stop time.', trigger: 'blur'
+					}
+				],
+				stopTime: [
+					{
+						required: true, type: 'number',  min: 10, max: 120, message: 'Please select the stop time.', trigger: 'blur'
+					}
+				],
+				minStopTime: [
+					{
+						required: true, type: 'number',  min: 10, max: 30, message: 'Please select the stop time.', trigger: 'blur'
+					}
+				],
+				minIntervalTime: [
+					{
+						required: true, type: 'number',  min: 30, max: 360, message: 'Please select the stop time.', trigger: 'blur'
+					}
+				],
+				turnBackTime: [
+					{
+						required: true, type: 'number',  min: 60, max: 180, message: 'Please select the stop time.', trigger: 'blur'
+					}
+				]
+			}
+        };
+	},
+	watch: {
+		selected: function(val) {
+		},
+		'$store.state.menuOperation.menuCount': function (val) {
+            if (this.$store.getters['menuOperation/checkDialogIsOpen'](MenuEnum.planSetParams)) {
+                this.doShow(this.$store.state.menuOperation.menuPosition);
+            } else {
+                this.doClose();
+            }
+		}
+    },
+    methods: {
+        doShow() {
+			this.formModel = {
+				averageSpeed: this.config.averageSpeed,
+				maxSpeed: this.config.maxSpeed,
+				stopTime: this.config.stopTime,
+				minStopTime: this.config.minStopTime,
+				minIntervalTime: this.config.minIntervalTime,
+				turnBackTime: this.config.turnBackTime
+			}
+			this.dialogShow = true;
+        },
+        doClose() {
+            this.dialogShow = false;
+		},
+		doConfirm() {
+			this.$refs.form.validate((valid) => {
+				if(valid) {
+					this.$emit('setParams', this.formModel);
+					this.doClose();
+				}
+			});
+		}
+    }
+};
+</script>
diff --git a/src/views/planMonitor/editToolAUS/tool/index.vue b/src/views/planMonitor/editToolAUS/tool/index.vue
new file mode 100644
index 000000000..a3b1ab730
--- /dev/null
+++ b/src/views/planMonitor/editToolAUS/tool/index.vue
@@ -0,0 +1,691 @@
+<template>
+  <div class="monitor">
+		<schedule
+			ref="schedule"
+			:planUtil="planUtil"
+			:title="title"
+			:height="height"
+			:width="width"
+			:model="model"
+			@tag="onTarget"
+			@select="onSelected"
+			@clear="onClear"
+			@create="onCreate"
+			@translate="onTranslate"
+			@setInput="onSetInput"
+			@submit="onSubmit"
+			@refresh="refresh"
+		>
+			<template slot="header">
+				<div class="header">
+					<div class="menus-left">
+						<el-button type="primary" @click="doOpenPlan">Open</el-button>
+						<el-button type="primary" @click="doNewPlan">New</el-button>
+						<el-button type="primary" :disabled="disabled" @click="onDialog(MenuEnum.planSetParams)">Set Param</el-button>
+						<el-button type="primary" @click="doExport" :disabled="disabled"> Export </el-button>
+					</div>
+					<div class="menus-right">
+						<span style="font-size:22px;padding:0 17px;">Plan</span>
+						<menus
+							:model="model"
+							:selected="selected"
+							:target="target"
+							:disabled="disabled"
+							@remove="onRemove"
+							@clear="onClear"
+						/>
+					</div>
+				</div>
+			</template>
+		</schedule>
+
+		<list ref="list" :planList="planList" @select="doSelectPlan" @delete="doDeletePlan" />
+
+		<plan-just-running :config="config" :selected="selected" :stations="stations" @justRunning="doJustRunning" />
+	    <plan-just-stop :config="config" :selected="selected"  @justStop="doJustStop"/>
+		<plan-just-turnback :config="config" :selected="selected"  @justTurnBack="doJustTurnback"/>
+		<plan-set-params :config="config" @setParams="doSetPlanParams" />
+
+
+		<plan-create ref="create" :lineList="lineList" @createPlan="doCreatePlan" />
+		<plan-export ref="export" :planUtil="planUtil" :title="title" :width="3600*2+2050" :height="height-160" />
+
+
+		<div class="fixed" v-show="show">
+			<textarea :auto-focus="true" v-if="textareaModel.show" v-model="textareaModel.text" class="fixed-textarea"
+				:style="{ left: rect.x+'px', top: rect.y+'px',  width: rect.width+'px', height: rect.height+'px', }"/>
+		</div>
+
+  </div>
+</template>
+
+<script>
+import PlanJustRunning from './dialog/planJustRunning.vue';
+import PlanJustStop from './dialog/planJustStop.vue';
+import PlanJustTurnback from './dialog/planJustTurnback.vue';
+import PlanSetParams from './dialog/planSetParams.vue';
+import PlanCreate from './dialog/planCreate.vue';
+import PlanExport from './dialog/planExport.vue';
+import Schedule from './schedule.vue';
+import Menus from './menus.vue';
+import List from './list.vue';
+import * as utils from '../utils.js';
+import { timeFormat } from '@/utils/date';
+import { mapGetters } from 'vuex';
+import {
+	startRpEdit, endRpEdit,
+	listLines, listStations,
+	listRps, createRp, deleteRp,
+	getRpTools, clearRpPlan, addRpTrip, delRpTrip,
+	justTripNoRunning, justTripNoStop, justTripTurnBack,
+	translateRpService, delRpService,
+	getRpConfig, modifyRpConfig,
+	createRpArea, modifyRpArea, modifyAreaNote, delRpArea
+} from '@/api/rpTools';
+
+export default {
+    components: {
+		Schedule,
+		PlanJustRunning,
+		PlanJustStop,
+		PlanJustTurnback,
+		PlanSetParams,
+		PlanCreate,
+		PlanExport,
+		Menus,
+		List
+    },
+    data() {
+        return {
+			planList: [],
+			lineList: [],
+			stations: [],
+			planData: {},
+			selected: null,
+			target: null,
+			isModify: false,
+			textareaModel: {
+				id: 0,
+				show: false,
+				text: '',
+			},
+			rect: {
+				x: 0,
+				y: 0,
+				width: 0,
+				height: 0
+			},
+			model: {
+                choice: 'Plan',
+                action: ''
+            },
+            config: {
+            }
+        };
+    },
+    computed: {
+        disabled() {
+            return !this.planId || !this.isModify;
+        },
+        show() {
+            return this.textareaModel.show;
+        },
+        width() {
+            return this.$store.state.app.width - 2;
+        },
+        height() {
+            return this.$store.state.app.height - 72;
+		},
+		title() {
+			return this.$route.query.title||'';
+		},
+		planId() {
+            return this.$route.query.planId;
+		},
+        lineId() {
+			return this.$route.query.lineId;
+		},
+		lineCode() {
+			return '00';
+		},
+		MenuEnum() {
+			return utils.MenuEnum;
+		}
+    },
+    watch: {
+        width() {
+            this.setPosition();
+        },
+        height() {
+            this.setPosition();
+		},
+		$route: function (to, from) {
+			const fromPlanId = from.query.planId;
+			if (fromPlanId) {
+				if(utils.getModifyState(fromPlanId)) {
+					endRpEdit(fromPlanId).then(resp => {
+						utils.delModifyState(fromPlanId);
+						this.loadPlanData();
+					})
+				} else {
+					this.loadPlanData();
+				}
+			} else {
+				this.loadPlanData();
+			}
+		}
+	},
+	created() {
+		this.planUtil = this.$theme.loadPlanConvert(this.lineCode);
+	},
+	mounted() {
+		window.onbeforeunload = e => {
+			if(this.planId &&
+				utils.getModifyState(this.planId)) {
+				endRpEdit(this.planId).then(resp => {
+					utils.setModifyState(this.planId, resp.data);
+				})
+			}
+		};
+
+		this.setPosition();
+		this.loadPlanData();
+	},
+    methods: {
+		buildPlanList(list) {
+			return list.map(el => {
+				if (el.planList &&
+					el.planList.length) {
+					el.planList = el.planList.map(it => {
+						return {
+							id: it.id,
+							isPlan: true,
+							isModify: it.editable,
+							name: it.mapName,
+							lineId: it.mapId,
+						}
+					})
+				}
+
+				return el;
+			})
+		},
+        setPosition() {
+            this.$nextTick(() => {
+                this.$store.dispatch('rpTools/resize', { width: this.width, height: this.height });
+            });
+		},
+		loadPlanData() {
+			if (this.lineId) {
+				listStations(this.lineId).then(resp => {
+					const stations = this.stations =  resp.data
+
+					this.$store.commit('rpTools/setStations', stations);
+					this.$refs.schedule.loadChartPage(stations);
+
+					if (this.planId) {
+						if(utils.getModifyState(this.planId)) {
+							endRpEdit(this.planId).then(resp => {
+								utils.setModifyState(this.planId, resp.data);
+								startRpEdit(this.planId).then(resp => {
+									this.isModify = resp.data;
+									utils.setModifyState(this.planId, resp.data);
+									if (this.isModify) {
+										listRps().then(resp => {
+											this.planList = this.buildPlanList(resp.data);
+										});
+									}
+								});
+							})
+						} else {
+							startRpEdit(this.planId).then(resp => {
+								this.isModify = resp.data;
+								utils.setModifyState(this.planId, resp.data);
+								if (this.isModify) {
+									listRps().then(resp => {
+										this.planList = this.buildPlanList(resp.data);
+									});
+								}
+							});
+						}
+
+						getRpTools(this.planId).then(rest => {
+							const planData = this.planData = rest.data;
+							this.$store.commit('rpTools/setPlanData', planData);
+							this.$refs.schedule.loadChartData(planData);
+							getRpConfig(this.planId).then(resm => {
+								const data = resm.data;
+								this.config = {
+									averageSpeed: data.averageSpeed,
+									maxSpeed: data.maxSpeed,
+									stopTime: data.stopTime,
+									minStopTime: data.minStopTime,
+									minIntervalTime: data.minIntervalTime,
+									turnBackTime: data.turnBackTime
+								}
+							}).catch(error => {
+								console.error(error);
+								this.$message.info(error.message);
+							})
+						}).catch(error => {
+							console.error(error);
+							this.$message.info(error.message);
+						})
+					} else {
+						this.$refs.schedule.clear();
+					}
+				}).catch(error => {
+					console.error(error);
+					this.$messageBox(error.message);
+				})
+			} else {
+				this.$refs.schedule.clear();
+			}
+		},
+		onDialog(menu) {
+			this.$store.dispatch('menuOperation/setPopMenu', { position: {x: 0, y: 0}, menu });
+		},
+		onTarget(target) {
+			this.target = target;
+		},
+		onSelected(selected) {
+			this.selected = selected;
+		},
+		onSetInput(target) {
+			switch(this.model.choice) {
+				case 'Construction':
+					if (this.model.action == 'Note') {
+						if (target) {
+							this.rect = target.getBoundingRect().clone();
+							this.rect.x += target.position[0]+1;
+							this.rect.y += target.position[1]+70;
+							this.textareaModel.id = target.model.areaNo;
+							this.textareaModel.text = target.model.text||'';
+							this.textareaModel.show = true;
+							target.setStyle({text: ''});
+						}
+					}
+				break;
+			}
+		},
+		onSubmit() {
+			switch(this.model.choice) {
+				case 'Construction':
+					if (this.model.action == 'Note') {
+						if (this.textareaModel.id) {
+							this.doSetAreaNote(this.textareaModel);
+							this.textareaModel.id = 0;
+							this.textareaModel.show = false;
+						}
+					}
+				break;
+			}
+		},
+		onCreate(data) {
+			switch(this.model.choice) {
+				case 'Plan':
+					this.doCreateTrip(data);
+				break;
+				case 'Construction':
+					this.doCreateArea(data);
+				break;
+			}
+		},
+		onTranslate(data) {
+			switch(this.model.choice) {
+				case 'Plan':
+					this.doTranslateService(data);
+				break;
+				case 'Construction':
+					this.doTranslateArea(data);
+				break;
+			}
+		},
+		onClear() {
+			this.selected = null;
+			this.target = null;
+			this.textareaModel.show = false;
+			this.$refs.schedule.setLineReset();
+			this.$refs.schedule.setTargetReset();
+			this.$refs.schedule.clearTrip();
+
+			if (this.model.action != 'Translate') {
+				this.$refs.schedule.clearDraggable();
+			}
+
+			if (this.model.action != 'Add') {
+				this.$refs.schedule.clearGraphic();
+			}
+		},
+		onRemove(){
+			switch(this.model.choice) {
+				case 'Plan':
+					if (['Translate', 'Edit'].includes(this.model.action)) {
+						this.doRemoveService();
+					} else {
+						this.doRemoveTrip();
+					}
+				break;
+				case 'Construction':
+					this.doRemoveArea();
+				break;
+			}
+		},
+		doExport() {
+			this.$refs.export.doShow(this.stations, this.planData);
+		},
+		doOpenPlan() {
+			listRps().then(resp => {
+				this.planList = this.buildPlanList(resp.data);
+				this.$refs.list.doShow();
+			})
+		},
+		doNewPlan() {
+			listLines().then(resp => {
+				this.lineList = resp.data;
+				this.$refs.create.doShow(resp.data);
+				this.$nextTick(e => {
+					if (this.$refs.tree) {
+						this.$refs.tree.setCurrentKey(this.planId);
+					}
+				})
+			});
+		},
+		doSelectPlan(el) {
+			this.$router.replace({ path: 'AUStool', query: { planId: el.id, lineId: el.lineId, title: el.name }});
+		},
+		doCreatePlan(model) {
+			createRp(model).then(resp => {
+				this.$router.replace({ path: 'AUStool'});
+				this.$message.success('Run plan group created successfully.')
+			}).catch(error => {
+				console.error(error);
+				this.$message.info(error.message);
+			})
+		},
+		doDeletePlan(el) {
+			this.$confirm('This operation will permanently delete the data. Do you want to continue?', 'Tips', {
+				confirmButtonText: 'Confirm',
+				cancelButtonText: 'Cancel',
+				type: 'warning'
+			}).then(() => {
+				deleteRp(el.id).then(resp => {
+					listRps().then(resp => {
+						this.planList = this.buildPlanList(resp.data);
+						el.planList.findIndex(el => { return el.id == this.planId; }) >= 0
+							? this.$router.replace({ path: 'AUStool'})
+							: this.loadPlanData();
+					}).catch(error => {
+						console.error(error);
+						this.$message.info(error.message);
+					})
+				}).catch(error => {
+					console.error(error);
+					this.$message.info(error.message);
+				})
+			}).catch(error => {
+				console.error(error);
+				this.$message.info('Deletion cancelled.');
+			});
+		},
+		doSetPlanParams(data) {
+			modifyRpConfig(this.planId, data).then(resp => {
+				this.config = data;
+				this.$message.success('Parameters of plan were modified successfully.');
+			}).catch(error => {
+				console.error(error);
+				this.$message.info(error.message);
+			})
+		},
+		doSetAreaNote(data) {
+			const model = {
+				text: data.text
+			}
+
+            modifyAreaNote(this.planId, data.id, model).then(resp => {
+                this.refresh(false);
+            }).catch(error => {
+				console.error(error);
+                this.$message.info(error.message);
+                this.refresh(false);
+            });
+        },
+        doJustRunning(time) {
+            if (this.selected) {
+                const model = {
+                    seconds: time,
+                    stationId: this.selected.stationId
+                }
+
+                justTripNoRunning(this.planId, this.selected.tripNo, model).then(resp => {
+                    this.refresh(false);
+                }).catch(error => {
+					console.error(error);
+                    this.$message.info(error.message);
+                    this.refresh(false);
+                });
+            }
+        },
+        doJustStop(time) {
+            if (this.selected) {
+                const model = {
+                    seconds: time,
+                    stationId: this.selected.stationId
+                }
+
+                justTripNoStop(this.planId, this.selected.tripNo, model).then(resp => {
+                    this.refresh(false);
+                }).catch(error => {
+					console.error(error);
+                    this.$message.info(error.message);
+                    this.refresh(false);
+                });
+            }
+        },
+        doJustTurnback(time) {
+            if (this.selected) {
+                const model = {
+                    seconds: time,
+                    stationId: this.selected.stationId
+                }
+
+                justTripTurnBack(this.planId, this.selected.tripNo, model).then(resp => {
+                    this.refresh(false);
+                }).catch(error => {
+					console.error(error);
+                    this.$message.info(error.message);
+                    this.refresh(false);
+                });
+            }
+		},
+		doCreateTrip(data) {
+			const model = {
+				endStationId: data.endStationId,
+				startStationId: data.startStationId,
+				startTime: timeFormat(data.startTime),
+				endTime: timeFormat(data.endTime)
+			}
+
+            addRpTrip(this.planId, model).then(resp => {
+                this.refresh();
+            }).catch(error => {
+				console.error(error);
+                this.$message.info(error.message);
+                this.refresh();
+                this.$refs.schedule.clearGraphic(['mark']);
+            });
+        },
+        doCreateArea(data) {
+            const startTime = data.startTime;
+            const endTime = data.endTime;
+            const startKmRange = data.startKmRange;
+            const endKmRange = data.endKmRange;
+
+            const model = {
+                fartherKmRange: startKmRange < endKmRange ? data.endKmRange : data.startKmRange,
+                closerKmRange: startKmRange < endKmRange ? data.startKmRange : data.endKmRange,
+                startTime: endTime < startTime ? timeFormat(data.endTime) : timeFormat(data.startTime),
+                endTime: endTime < startTime ? timeFormat(data.startTime) : timeFormat(data.endTime)
+            };
+
+            createRpArea(this.planId, model).then(resp => {
+                this.refresh();
+            }).catch(error => {
+				console.error(error);
+                this.$message.info(error.message);
+                this.refresh();
+                this.$refs.schedule.clearGraphic(['mark']);
+            });
+        },
+        doTranslateService() {
+            if (this.selected) {
+                const model = {
+                    seconds : this.selected.time
+                };
+
+                translateRpService(this.planId, this.selected.serviceNo, model).then(resp => {
+                    this.refresh(false);
+                }).catch(error => {
+					this.refresh(false);
+					console.error(error);
+                    this.$message.info(error.message);
+                });
+            }
+        },
+        doTranslateArea() {
+            if (this.target) {
+				const data = this.target.model;
+                const model = {
+                    fartherKmRange: parseInt(data.fartherKmRange),
+                    closerKmRange: parseInt(data.closerKmRange),
+                    startTime: timeFormat(data.startTime),
+                    endTime: timeFormat(data.endTime),
+                    text: data.text
+                };
+
+                modifyRpArea(this.planId, data.areaNo, model).then(resp => {
+                    this.refresh(false);
+                }).catch(error => {
+					this.refresh(false);
+					console.error(error);
+                    this.$message.info(error.message);
+                });
+            }
+        },
+        doRemoveService() {
+            if (this.selected) {
+                this.$confirm('This operation will permanently delete the data. Do you want to continue?', 'Tips', {
+                    confirmButtonText: 'Confirm',
+                    cancelButtonText: 'Cancel',
+                    type: 'warning'
+                }).then(() => {
+                    delRpService(this.planId, this.selected.serviceNo).then(resp => {
+                        this.refresh();
+                    }).catch(error => {
+						this.refresh();
+						console.error(error);
+                        this.$message.info(error.message);
+                    });
+                }).catch(error => {
+					console.error(error);
+                    this.$message.info('Deletion cancelled.');
+                });
+            }
+        },
+        doRemoveTrip() {
+            if (this.selected) {
+                this.$confirm('This operation will permanently delete the data. Do you want to continue?', 'Tips', {
+                    confirmButtonText: 'Confirm',
+                    cancelButtonText: 'Cancel',
+                    type: 'warning'
+                }).then(() => {
+
+                    delRpTrip(this.planId, this.selected.tripNo).then(resp => {
+                        this.refresh();
+                    }).catch(error => {
+						this.refresh();
+						console.error(error);
+                        this.$message.info(error.message);
+                    });
+                }).catch(error => {
+					console.error(error);
+                    this.$message.info('Deletion cancelled.');
+                });
+            }
+        },
+        doRemoveArea() {
+            if (this.target) {
+                this.$confirm('This operation will permanently delete the data. Do you want to continue?', 'Tips', {
+                    confirmButtonText: 'Confirm',
+                    cancelButtonText: 'Cancel',
+                    type: 'warning'
+                }).then(() => {
+                    const data = this.target.model;
+                    delRpArea(this.planId, data.areaNo).then(resp => {
+                        this.refresh();
+                    }).catch(error => {
+						this.refresh();
+						console.error(error);
+                        this.$message.info(error.message);
+                    });
+                }).catch(error => {
+					console.error(error);
+                    this.$message.info('Deletion cancelled.');
+                });
+            }
+        },
+        refresh(cls = true) {
+            getRpTools(this.planId).then(rest => {
+                const planData = this.planData = rest.data;
+                this.$store.commit('rpTools/setPlanData', planData);
+                this.$refs.schedule.loadChartData(planData);
+                if (cls) {
+                    this.onClear();
+                }
+            }).catch(error => {
+				console.error(error);
+                this.$messageBox('Failed to load the plan.');
+            });
+        }
+    }
+};
+</script>
+<style scoped rel="stylesheet/scss" lang="scss">
+    @import "src/styles/mixin.scss";
+
+    .monitor {
+        z-index: 0;
+        width: 100%;
+        height: 100%;
+        position: relative;
+
+        .header {
+            margin: 0 80px;
+            display: flex;
+            justify-content: space-between;
+            align-items: center;
+
+            .menus-left {
+                display: flex;
+                align-items: center;
+            }
+
+            .menus-right {
+                display: flex;
+                align-items: center;
+            }
+        }
+
+		.fixed {
+			pointer-events: none;
+			&-textarea {
+				position: absolute;
+				background: #f0a1a1;
+				pointer-events: all;
+				text-align: left;
+				font-size: 18px;
+				overflow: hidden;
+			}
+		}
+    }
+</style>
diff --git a/src/views/planMonitor/editToolAUS/tool/list.vue b/src/views/planMonitor/editToolAUS/tool/list.vue
new file mode 100644
index 000000000..6d80e820c
--- /dev/null
+++ b/src/views/planMonitor/editToolAUS/tool/list.vue
@@ -0,0 +1,77 @@
+<template>
+	<drawer :visible.sync="drawer" @before-close="e => drawer=false">
+		<template slot="title">Run Plan List</template>
+		<el-tree style="padding-right: 20px" :data="planList" :props="defaultProps" @node-click="onSelect" default-expand-all>
+			<template slot-scope="{data}">
+				<span class="flex" >
+					<span><i :class="data.isPlan? 'el-icon-document': 'el-icon-folder'"/>&ensp;{{data.name}}</span>
+					<span
+						v-if="!data.isPlan"
+						class="btn-text"
+						@click.stop="onDelete(data)">
+						<i class="el-icon-delete" />
+					</span>
+					<span v-else>
+ 						<el-link :underline="false" :type="data.isModify?'warning':'info'"><code>{{data.isModify? 'edit': 'read'}}</code></el-link>
+					</span>
+				</span>
+			</template>
+		</el-tree>
+	</drawer>
+</template>
+
+<script>
+import Drawer from '../components/drawer.vue';
+
+export default {
+	components: {
+		Drawer
+	},
+	props: {
+		planList: {
+			type: Array,
+			required: true,
+		}
+	},
+	data() {
+		return {
+			defaultProps: {
+				children: 'planList',
+				label: 'name'
+			},
+			drawer: false
+		}
+	},
+	methods: {
+		onSelect(el) {
+			if (el.isPlan) {
+				this.$emit('select', el);
+				this.drawer = false;
+			}
+		},
+		onDelete(el) {
+			this.$emit('delete', el);
+		},
+		doShow() {
+			this.drawer = true;
+		},
+		doClose() {
+			this.drawer = false;
+		},
+	}
+}
+</script>
+
+<style lang="scss" scoped>
+	.flex {
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+		width: 100%;
+	}
+
+	.btn-text {
+		color: red;
+		padding: 5px 10px;
+	}
+</style>
diff --git a/src/views/planMonitor/editToolAUS/tool/menus.vue b/src/views/planMonitor/editToolAUS/tool/menus.vue
new file mode 100644
index 000000000..f68bf91d0
--- /dev/null
+++ b/src/views/planMonitor/editToolAUS/tool/menus.vue
@@ -0,0 +1,157 @@
+<template>
+	<div class="menus">
+		<el-select v-model="model.choice" placeholder="请选择功能类型" style="margin-right:20px" @change="doSelChange">
+			<el-option v-for="(el,i) in options" :key="i" :label="el.label" :value="el.value" />
+		</el-select>
+		<div v-if="option">
+			<el-button-group v-if="option.radioList" v-model="model.action">
+				<el-button v-for="(el,i) in option.radioList" :disabled="disabled"
+					:key="i"
+					:type="el.value == model.action? 'primary':''"
+					@click="doBtnSelect(el, i)">
+						<span>{{ execProp('label', el, i) }}</span>
+				</el-button>
+			</el-button-group>
+			<el-button-group v-if="option.buttonList" style="margin-left: 20px">
+				<el-button v-for="(el,i) in option.buttonList" :disabled="disabled"
+					:key="i"
+					:type="execProp('type', el, i)"
+					:icon="execProp('icon', el, i)"
+					@click="execProp('handle', el, i)">
+						<span>{{ execProp('name', el, i)  }}</span>
+				</el-button>
+			</el-button-group>
+		</div>
+	</div>
+</template>
+<script>
+
+export default {
+	props: {
+		model: {
+			type: Object,
+			required: true
+		},
+		selected: {
+			type: Object,
+			default() {
+				return null
+			}
+		},
+		target: {
+			type: Object,
+			default() {
+				return null
+			}
+		},
+		disabled: {
+			type: Boolean,
+			default: false
+		}
+	},
+	data() {
+		return {
+		}
+	},
+	computed: {
+		options() {
+			return [
+				{
+					label: "Planning",
+					value: "Plan"
+				},
+				{
+					label: "Construction area",
+					value: "Construction"
+				},
+			]
+		},
+		optionsMap() {
+			return  {
+				Plan: {
+					radioList: [
+						{
+							label: 'Add',
+							value: 'Add',
+						},
+						{
+							label: 'Translate',
+							value: 'Translate'
+						},
+						{
+							label: 'Edit',
+							value: 'Edit'
+						}
+					],
+					buttonList: [
+						{
+							icon: 'el-icon-delete',
+							type: (el, i) => { return this.selected? 'danger':'info' },
+							handle: e => { this.$emit('remove') }
+						}
+					]
+				},
+				Construction: {
+					radioList: [
+						{
+							label: 'Add',
+							value: 'Add',
+						},
+						{
+							label: 'Translate',
+							value: 'Translate'
+						},
+						{
+							label: 'Edit',
+							value: 'Edit'
+						},
+						{
+							label: 'Note',
+							value: 'Note'
+						}
+					],
+					buttonList: [
+						{
+							icon: 'el-icon-delete',
+							type: (el, i) => { return this.target?'danger':'info' },
+							handle: e => { this.$emit('remove') }
+						}
+					]
+				}
+			}
+		},
+		option() {
+			return this.optionsMap[this.model.choice]
+		}
+	},
+	methods: {
+		execProp(prop, el, i) {
+			return el[prop]
+				? el[prop] instanceof Function
+					? el[prop](el, i)
+					: el[prop]
+				: '';
+		},
+		doSelChange() {
+			this.model.action = '';
+			this.$emit('clear');
+		},
+		doBtnSelect(el, i) {
+			if (this.option.radioList &&
+				this.model.action != el.value) {
+				this.model.action = el.value;
+				this.$emit('clear')
+			} else {
+				this.model.action = '';
+				this.$emit('clear')
+			}
+		}
+	}
+}
+</script>
+<style scoped>
+	.menus {
+		display: flex;
+		align-items: center;
+	}
+</style>
diff --git a/src/views/planMonitor/editToolAUS/tool/monitor.js b/src/views/planMonitor/editToolAUS/tool/monitor.js
new file mode 100644
index 000000000..ab876b709
--- /dev/null
+++ b/src/views/planMonitor/editToolAUS/tool/monitor.js
@@ -0,0 +1,662 @@
+import echarts from 'echarts';
+import * as utils from '../utils'
+
+export default {
+	data() {
+		return {
+			callRegister: [],
+			markList: [],
+			buildModel: {
+				startStationId: '',
+				startKmRange: 0,
+				startTime: 0,
+				endStationId: '',
+				endKmRange: 0,
+				endTime: 0
+			},
+			offset: {
+				_x: 0,
+				_y: 0,
+			},
+			selected: null,
+			target: null,
+			drag: null,
+			dragging: false
+		}
+	},
+	watch: {
+		myChart: function() {
+			this.listenersBind();
+		}
+	},
+	beforeDestroy() {
+		this.listenersOff();
+	},
+	methods: {
+		pixelExecCb(e, cb=e => {}) {
+			const event = e.componentType ? e.event: e;
+			const pointInPixel = [event.offsetX, event.offsetY]
+			const pointInGrid = this.myChart.convertFromPixel('grid', pointInPixel);
+
+			if (this.myChart.containPixel('grid', pointInPixel) && this.planUtil) {
+				const xIndex = pointInGrid[0];
+				const yIndex = pointInGrid[1];
+				const option = this.myChart.getOption();
+				const xVal = option.xAxis[0].data[xIndex];
+				const yObj = this.planUtil.getStationByCoordinateY(this.stations, yIndex);
+				if (yObj) {
+					cb({yObj, xVal, pointInPixel, pointInGrid, e});
+				}
+			}
+		},
+		listenersBind() {
+			if (this.myChart) {
+				const zr = 	this.myChart.getZr();
+
+				zr.on('mouseover', this.onZrMouseOver, this);
+				zr.on('mousedown', this.onZrMouseDown, this);
+				zr.on('mouseup', this.onZrMouseUp, this);
+				zr.on('mouseout', this.onZrMouseOut, this);
+				this.myChart.on('click', this.onMouseClick);
+				this.myChart.on('mouseover', this.onMouseOver);
+				this.myChart.on('mouseout', this.onMouseOut);
+				this.myChart.on('datazoom', this.onUpdateZoom);
+				this.myChart.on('rendered', this.onRendered);
+
+				window.addEventListener('resize', this.onUpdateZoom);
+			}
+		},
+		listenersOff() {
+			if (this.myChart) {
+				const zr = this.myChart.getZr();
+
+				zr.off('mouseover', this.onZrMouseOver, this);
+				zr.off('mousedown', this.onZrMouseDown, this);
+				zr.off('mouseup', this.onZrMouseUp, this);
+				zr.off('mouseout', this.onZrMouseOut, this);
+
+				this.myChart.off('click', this.onMouseClick);
+				this.myChart.off('mouseover', this.onMouseOver);
+				this.myChart.off('mouseout', this.onMouseOut);
+				this.myChart.off('datazoom', this.onUpdateZoom);
+				this.myChart.off('rendered', this.onRendered);
+
+				window.removeEventListener('resize', this.onUpdateZoom);
+			}
+		},
+		onUpdateZoom(e) {
+			const fixedList = ['area'];
+			const option = this.myChart.getOption();
+			const elements = option.graphic[0].elements||[]
+			const graphic = echarts.util.map(elements, (el) => {
+				if (fixedList.includes(el.subType)) {
+					const position1 = this.myChart.convertToPixel('grid', el.point1);
+					const position2 = this.myChart.convertToPixel('grid', el.point2);
+					const width = Math.abs(position1[0] - position2[0]);
+					const height = Math.abs(position1[1] - position2[1])
+
+					return {
+						position: position1,
+						shape: { width, height },
+						style: {
+							textPadding: [3, 6],
+							textOffset: [-width/2, -height/2]
+						}
+					}
+				} else if (el) {
+					return {
+						position: this.myChart.convertToPixel('grid', el.point)
+					};
+				}
+			})
+
+			this.myChart.setOption({graphic});
+			this.$emit('clear');
+		},
+		onZrMouseOver(e) {
+			this.pixelExecCb(e, args => {
+				if (this.model.choice == 'Construction') {
+					this.doSetTarget(args);
+					if (this.model.action == 'Translate') {
+						this.doSetAreaTranslate(args);
+					} else if (this.model.action == 'Edit') {
+						this.doSetAreaHorns(args);
+					}
+				}
+			});
+		},
+		onZrMouseDown(e) {
+			this.dragging = false;
+			this.pixelExecCb(e, args => {
+				if (this.model.choice == 'Plan') {
+					if (this.model.action == 'Add') {
+						this.doCreateMark(args);
+					}
+				} else if (this.model.choice == 'Construction') {
+					if (this.model.action == 'Add') {
+						this.doCreateArea(args);
+					} else if (this.model.action == 'Translate') {
+						this.doSetTarget(args);
+					} else if (this.model.action == 'Edit') {
+						this.doSetDrag(args);
+					} else if (this.model.action == 'Note') {
+						this.doSetInput(args)
+					}
+				}
+			});
+
+			if (!e.target) {
+				this.$emit('submit');
+				this.$emit('clear');
+			}
+		},
+		onZrMouseUp(e) {
+			this.pixelExecCb(e, args => {
+				if(this.model.choice == 'Plan') {
+					if (this.model.action == 'Translate') {
+						this.doTranslateSeries(args);
+					}
+				} else if(this.model.choice == 'Construction') {
+					if (this.model.action == 'Translate') {
+						this.doTranslateArea(args);
+					} else if (this.model.action == 'Edit') {
+						this.doTranslateHorn(args);
+					}
+				}
+			});
+		},
+		onZrMouseOut(e) {
+		},
+		onMouseOver(e) {
+			this.pixelExecCb(e, args => {
+				if (this.model.choice == 'Plan') {
+					this.doSetSelected(args);
+					if (this.model.action == 'Translate') {
+						this.doSetDrag(args);
+						this.doCreateDrag(args);
+						setTimeout(_ => { this.onShapeMouseOver(e); }, 200);
+					}
+				}
+			});
+		},
+		onMouseClick(e) {
+			this.pixelExecCb(e, args => {
+				if (this.model.choice == 'Plan') {
+					this.doSetSelected(args);
+					if (this.model.action == 'Edit') {
+						this.doPopDialog(args);
+					}
+				}
+			});
+		},
+		onMouseOut(e) {
+			this.pixelExecCb(e, args => {
+				if (this.model.choice == 'Plan') {
+					this.doSetSelected(args);
+					if (this.model.action == 'Translate') {
+						this.doCreateDrag(args);
+					}
+				}
+			});
+		},
+		onRendered(e) {
+			const mw = this.myChart.getWidth()-100;
+
+			const view = this.myChart.getViewOfComponentModel({__viewId: "_ec_shape_graphic"});
+			if (view &&
+				view.group) {
+				view.group.eachChild(el => {
+					if (['area'].includes(el.subType)) {
+						const position1 = this.myChart.convertToPixel('grid', el.point1);
+						const position2 = this.myChart.convertToPixel('grid', el.point2);
+						const oldWidth = Math.abs(position2[0]-position1[0]);
+						const x = el.position[0] < 160
+							? 160 - el.position[0]
+							: 0;
+						const dw = el.position[0] + oldWidth > mw
+							? el.position[0] + oldWidth - mw
+							: x;
+
+						const width = oldWidth-dw;
+
+						if (width < 0 || x > mw) {
+							el.hide();
+						} else {
+							el.setShape({x,width})
+							el.show();
+						}
+						el.dirty();
+					} else if (['drag'].includes(el.subType)) {
+						if (el.position[0]-el.shape.r < 160 ||
+							el.position[0]+el.shape.r > mw) {
+							el.hide();
+						} else {
+							el.show();
+						}
+						el.dirty();
+					}
+				})
+			}
+		},
+		onShapeMouseOver(e) {
+			if (this.selected) {
+				this.myChart.dispatchAction({
+					type: 'showTip',
+					seriesIndex: this.selected.seriesIndex,
+					dataIndex: this.selected.dataIndex
+				});
+			}
+		},
+		onShapeDragging(e) {
+			this.pixelExecCb(e, args => {
+				if (this.selected) {
+					if(this.model.choice == 'Plan') {
+						if (this.model.action == 'Translate') {
+							this.doSeriesDragging(args);
+						}
+					}
+				}
+
+				if (this.target) {
+					if (this.model.choice == 'Construction') {
+						if (this.model.action == 'Translate') {
+							this.doAreaDragging(args);
+						} else if (this.model.action == 'Edit') {
+							this.doAreaHornDragging(args);
+						}
+					}
+				}
+			});
+		},
+		onShapeMouseOut(e) {
+			if (this.selected) {
+				this.myChart.dispatchAction({
+					type: 'hideTip',
+				});
+			}
+		},
+		doCreateDrag({e, pointInGrid, pointInPixel}) {
+			if (this.selected &&
+				e.componentType == "series" &&
+				e.componentSubType == "line" &&
+				e.seriesName.includes('service')) {
+				const option = this.myChart.getOption();
+				const filters = option.graphic[0].elements.filter(el => { return el.subType != 'drag'});
+				filters.push(utils.buildDragDataObj(pointInPixel, pointInGrid, this, 'drag'))
+				option.graphic[0].elements = filters;
+
+				this.myChart.setOption(option, true);
+				this.myChart.dispatchAction({
+					type: 'showTip',
+					seriesIndex: this.selected.seriesIndex,
+					dataIndex: this.selected.dataIndex
+				});
+			}
+		},
+		doClearDrag({e}) {
+			if (this.selected &&
+				e.componentType == "series" &&
+				e.componentSubType == "line" &&
+				e.seriesName.includes('service')) {
+				const option = this.myChart.getOption();
+				const filters = option.graphic[0].elements.filter(el => { return el.subType != 'drag'});
+				option.graphic[0].elements = filters;
+				this.myChart.setOption(option, true);
+			}
+		},
+		doCreateMark({e, pointInGrid, pointInPixel, yObj}) {
+			const option = this.myChart.getOption();
+			const graphic = option.graphic;
+			const elements = graphic[0].elements;
+
+			elements.push(utils.buildMarkPointObj(pointInPixel, pointInGrid, this, 'mark'))
+
+			this.myChart.setOption(option, true);
+
+			const markList = this.markList = elements.filter(el => { return el.subType == 'mark'});
+			const elemList = elements.filter(el => { return el.subType != 'mark'});
+
+			if (markList.length == 1) {
+				this.buildModel.startTime = pointInGrid[0];
+				this.buildModel.startStationId = yObj.id;
+			} else if (markList.length >= 2) {
+				this.buildModel.endTime = pointInGrid[0];
+				this.buildModel.endStationId = yObj.id;
+				option.graphic[0].elements = elemList;
+				this.$emit('create', this.buildModel);
+			}
+		},
+		doCreateArea({e, pointInGrid, pointInPixel}) {
+			if (!e.target) {
+				const option = this.myChart.getOption();
+				const graphic = option.graphic;
+				const elements = graphic[0].elements;
+
+				elements.push(utils.buildMarkPointObj(pointInPixel, pointInGrid, this, 'mark'))
+
+				this.myChart.setOption(option, true);
+
+				const markList = this.markList = elements.filter(el => { return el.subType == 'mark'});
+				const elemList = elements.filter(el => { return el.subType != 'mark'});
+
+				if (markList.length == 1) {
+					this.buildModel.startTime = pointInGrid[0];
+					this.buildModel.startKmRange = this.planUtil.getKmRangeByCoordinateY(pointInGrid[1]);
+				} else if (markList.length >= 2) {
+					this.buildModel.endTime = pointInGrid[0];
+					this.buildModel.endKmRange = this.planUtil.getKmRangeByCoordinateY(pointInGrid[1]);
+					option.graphic[0].elements = elemList;
+					this.$emit('create', this.buildModel);
+				}
+			}
+		},
+		doSetDrag({e, pointInGrid}) {
+			if (e.target && ['drag'].includes(e.target.subType)) {
+				this.drag = e.target;
+				this.offset.x = pointInGrid[0];
+				this.offset.y = pointInGrid[1];
+			}
+		},
+		doSetTarget({e, pointInGrid}) {
+			if (e.target && ['area'].includes(e.target.subType)) {
+				if (this.target &&
+					this.target.model.areaNo != e.target.model.areaNo) {
+					this.setTargetReset();
+				}
+
+				this.target = e.target;
+				this.offset.x = pointInGrid[0];
+				this.offset.y = pointInGrid[1];
+
+				this.$emit('tag', e.target);
+
+				this.setTargetLight();
+			}
+		},
+		doSetSelected({e, pointInGrid}) {
+			if (e.componentType == "series" &&
+				e.componentSubType == "line" &&
+				e.seriesName.includes('service')) {
+
+				const value = e.value;
+				const option = this.myChart.getOption();
+				const dataList = option.series[e.seriesIndex].data;
+				const length = dataList.length;
+				const next = utils.findNext(dataList, e.dataIndex, (el, i) => { return el instanceof Array});
+				const isService = this.model.choice == 'Plan' && ['Translate', 'Edit'].includes(this.model.action);
+
+				if (this.selected &&
+					this.selected.seriesName != e.seriesName) {
+					this.setLineReset();
+					this.clearTrip();
+				}
+
+				if (!isService) {
+					const service = option.series[e.seriesIndex];
+					const index = option.series.findIndex(el => { return el.name.includes('trip') })
+
+					if (index < 0) {
+						option.series.push({
+							name: 'service-trip',
+							type: 'line',
+							symbolSize: 1,
+							showAllSymbol: true,
+							data: []
+						})
+					}
+
+					const series = option.series[option.series.findIndex(el => { return el.name.includes('trip') })];
+
+					series.data = service.data.filter(el => { return el instanceof Array && el[2].tripNo == value[2].tripNo })
+
+					this.myChart.setOption(option, true);
+				}
+
+				const obj =dataList[e.dataIndex][2];
+
+
+				this.offset.x = pointInGrid[0];
+				this.offset.y = pointInGrid[1];
+				this.selected = {
+					stationIndex: this.stations.findIndex(el => { return el.id == obj.stationId; }),
+					dataIndex: e.dataIndex,
+					seriesIndex: e.seriesIndex,
+					seriesName: isService? e.seriesName: 'service-trip',
+					seriesId: e.seriesId,
+					depTime: e.dataIndex < length - 1? next[0] - value[0]: 0,
+					runTime: e.dataIndex < length - 1? next[0] - value[0]: 0,
+					... value[2],
+					time: 0,
+					kmRange: 0
+				}
+
+				this.$emit('select', this.selected);
+
+				this.setLineLight();
+			}
+		},
+		doSetAreaTranslate({e}) {
+			if (e.target && ['area'].includes(e.target.subType)) {
+				const option = this.myChart.getOption();
+				const elem = option.graphic[0].elements.find(el => { return ['area'].includes(el.subType) && el.model.areaNo == e.target.model.areaNo; });
+
+				elem.z = 90;
+				elem.draggable = true;
+				elem.ondrag = echarts.util.curry(this.onShapeDragging);
+
+				this.myChart.setOption(option, true);
+			}
+		},
+		doSetAreaHorns({e}) {
+			if (e.target && ['area'].includes(e.target.subType)) {
+				const option = this.myChart.getOption();
+				const elemList = option.graphic[0].elements.filter(el => { return !['drag'].includes(el.subType) });
+				const elem = option.graphic[0].elements.find(el => { return ['area'].includes(el.subType) && el.model.areaNo == e.target.model.areaNo; });
+
+				if (elem) {
+					option.graphic[0].elements = this.calcHornList(elemList, elem);
+				}
+
+				this.myChart.setOption(option, true);
+			}
+		},
+		doPopDialog({e, pointInGrid, pointInPixel}) {
+			const point = {
+				x: pointInPixel[0],
+				y: pointInPixel[1]
+			}
+
+			if (e.componentType == "series" &&
+				e.componentSubType == "line" &&
+				e.seriesName.includes('service')) {
+
+				const option = this.myChart.getOption();
+				const dataList = option.series[e.seriesIndex].data;
+				const length = dataList.length;
+				const near = dataList[e.dataIndex+1];
+				const prev = utils.findPrev(dataList, e.dataIndex, (el, i) => { return el instanceof Array});
+				const next = utils.findNext(dataList, e.dataIndex, (el, i) => { return el instanceof Array});
+
+				this.doSetSelected({e, pointInGrid});
+
+				if (e.dataIndex < length - 1 && e.value[1] == near[1]) {
+					this.$store.dispatch('menuOperation/setPopMenu', { position: point, menu: utils.MenuEnum.planJustStop });
+				} else if (e.dataIndex < length - 1 && e.value[1] != near[1] && e.value[1] == next[1]) {
+					this.$store.dispatch('menuOperation/setPopMenu', { position: point, menu: utils.MenuEnum.planJustTurnBack });
+				} else if (e.dataIndex == 0 ||  e.dataIndex > 0 && e.value[1] == prev[1]) {
+					this.$store.dispatch('menuOperation/setPopMenu', { position: point, menu: utils.MenuEnum.planJustRunning });
+				}
+			} else if (e.target && e.target.subType == 'area') {
+				if (this.model.action == 'Note') {
+					this.$store.dispatch('menuOperation/setPopMenu', { position: point, menu: utils.MenuEnum.planSetAreaNote });
+				}
+			}
+		},
+		doSetInput({e}) {
+			if (e.target && ['area'].includes(e.target.subType)) {
+				this.$emit('setInput', e.target);
+			}
+		},
+		doSeriesDragging({e, pointInGrid}) {
+			if (this.selected) {
+				this.dragging = true;
+				this.calcSeriesDragging({e, pointInGrid});
+			}
+		},
+		doAreaDragging({e, pointInGrid}) {
+			if (this.target && ['area'].includes(this.target.subType)) {
+				this.dragging = true;
+				this.calcAreaDragging({e, pointInGrid});
+			}
+		},
+		doAreaHornDragging({e, pointInGrid}) {
+			if (this.drag && ['drag'].includes(this.drag.subType)) {
+				this.dragging = true;
+				this.calcHornDragging({e, pointInGrid});
+			}
+		},
+		doTranslateSeries({e, pointInGrid}) {
+			if (this.dragging) {
+				this.dragging = false;
+				this.calcSeriesDragging({e, pointInGrid});
+				this.$emit('translate');
+			}
+		},
+		doTranslateArea({e, pointInGrid}) {
+			if (this.dragging) {
+				this.dragging = false;
+				this.calcAreaDragging({e, pointInGrid});
+				this.$emit('translate');
+			}
+		},
+		doTranslateHorn({e, pointInGrid}) {
+			if (this.dragging) {
+				this.dragging = false;
+				this.calcHornDragging({e, pointInGrid});
+				this.$emit('translate');
+			}
+		},
+		calcSeriesDragging({e, pointInGrid}) {
+			const offset = this.offset;
+			const dx =pointInGrid[0] - offset.x;
+
+			offset.x = pointInGrid[0];
+			offset.y = pointInGrid[1];
+			this.selected.time += dx;
+
+			const option = this.myChart.getOption();
+			const series = option.series[this.selected.seriesIndex]
+
+			series.data.forEach(el => {
+				if (el instanceof Array) {
+					el[0] += dx;
+				} else {
+					el.value[0] += dx;
+				}
+			});
+
+			series.markPoint.data.forEach(el => {
+				el.coord[0] += dx;
+			})
+
+			if (e.target &&
+				e.target.point &&
+				e.target.position) {
+				e.target.point[0] += dx;
+			}
+
+			this.myChart.setOption(option, true);
+		},
+		calcAreaDragging({e, pointInGrid}) {
+			const model = this.target.model;
+			const offset = this.offset;
+
+			const dx = pointInGrid[0] - offset.x;
+			const dy = pointInGrid[1] - offset.y;
+
+			offset.x = pointInGrid[0];
+			offset.y = pointInGrid[1];
+
+			model.startTime += dx;
+			model.endTime += dx;
+			model.fartherKmRange += dy;
+			model.closerKmRange += dy;
+
+			this.planUtil.limitAreaTime(model);
+			if (this.planUtil.limitAreaKmRange(this.stations, model)) {
+				this.onZrMouseUp(e);
+			}
+		},
+		calcHornDragging({e, pointInGrid}) {
+			const option = this.myChart.getOption();
+			const drag = this.drag;
+			const offset = this.offset;
+			const model = this.target.model;
+
+			const elements = option.graphic[0].elements.filter(el => { return ['drag'].includes(el.subType) });
+			const index = elements.findIndex(el => { return drag.name == el.name; });
+
+			offset.x = pointInGrid[0];
+			offset.y = pointInGrid[1];
+
+			const time = pointInGrid[0];
+			const kmRange = this.planUtil.getKmRangeByCoordinateY(pointInGrid[1]);
+
+			switch(index) {
+				case 0:
+					if (time < model.endTime) {
+						model.startTime = time;
+					}
+					if (model.closerKmRange < kmRange) {
+						model.fartherKmRange = kmRange;
+					}
+				break;
+				case 1:
+					if (model.startTime < time) {
+						model.endTime = time;
+					}
+					if (model.closerKmRange < kmRange) {
+						model.fartherKmRange = kmRange;
+					}
+				break;
+				case 2:
+					if (model.startTime < time) {
+						model.endTime = time;
+					}
+					if (kmRange < model.fartherKmRange) {
+						model.closerKmRange = kmRange;
+					}
+				break;
+				case 3:
+					if (time < model.endTime) {
+						model.startTime = time;
+					}
+					if (kmRange < model.fartherKmRange) {
+						model.closerKmRange = kmRange;
+					}
+				break;
+			}
+
+			this.planUtil.limitAreaTime(model);
+			if (this.planUtil.limitAreaKmRange(this.stations, model)) {
+				this.onZrMouseUp(e);
+			}
+
+			const args = this.planUtil.calcAreaArgsByModel(this.myChart, model);
+			const elemList = option.graphic[0].elements.filter(el => { return !['drag'].includes(el.subType) });
+			const elem = option.graphic[0].elements.find(el => { return ['area'].includes(el.subType) && el.model.areaNo == model.areaNo; });
+
+			if (elem) {
+				elem.position = args.position;
+				elem.point1 = args.point1;
+				elem.point2 = args.point2;
+				elem.shape.width = args.width;
+				elem.shape.height = args.height;
+				elem.style.textOffset = [ -args.width/2, -args.height/2 ];
+				option.graphic[0].elements = this.calcHornList(elemList, elem);
+			}
+
+			this.myChart.setOption(option, true);
+		}
+	}
+}
diff --git a/src/views/planMonitor/editToolAUS/tool/schedule.vue b/src/views/planMonitor/editToolAUS/tool/schedule.vue
new file mode 100644
index 000000000..19fcc1cb3
--- /dev/null
+++ b/src/views/planMonitor/editToolAUS/tool/schedule.vue
@@ -0,0 +1,515 @@
+<template>
+  <div id="PlanSchedule">
+    <el-card class="box-card">
+		<div slot="header" >
+			<slot name="header" />
+		</div>
+        <div :id="canvasId" />
+		<slot />
+    </el-card>
+  </div>
+</template>
+
+<script>
+import * as utils from '../utils'
+import echarts from 'echarts';
+import Monitor from './monitor.js';
+import { timeFormat } from '@/utils/date';
+
+export default {
+    mixins: [Monitor],
+    props: {
+        planUtil: {
+            type: Object,
+            required: true
+		},
+		model: {
+			type: Object,
+			required: true
+		},
+		width: {
+            type: Number,
+            required: true
+        },
+        height: {
+            type: Number,
+            required: true
+		},
+		title: {
+			type: String,
+			default: ''
+		},
+		canvasId: {
+			type: String,
+			default: 'canvas-plan'
+		}
+    },
+    data() {
+        return {
+			myChart: null,
+			stations: [],
+			planData: [],
+        };
+	},
+	computed: {
+		 option() {
+            return {
+                title: {
+                    text: this.title,
+                    left: 'center',
+                    top: '10px'
+                },
+                grid: {
+                    top: '60px',
+                    left: '160px',
+                    right: '100px',
+                    bottom: '80px',
+                    containLabel: true,
+                    backgroundColor: 'floralwhite'
+                },
+                toolbox: {
+                },
+                tooltip: {
+                    trigger: 'item',
+                    axisPointer: {
+                        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
+                            }
+                        },
+                        axisLabel: {
+                            formatter: this.xAxisLabelFormat,
+                            textStyle: {
+                                color: '#333'
+                            }
+						},
+                        axisPointer: {
+                            label: {
+                                formatter: this.xAxisPointFormat,
+                                backgroundColor: 'rgb(255,0,0,0.5)',
+                                color: 'white'
+                            }
+                        }
+                    }
+                ],
+                yAxis: {
+					type: 'value',
+                    splitLine: {
+                        show: false
+                    },
+                    axisTick: {
+						inside: true,
+						show: false
+					},
+                    axisLine: {
+                        onZero: false,
+                        lineStyle: {
+                            width: 1
+                        }
+                    },
+                    axisLabel: {
+						show:true,
+                        inside:true,
+                        formatter: this.yAxisLabelFormat
+                    },
+                    axisPointer: {
+                        label: {
+                            formatter: this.yAxisPointFormat,
+                            backgroundColor: 'rgb(0,100,0,0.5)',
+                            color: 'white'
+                        }
+					},
+					minInterval: 0.1,
+					maxInterval: 1,
+                    min: 0,
+                    max: 0
+                },
+                graphic: [{
+                    id: 'shape',
+                    elements: []
+                }],
+                series: [],
+                dataZoom: [
+                    {
+                        type: 'inside',
+                        zoomOnMouseWheel : true,
+                        moveOnMouseMove : 'ctrl',
+                    },
+                    {
+                        fiterMode: 'filter',
+						handleSize: '80%',
+                        handleStyle: {
+                            color: '#fff',
+                            shadowBlur: 3,
+                            shadowColor: 'rgba(0, 0, 0, 0.6)',
+                            shadowOffsetX: 2,
+                            shadowOffsetY: 2
+						},
+						rangeMode: 'percent',
+						labelFormatter: this.dataZoomFormat,
+                        bottom: '20px'
+                    }
+                ]
+            }
+		}
+	},
+	watch: {
+		width() {
+			this.reSize({width: this.width, height: this.height})
+		},
+		height() {
+			this.reSize({width: this.width, height: this.height})
+		}
+	},
+	mounted() {
+		this.loadInitChart();
+	},
+    beforeDestroy() {
+        this.destroy();
+    },
+    methods: {
+		xAxisPointFormat(params) {
+            return timeFormat(params.value);
+        },
+        yAxisPointFormat(params) {
+            return this.planUtil.computedFormatYAxis(this.stations, params);
+        },
+        xAxisLabelFormat(value, index) {
+			return timeFormat(value);
+        },
+        yAxisLabelFormat(value, index) {
+            return '';
+		},
+		dataZoomFormat(value) {
+			return timeFormat(value);
+		},
+		axisTooltip(param) {
+			let data = '';
+
+			if (param.data &&
+				param.data.length) {
+				const xVal = param.data[0];
+				const yObj = param.data[2];
+				const station = this.stations.find(el => { return el.id == yObj.stationId })||{ name: '', kmRange: ''};
+				const list = [
+					`ServiceNo: ${yObj.serviceNo}<br>`,
+					`TripNo: ${yObj.tripNo}<br>`,
+					`Direction: ${yObj.direction == 2? 'Up': 'Down'}<br>`,
+					`Station name: ${station.name}<br>`,
+					`Kilometer post: ${station.kmRange} m <br>`,
+					`Arrival time: ${timeFormat(xVal + this.planUtil.TranslationTime)}<br>`,
+					`<hr size=1 style="margin: 3px 0">`
+				];
+				data += list.join('');
+			}
+            return data;
+        },
+        loadInitChart() {
+            return new Promise((resolve, reject) => {
+                try {
+                    if (this.myChart && this.myChart.isDisposed) {
+                        this.myChart.clear();
+                    }
+
+					this.myChart = echarts.init(document.getElementById(this.canvasId));
+					this.myChart.setOption(this.option, true);
+					this.reSize({ width: this.width, height: this.height });
+                    resolve(true);
+                } catch (error) {
+                    reject(error);
+                }
+            });
+		},
+		loadChartPage(stations) {
+            try {
+				if (this.myChart) {
+					this.myChart.showLoading();
+
+					this.stations = stations;
+					this.xAxisInit(stations);
+					this.yAxisInit(stations);
+
+					this.myChart.setOption(this.option, true);
+					this.myChart.hideLoading();
+				}
+            } catch (error) {
+				console.error(error);
+                this.$messageBox(error.message);
+            }
+        },
+		loadChartData(planData) {
+            try {
+				const option = this.myChart.getOption();
+
+				option.title.text = this.title;
+				option.series = [];
+                option.graphic[0].elements = [];
+
+				this.planData = planData;
+
+                this.pushModels(option.series, [this.planUtil.initializeYaxis(this.stations)]);
+                this.pushModels(option.series, this.planUtil.parseDataToSeries(this.myChart, planData, this.stations));
+				this.pushModels(option.graphic[0].elements, this.planUtil.parseDataToGraph(this.myChart, planData, this.stations));
+
+				const elemList = option.graphic[0].elements.filter(el => { return el.subType == 'area'});
+				elemList.forEach(el => {
+					el.draggable = false;
+					el.ondrag = echarts.util.curry(this.onShapeDragging);
+				});
+
+				if (this.model.choice == 'Construction' && this.target) {
+					elemList.forEach(el => {
+						if (this.model.action == 'Translate' &&
+							this.target.model &&
+							this.target.model.areaNo == el.model.areaNo) {
+							el.draggable = true;
+						}
+					})
+
+					if (this.model.action == 'Edit' &&
+						this.target.model) {
+						const elemList = option.graphic[0].elements.filter(el => { return !['drag'].includes(el.subType) });
+						const elem = option.graphic[0].elements.find(el => { return ['area'].includes(el.subType) && el.model.areaNo == this.target.model.areaNo; });
+						if (elem) {
+							option.graphic[0].elements = this.calcHornList(elemList, elem);
+						}
+					}
+				}
+
+				this.myChart.setOption(option, true);
+
+				if (this.model.choice == 'Plan') {
+					this.setLineLight();
+				}
+
+				if (this.model.choice == 'Construction') {
+					this.setTargetLight();
+				}
+            } catch (error) {
+				console.error(error);
+                this.$messageBox(error.message);
+            }
+        },
+        xAxisInit(stations) {
+			const option = this.option;
+			const startValue = this.planUtil.MinTime + this.planUtil.TranslationTime;
+            const endValue = this.planUtil.MaxTime + this.planUtil.TranslationTime;
+			const list = [];
+
+            for (var time = startValue; time <= endValue; time++) {
+                list.push(time);
+            }
+
+            option.xAxis[0].data = list;
+            if (!option.dataZoom[0].startValue) {
+                option.dataZoom[0].startValue = option.dataZoom[1].startValue = startValue;
+            }
+
+            if (!option.dataZoom[0].endValue) {
+                option.dataZoom[0].endValue = option.dataZoom[1].endValue = endValue;
+            }
+        },
+        yAxisInit(stations) {
+			const option = this.option;
+            if (Object.keys(this.planUtil).length) {
+				this.pushModels(option.series, [this.planUtil.initializeYaxis(stations)]);
+
+                option.yAxis.min = this.planUtil.computedYaxisMinValue(stations);
+				option.yAxis.max = this.planUtil.computedYaxisMaxValue(stations);
+            }
+        },
+        reSize({width, height}) {
+            if (this.myChart) {
+                this.myChart.resize({ width, height, silent: false });
+            }
+		},
+		clear() {
+            if (this.myChart) {
+                this.myChart.clear();
+            }
+		},
+		destroy() {
+            if (this.myChart && this.myChart.isDisposed) {
+                this.myChart.dispose();
+                this.myChart = null;
+            }
+		},
+		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;
+		},
+		setLineLight() {
+			if (this.selected) {
+				this.myChart.setOption({
+					series: {
+						name: this.selected.seriesName,
+						symbolSize: 6,
+						showAllSymbol: true,
+						lineStyle: {
+							width: 2,
+							color: '#0000FF'
+						}
+					}
+				});
+			}
+		},
+		setLineReset() {
+			if (this.selected) {
+				this.myChart.setOption({
+					series: {
+						name: this.selected.seriesName,
+						symbolSize: 1,
+						showAllSymbol: true,
+						lineStyle: {
+							width: 1,
+							color: '#000000'
+						}
+					}
+				});
+			}
+		},
+		setTargetLight() {
+			if (this.target) {
+				const option = this.myChart.getOption();
+				const model =this.target.model;
+				const elem = option.graphic[0].elements.find(el => { return ['area'].includes(el.subType) && el.model.areaNo == model.areaNo; });
+				if (elem) {
+					elem.style.fill = 'rgb(255,0,0, 0.6)';
+				}
+				this.myChart.setOption({graphic: option.graphic});
+			}
+		},
+		setTargetReset() {
+			if (this.target) {
+				const option = this.myChart.getOption();
+				const model = this.target.model;
+				const elem = option.graphic[0].elements.find(el => { return ['area'].includes(el.subType) && el.model.areaNo == model.areaNo; });
+				if (elem) {
+					elem.style.fill = 'rgb(255,0,0, 0.3)';
+				}
+				this.myChart.setOption({graphic: option.graphic});
+			}
+		},
+		clearDraggable(labels=['area']) {
+			const option = this.myChart.getOption();
+			const elements = option.graphic[0].elements;
+			const elemList = elements.filter(el => { return labels.includes(el.subType)});
+
+			elemList.forEach(el => {
+				el.draggable = false;
+			})
+
+			this.myChart.setOption(option, true);
+		},
+		clearTrip() {
+			const option = this.myChart.getOption();
+			const index = option.series.findIndex(el => { return el.name.includes('service-trip') });
+			if (index >= 0) {
+				option.series[index].data = [];
+				this.myChart.setOption(option, true);
+			}
+		},
+		clearGraphic(labels=['drag', 'mark']) {
+			const option = this.myChart.getOption();
+			const elements = option.graphic[0].elements;
+			option.graphic[0].elements = elements.filter(el => { return !labels.includes(el.subType)});
+			this.myChart.setOption(option, true);
+		},
+		calcHornList(elemList, elem) {
+			const p = elem.position;
+			const x = elem.shape.x;
+			const y = elem.shape.y;
+			const w = elem.shape.width;
+			const h = elem.shape.height;
+			const point1 = [p[0]+x, p[1]+y];
+			const point2 = [p[0]+x+w, p[1]+y];
+			const point3 = [p[0]+x+w, p[1]+y+h];
+			const point4 = [p[0]+x, p[1]+y+h];
+
+			elemList.push(utils.buildHornDataObj(point1, this.myChart.convertFromPixel('grid', point1), this, 'horn-1'));
+			elemList.push(utils.buildHornDataObj(point2, this.myChart.convertFromPixel('grid', point2), this, 'horn-2'));
+			elemList.push(utils.buildHornDataObj(point3, this.myChart.convertFromPixel('grid', point3), this, 'horn-3'));
+			elemList.push(utils.buildHornDataObj(point4, this.myChart.convertFromPixel('grid', point4), this, 'horn-4'));
+
+			return elemList;
+		},
+		setAreaClipPath() {
+			// const option = this.myChart.getOption();
+			// const mw = this.myChart.getWidth()-100;
+			// const mh = this.myChart.getHeight()-80;
+
+			// const view = this.myChart.getViewOfComponentModel({__viewId: "_ec_shape_graphic"});
+			// if (view.group) {
+			// 	view.group.eachChild(el => {
+			// 		if (['area'].includes(el.subType)) {
+			// 			const w = Math.abs(el.point2[0]-el.point1[0]);
+			// 			const h = Math.abs(el.point2[1]-el.point1[1]);
+			// 			const x = el.position[0] < 160
+			// 				? 160 - el.position[0]
+			// 				: 0;
+			// 			const y = el.position[1] < 60
+			// 				? 60 - el.position[1]
+			// 				: 0;
+			// 			const dw = el.position[0]+w > mw
+			// 				? el.position[0]+w-mw
+			// 				: x;
+			// 			const dh = el.position[1]+h > mh
+			// 				? el.position[1]+h-mh
+			// 				: y;
+
+			// 			const clipPath = new echarts.graphic.Rect({shape: {x, y, width: Math.abs(w-dw), height:  Math.abs(h-dh)}});
+			// 			el.setClipPath(clipPath);
+			// 			el.dirty();
+			// 		}
+			// 	})
+			// }
+		}
+    }
+};
+</script>
+<style scoped rel="stylesheet/scss" lang="scss">
+    @import "src/styles/mixin.scss";
+
+    #PlanSchedule {
+        z-index: 0;
+        width: 100%;
+        height: 100%;
+        position: relative;
+    }
+</style>
diff --git a/src/views/planMonitor/editToolAUS/utils.js b/src/views/planMonitor/editToolAUS/utils.js
new file mode 100644
index 000000000..e00416cbe
--- /dev/null
+++ b/src/views/planMonitor/editToolAUS/utils.js
@@ -0,0 +1,131 @@
+import echarts from 'echarts';
+
+export const MenuEnum = {
+	planJustRunning: '1000',
+	planJustStop: '1001',
+	planSetParams: '1002',
+	planModifyArea: '1003',
+	planSetAreaNote: '1004',
+	planJustTurnBack: '1005'
+}
+
+export function buildHornDataObj(position, point, that, name='') {
+	return {
+		type: 'circle',
+		subType: 'drag',
+		position: [...position],
+		point: [...point],
+		model: {},
+		name,
+		shape: {
+			cx: 0,
+			cy: 0,
+			r: 6
+		},
+		style: {
+			fill: 'rgba(0,0,0,0.3)'
+		},
+		draggable: 'true',
+		ondrag: echarts.util.curry(that.onShapeDragging),
+		z: 100
+	}
+}
+
+export function buildDragDataObj(position, point, that, name='') {
+	return {
+		type: 'circle',
+		subType: 'drag',
+		position: [...position],
+		point: [...point],
+		model: {},
+		name,
+		shape: {
+			cx: 0,
+			cy: 0,
+			r: 6
+		},
+		invisible: true,
+		draggable: 'horizontal',
+		onmouseover: echarts.util.curry(that.onShapeMouseOver),
+		ondrag: echarts.util.curry(that.onShapeDragging),
+		onmouseout: echarts.util.curry(that.onShapeMouseOut),
+		z: 100
+	}
+}
+
+export function buildMarkPointObj(position, point, that, name='') {
+	return {
+		type: 'circle',
+		subType: 'mark',
+		z: 100,
+		position: [...position],
+		point: [...point],
+		model: {},
+		name,
+		shape: {
+			cx: 0,
+			cy: 0,
+			r: 10
+		},
+		style: {
+			fill: 'rgba(0,0,0,0.3)'
+		}
+	}
+}
+
+export function createTripModel(opt, lineStyle={}, itemStyle={}) {
+	return {
+		z: opt.z || 10,
+		type: 'line',
+		name: opt.name,
+		data: opt.data,
+		sampling: 'average',
+		symbolSize: opt.symbolSize,
+		showAllSymbol: opt.showAllSymbol||'auto',
+		lineStyle: lineStyle,
+		itemStyle: itemStyle,
+		animation: false
+	};
+}
+
+export function findNext(list, idx, cb) {
+	for(var i = idx+1; i < list.length; i++) {
+		if (cb(list[i], i)) {
+			return list[i];
+		}
+	}
+	return null;
+}
+
+export function findPrev(list, idx, cb) {
+	for(var i = idx-1; i >= 0; i--) {
+		if (cb(list[i], i)) {
+			return list[i];
+		}
+	}
+	return null;
+}
+
+export function dataURItoBlob(dataURI, dataTYPE) {
+var binary = atob(dataURI.split(',')[1]), array = [];
+for(var i = 0; i < binary.length; i++) array.push(binary.charCodeAt(i));
+return new Blob([new Uint8Array(array)], {type: dataTYPE});
+}
+
+const ModifyFlag = 'AUS-modify-flag'
+export function getModifyState(planId) {
+	const state = JSON.parse(localStorage.getItem(ModifyFlag)||`{ }`);
+	return state[planId];
+}
+export function setModifyState(planId, bool) {
+	const state = JSON.parse(localStorage.getItem(ModifyFlag)||`{ }`);
+	bool
+		? state[planId] = bool
+		: delete state[planId]
+	localStorage.setItem(ModifyFlag, JSON.stringify(state));
+}
+export function delModifyState(planId) {
+	const state = JSON.parse(localStorage.getItem(ModifyFlag)||`{ }`);
+	delete state[planId];
+	localStorage.setItem(ModifyFlag, JSON.stringify(state));
+}
diff --git a/src/views/planMonitor/newEditTool/menus/addTask.vue b/src/views/planMonitor/newEditTool/menus/addTask.vue
index 02e6f11f1..6f6685dcd 100644
--- a/src/views/planMonitor/newEditTool/menus/addTask.vue
+++ b/src/views/planMonitor/newEditTool/menus/addTask.vue
@@ -141,7 +141,7 @@
 <script>
 import { getRoutingList, querySectionListByRouting, addPlanTrip, getMapStationRun } from '@/api/runplan';
 import { formatTime, formatName } from '@/utils/runPlan';
-import { getUID } from '@/jmap/utils/Uid';
+import { getUID } from '@/jmapNew/utils/Uid';
 
 export default {
     name: 'AddTask',
diff --git a/src/views/planMonitor/newEditTool/menus/editPlanningTrain.vue b/src/views/planMonitor/newEditTool/menus/editPlanningTrain.vue
index 385d56511..b6bda4cfa 100644
--- a/src/views/planMonitor/newEditTool/menus/editPlanningTrain.vue
+++ b/src/views/planMonitor/newEditTool/menus/editPlanningTrain.vue
@@ -63,7 +63,7 @@
 <script>
 import { formatName, formatTime } from '@/utils/runPlan';
 import { addPlanService } from '@/api/runplan';
-import { getUID } from '@/jmap/utils/Uid';
+import { getUID } from '@/jmapNew/utils/Uid';
 
 export default {
     name: 'EditPlanningTrain',
diff --git a/src/views/planSchedule/index.vue b/src/views/planSchedule/index.vue
index 5ef6d523e..b00fb12d1 100644
--- a/src/views/planSchedule/index.vue
+++ b/src/views/planSchedule/index.vue
@@ -38,7 +38,7 @@ export default {
         }
     },
     data() {
-    	return {};
+        return {};
     },
     computed: {
         skinCode() {
diff --git a/src/views/planSchedule/menuBar.vue b/src/views/planSchedule/menuBar.vue
index 5e3b63b01..cef0f2fd9 100644
--- a/src/views/planSchedule/menuBar.vue
+++ b/src/views/planSchedule/menuBar.vue
@@ -3,23 +3,23 @@
     <div class="nav">
       <template v-for="(item,i) in menu">
         <template v-if="noShowingChildren(item.children)">
-          <li class="nav-li" @click="hookClick(item)">
+          <li :key="i" class="nav-li" @click="hookClick(item)">
             <span class="nav-li-text">{{ item.title }}</span>
           </li>
         </template>
         <template v-else>
-          <li class="nav-li" @click.stop="popupMenuA(item, i)">
+          <li :key="i" class="nav-li" @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'" class="menu-separator">
+                  <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.type === 'file'" class="menu-li">
+                  <li v-else-if="child.type === 'file'" :key="j" class="menu-li">
                     <div class="menu-li-block">
                       <span class="menu-li-text">
                         <span class="status">&ensp;</span>
@@ -35,7 +35,7 @@
                       </span>
                     </div>
                   </li>
-                  <li v-else class="menu-li" @click.stop="popupMenuB(child, j)">
+                  <li v-else :key="j" class="menu-li" @click.stop="popupMenuB(child, j)">
                     <div class="menu-li-block">
                       <span class="menu-li-text">
                         <span class="status">&ensp;</span>
@@ -43,12 +43,12 @@
                       </span>
                     </div>
                     <ul class="menu-ul" :class="{'active' :j==classB}">
-                      <template v-for="(grandchild,k) in child.children">
-                        <li v-if="grandchild.type === 'separator'" class="menu-separator">
+                      <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.type === 'file'" class="menu-li">
+                        <li v-else-if="grandchild.type === 'file'" :key="k" class="menu-li">
                           <div class="menu-li-block">
                             <span class="menu-li-text">
                               <span class="status">&ensp;</span>
@@ -68,7 +68,7 @@
                             </span>
                           </div>
                         </li>
-                        <li v-else class="menu-li" @click.stop="hookClick(grandchild)">
+                        <li v-else :key="k" class="menu-li" @click.stop="hookClick(grandchild)">
                           <div class="menu-li-block">
                             <span class="menu-li-text">
                               <span class="status">&ensp;</span>
@@ -81,11 +81,11 @@
                   </li>
                 </template>
                 <template v-else>
-                  <li v-if="child.type === 'separator'" class="menu-separator">
+                  <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.type === 'file'" class="menu-li">
+                  <li v-else-if="child.type === 'file'" :key="j" class="menu-li">
                     <div class="menu-li-block">
                       <span class="menu-li-text">
                         <span class="status">&ensp;</span>
@@ -101,7 +101,7 @@
                       </span>
                     </div>
                   </li>
-                  <li v-else class="menu-li" @click.stop="hookClick(child)">
+                  <li v-else :key="j" class="menu-li" @click.stop="hookClick(child)">
                     <div class="menu-li-block">
                       <span class="menu-li-text">
                         <span class="status">&ensp;</span>
diff --git a/src/views/planSchedule/menuTool.vue b/src/views/planSchedule/menuTool.vue
index a2ee9e8f0..61d2c3a47 100644
--- a/src/views/planSchedule/menuTool.vue
+++ b/src/views/planSchedule/menuTool.vue
@@ -125,7 +125,7 @@ export default {
 };
 </script>
 
-<style scoped rel="stylesheet/scss" lang="scss" scoped>
+<style scoped rel="stylesheet/scss" lang="scss">
     @import "src/styles/mixin.scss";
     $top: 48px;
     $width: 25px;
diff --git a/src/views/planSchedule/titleBar.vue b/src/views/planSchedule/titleBar.vue
index 653dcf657..8a6fda1ec 100644
--- a/src/views/planSchedule/titleBar.vue
+++ b/src/views/planSchedule/titleBar.vue
@@ -8,7 +8,6 @@
 </template>
 
 <script>
-// import logo_ from '@/assets/logo_.png';
 import { getPublishMapInfo } from '@/api/jmap/map';
 import { ProjectIcon } from '@/scripts/ProjectConfig';
 import { getSessionStorage } from '@/utils/auth';
@@ -42,7 +41,7 @@ export default {
     }
 };
 </script>
-<style scoped rel="stylesheet/scss" lang="scss" scoped>
+<style scoped rel="stylesheet/scss" lang="scss">
     @import "src/styles/mixin.scss";
     $width: 25px;
     $height: 25px;
diff --git a/src/views/publish/examRule/draft/editRule.vue b/src/views/publish/examRule/draft/editRule.vue
index 0e10f55ce..3b3129831 100644
--- a/src/views/publish/examRule/draft/editRule.vue
+++ b/src/views/publish/examRule/draft/editRule.vue
@@ -49,10 +49,6 @@ export default {
             type: Object,
             required: true
         },
-        drawWay: {
-            type: Boolean,
-            default: false
-        },
         lineCode: {
             type: String,
             default: ''
@@ -132,64 +128,39 @@ export default {
     async mounted() {
         await this.getList();
         await this.refresh();
-        if (this.drawWay) {
-            this.trainingOperateTypeMap = getTrainingOperateTypeMap();
-            const lineCode = this.lineCode;
-            const res = await getCmdList(lineCode, {});
-            const trainingOperateList = [];
-            const trainingOperateConfigList = [];
-            const operateTypeMap = {
-                Switch: [],
-                Section: [],
-                Signal: [],
-                Stand: [],
-                Station: [],
-                ControlConvertMenu: [],
-                TrainWindow: [],
-                LimitControl: [],
-                Driver: []
-            };
-            if (res && res.code === 200) {
-                res.data.forEach(item => {
-                    this.trainingOperateTypeMap[item.operateObject].forEach(ele => {
-                        if (ele.value == item.operate && !this.checkIncludes(operateTypeMap[item.operateObject], ele)) {
-                            operateTypeMap[item.operateObject].push({name: ele.label, code: ele.value});
-                        }
-                    });
-                    if (!trainingOperateList.includes(item.operateObject)) {
-                        trainingOperateList.push(item.operateObject);
-                        const objectLabel = ConstConfig.ConstSelect.trainingDeviceType[item.operateObject] || {};
-                        trainingOperateConfigList.push({code: item.operateObject, name: Cookies.get('user_lang') == 'en' ? objectLabel.enlabel : objectLabel.label});
+        this.trainingOperateTypeMap = getTrainingOperateTypeMap();
+        const lineCode = this.lineCode;
+        const res = await getCmdList(lineCode, {});
+        const trainingOperateList = [];
+        const trainingOperateConfigList = [];
+        const operateTypeMap = {
+            Switch: [],
+            Section: [],
+            Signal: [],
+            Stand: [],
+            Station: [],
+            ControlConvertMenu: [],
+            TrainWindow: [],
+            LimitControl: [],
+            Driver: []
+        };
+        if (res && res.code === 200) {
+            res.data.forEach(item => {
+                this.trainingOperateTypeMap[item.operateObject].forEach(ele => {
+                    if (ele.value == item.operate && !this.checkIncludes(operateTypeMap[item.operateObject], ele)) {
+                        operateTypeMap[item.operateObject].push({name: ele.label, code: ele.value});
                     }
                 });
-                this.options = trainingOperateConfigList;
-                this.trainingOperateTypeMap = operateTypeMap;
-            } else {
-                this.$message.error(this.$t('error.failedToObtainTrainingType'));
-            }
+                if (!trainingOperateList.includes(item.operateObject)) {
+                    trainingOperateList.push(item.operateObject);
+                    const objectLabel = ConstConfig.ConstSelect.trainingDeviceType[item.operateObject] || {};
+                    trainingOperateConfigList.push({code: item.operateObject, name: Cookies.get('user_lang') == 'en' ? objectLabel.enlabel : objectLabel.label});
+                }
+            });
+            this.options = trainingOperateConfigList;
+            this.trainingOperateTypeMap = operateTypeMap;
         } else {
-            this.trainingOperateTypeMap = {};
-            this.$Dictionary.stationControl().then(list => {
-                this.trainingOperateTypeMap['01'] = list; // 控制权实训
-            });
-            this.$Dictionary.signalOperation().then(list => {
-                this.trainingOperateTypeMap['02'] = list; // 信号机实训
-            });
-            this.$Dictionary.switchOperation().then(list => {
-                this.trainingOperateTypeMap['03'] = list; // 道岔实训
-            });
-            this.$Dictionary.sectionOperation().then(list => {
-                this.trainingOperateTypeMap['04'] = list; // 区段实训
-            });
-            this.$Dictionary.stationStandOperation().then(list => {
-                this.trainingOperateTypeMap['05'] = list; // 站台实训
-            });
-            this.$Dictionary.trainPlanOperation().then(list => {
-                this.trainingOperateTypeMap['06'] = list; // 行车计划实训
-            });
-            this.$Dictionary.trainOperation().then(list => {
-                this.trainingOperateTypeMap['07'] = list; // 列车实训
-            });
+            this.$message.error(this.$t('error.failedToObtainTrainingType'));
         }
     },
     methods: {
diff --git a/src/views/publish/examRule/draft/examFrom.vue b/src/views/publish/examRule/draft/examFrom.vue
index 04a9eb850..e3ccab878 100644
--- a/src/views/publish/examRule/draft/examFrom.vue
+++ b/src/views/publish/examRule/draft/examFrom.vue
@@ -72,8 +72,8 @@
 </template>
 
 <script>
-import { getPublishLessonList } from '@/api/jmap/lesson';
-import { getExamLessonDetail, updateExamRules, getExamClassList } from '@/api/management/exam';
+import { getPublishLessonList, getExamClassList } from '@/api/jmap/lesson';
+import { getExamLessonDetail, updateExamRules } from '@/api/management/exam';
 import { getSessionStorage } from '@/utils/auth';
 
 export default {
diff --git a/src/views/publish/examRule/draft/index.vue b/src/views/publish/examRule/draft/index.vue
index 87da5fbdf..ffbb4056c 100644
--- a/src/views/publish/examRule/draft/index.vue
+++ b/src/views/publish/examRule/draft/index.vue
@@ -13,7 +13,7 @@
           <exam-from ref="exam" @definition="definition" @createQuickly="createQuicklySave" />
         </template>
         <template v-else class="rule">
-          <rule-from ref="rule" :course="course" :draw-way="drawWay" :line-code="lineCode" @regulation="regulation" />
+          <rule-from ref="rule" :course="course" :line-code="lineCode" @regulation="regulation" />
         </template>
       </div>
       <div class="draft">
@@ -52,7 +52,6 @@ export default {
             lessonName: '',
             formData: {},
             mapId: '',
-            drawWay: false,
             lineCode: '',
             OrganizationList: []
         };
@@ -83,7 +82,6 @@ export default {
                 if (elem.id === val.region) {
                     this.mapId = elem.mapId;
                     getPublishMapInfo(this.mapId).then(res=>{
-                        this.drawWay = res.data.drawWay;
                         this.lineCode = res.data.lineCode;
                     });
                 }
@@ -115,7 +113,6 @@ export default {
             });
             const res = await getPublishMapInfo(this.mapId);
             if (res.data) {
-                this.drawWay = res.data.drawWay;
                 this.lineCode = res.data.lineCode;
             }
         },
diff --git a/src/views/publish/examRule/draft/rule.vue b/src/views/publish/examRule/draft/rule.vue
index 5340fc303..1279bbf3d 100644
--- a/src/views/publish/examRule/draft/rule.vue
+++ b/src/views/publish/examRule/draft/rule.vue
@@ -17,7 +17,6 @@
     <edit-rule
       ref="addRule"
       :course-id="courseId"
-      :draw-way="drawWay"
       :line-code="lineCode"
       :edit-course="editCourse"
       @addRuleList="addRuleList"
@@ -28,7 +27,7 @@
 
 <script>
 import { getExamLessonDetail, setCourseList, setCourseListGzb } from '@/api/management/exam';
-import { getDetailList } from '@/api/management/dictionary';
+// import { getDetailList } from '@/api/management/dictionary';
 import { UrlConfig, getTrainingOperateTypeMap } from '@/scripts/ConstDic';
 import editRule from './editRule';
 import LangStorage from '@/utils/lang';
@@ -45,10 +44,6 @@ export default {
             type: Object,
             default: null
         },
-        drawWay: {
-            type: Boolean,
-            default: false
-        },
         lineCode: {
             type: String,
             default: ''
@@ -87,48 +82,15 @@ export default {
     watch: {
     },
     async mounted() {
-        if (this.drawWay) {
-            this.trainingOperateTypeMap = getTrainingOperateTypeMap();
-        } else {
-            this.trainingOperateTypeMap = {};
-            this.$Dictionary.stationControl().then(list => {
-                this.trainingOperateTypeMap['01'] = list; // 控制权实训
-            });
-            this.$Dictionary.signalOperation().then(list => {
-                this.trainingOperateTypeMap['02'] = list; // 信号机实训
-            });
-            this.$Dictionary.switchOperation().then(list => {
-                this.trainingOperateTypeMap['03'] = list; // 道岔实训
-            });
-            this.$Dictionary.sectionOperation().then(list => {
-                this.trainingOperateTypeMap['04'] = list; // 区段实训
-            });
-            this.$Dictionary.stationStandOperation().then(list => {
-                this.trainingOperateTypeMap['05'] = list; // 站台实训
-            });
-            this.$Dictionary.trainPlanOperation().then(list => {
-                this.trainingOperateTypeMap['06'] = list; // 行车计划实训
-            });
-            this.$Dictionary.trainOperation().then(list => {
-                this.trainingOperateTypeMap['07'] = list; // 列车实训
-            });
-        }
+        this.trainingOperateTypeMap = getTrainingOperateTypeMap();
         await this.getList();
         await this.init();
     },
     methods: {
         async getList() {
             this.typeList = [];
-            if (this.drawWay) {
-                for (const val in ConstConfig.ConstSelect.trainingDeviceType) {
-                    this.typeList.push({name: LangStorage.getLang() == 'en' ? ConstConfig.ConstSelect.trainingDeviceType[val].enlabel : ConstConfig.ConstSelect.trainingDeviceType[val].label, code: val});
-                }
-            } else {
-                await getDetailList('training_type').then(res => {
-                    this.typeList = res.data;
-                }).catch(error => {
-                    console.error(error);
-                });
+            for (const val in ConstConfig.ConstSelect.trainingDeviceType) {
+                this.typeList.push({name: LangStorage.getLang() == 'en' ? ConstConfig.ConstSelect.trainingDeviceType[val].enlabel : ConstConfig.ConstSelect.trainingDeviceType[val].label, code: val});
             }
         },
         async init() {
diff --git a/src/views/publish/publishMap/exportMap.vue b/src/views/publish/publishMap/exportMap.vue
index a320946c5..53782776a 100644
--- a/src/views/publish/publishMap/exportMap.vue
+++ b/src/views/publish/publishMap/exportMap.vue
@@ -27,6 +27,7 @@ export default {
                 { label: '3d数据', value: 'MAP_3D_DATA' },
                 { label: 'ibp数据', value: 'ibp' },
                 { label: '指令定义', value: 'COMMAND_DEFINITION' },
+                { label: '剧本数据', value: 'script' },
                 { label: '线路配置', value: 'REAL_LINE_CONFIG', selected: true }
             ]
         };
@@ -50,6 +51,7 @@ export default {
                     runPlan: this.checkList.includes('RUN_PLAN'),
                     map3dData: this.checkList.includes('MAP_3D_DATA'),
                     ibp: this.checkList.includes('ibp'),
+                    script:this.checkList.includes('script'),
                     commandDefinition: this.checkList.includes('COMMAND_DEFINITION'),
                     realLineConfig: this.checkList.includes('REAL_LINE_CONFIG')
                 };
diff --git a/src/views/publish/publishMap/index.vue b/src/views/publish/publishMap/index.vue
index e3870c6d4..20b938b30 100644
--- a/src/views/publish/publishMap/index.vue
+++ b/src/views/publish/publishMap/index.vue
@@ -11,7 +11,6 @@
 </template>
 
 <script>
-// getPublishMapExport
 import { getPublishMapList, delPublishMap, putMapOnLine, putMapOffLine, simulationCheck, localImportMap, updatePublishMapInfo, getPublishMapExport, getPublishMapImportNew } from '@/api/jmap/map';
 import { getLineCodeList } from '@/api/management/mapline';
 import localStore from 'storejs';
@@ -135,8 +134,7 @@ export default {
                             },
                             {
                                 name: this.$t('publish.simulationDataCheck'),
-                                handleClick: this.handleSimulationCheck,
-                                showControl: (row) => { return row.drawWay; }
+                                handleClick: this.handleSimulationCheck
                             },
                             {
                                 name: '导入',
diff --git a/src/views/publish/publishMap/mapSort.vue b/src/views/publish/publishMap/mapSort.vue
index 339ee4611..0a6bd6f7e 100644
--- a/src/views/publish/publishMap/mapSort.vue
+++ b/src/views/publish/publishMap/mapSort.vue
@@ -1,31 +1,31 @@
 <template>
-    <div class="card-box steps">
-        <el-steps :active="display">
-            <el-step :title="this.$t('system.mapSort')" icon="el-icon-edit-outline" />
-            <el-step title="" icon="el-icon-upload" />
-        </el-steps>
-        <el-card class="forms">
-            <filter-city ref="filerCity" filter-empty :query-function="queryFunction" :local-param-name="localParamName" @filterSelectChange="refresh" />
-            <div style="height:100%;overflow-y:auto">
-                <el-tree
-                    ref="mapTree"
-                    :data="treeData"
-                    :props="defaultProps"
-                    draggable
-                    :allow-drop="allowDrop"
-                    default-expand-all
-                    :allow-drag="allowDrag"
-                    expand-on-click-node
-                    highlight-current
-                    style="margin:20px; min-height:300px;"
-                    @node-drag-end="handleDragEnd"
-                ></el-tree>
-            </div>
-        </el-card>
-        <div class="draft">
-            <el-button type="primary" @click="goback">{{ $t('global.back') }}</el-button>
-        </div>
+  <div class="card-box steps">
+    <el-steps :active="display">
+      <el-step :title="this.$t('system.mapSort')" icon="el-icon-edit-outline" />
+      <el-step title="" icon="el-icon-upload" />
+    </el-steps>
+    <el-card class="forms">
+      <filter-city ref="filerCity" filter-empty :query-function="queryFunction" :local-param-name="localParamName" @filterSelectChange="refresh" />
+      <div style="height:100%;overflow-y:auto">
+        <el-tree
+          ref="mapTree"
+          :data="treeData"
+          :props="defaultProps"
+          draggable
+          :allow-drop="allowDrop"
+          default-expand-all
+          :allow-drag="allowDrag"
+          expand-on-click-node
+          highlight-current
+          style="margin:20px; min-height:300px;"
+          @node-drag-end="handleDragEnd"
+        />
+      </div>
+    </el-card>
+    <div class="draft">
+      <el-button type="primary" @click="goback">{{ $t('global.back') }}</el-button>
     </div>
+  </div>
 </template>
 
 <script>
@@ -75,7 +75,7 @@ export default {
             });
             toSortMap(questdata).then(resp => {
                 this.$message.success(this.$t('tip.mapSortSuccessfully'));
-            }).catch(error => {
+            }).catch(() => {
                 this.$messageBox(this.$t('tip.mapSortFailed'));
             });
         },
diff --git a/src/views/scriptManage/allScriptRole.vue b/src/views/scriptManage/allScriptRole.vue
index 32fe4c48b..0cf6ae66c 100644
--- a/src/views/scriptManage/allScriptRole.vue
+++ b/src/views/scriptManage/allScriptRole.vue
@@ -8,6 +8,7 @@
     </div>
     <el-tree
       ref="tree"
+      v-loading="loading"
       :data="treeData"
       :props="defaultProps"
       node-key="id"
@@ -17,13 +18,13 @@
     >
       <span :id="data.id" slot-scope="{ node, data }" style="width:100%">
         <span v-if="data.children">
-          <span style="font-size: 14px">{{ data.label }}</span>
+          <span style="font-size: 14px">{{ node.label }}</span>
         </span>
         <span v-else>
           <span style="font-size: 14px">{{ data.normalName }}</span>
           <span v-if="data.type!='role'" class="setGroup">
-            <span v-if="!data.disabled" class="settingBtn" @click="changeRole(data)">设置</span>
-            <span v-else class="hasSetted">已设置</span>
+            <span v-if="data.id==memberId" class="hasSetted">已设置</span>
+            <span v-else class="settingBtn" @click="changeRole(data)">设置</span>
           </span>
         </span>
 
@@ -32,7 +33,6 @@
   </div>
 </template>
 <script>
-import { getToken } from '@/utils/auth';
 import {changeScriptRole} from '@/api/script';
 export default {
     name:'AllScriptRole',
@@ -58,8 +58,9 @@ export default {
         return {
             covertMemberList:[],
             driverList:[],
-            oldMember:{id:null, type:''},
+            // oldMember:{id:null, type:''},
             queryMember:'',
+            loading:false,
             defaultProps: {
                 children: 'children',
                 label: 'label'
@@ -71,11 +72,11 @@ export default {
             if (this.$refs.tree) {
                 this.$refs.tree.filter(val);
             }
-        },
-        'treeData':function(val) {
-            const roleName = this.$store.state.scriptRecord.userRole;
-            this.oldMember = {id:this.memberId, type:roleName};
         }
+        // 'treeData':function(val) {
+        //     const roleName = this.$store.state.scriptRecord.userRole;
+        //     this.oldMember = {id:this.memberId, type:roleName};
+        // }
     },
     methods:{
         filterNode(value, data) {
@@ -89,67 +90,16 @@ export default {
         addMember() {
             this.$emit('addMember');
         },
+        updateLoading() {
+            this.loading = false;
+            this.$message('切换角色成功');
+        },
         switchMode(member) {
+            this.loading = true;
             changeScriptRole(this.group, member.id).then(res=>{
-                let prdType = '';
-                if (this.openWindow) {
-                    this.openWindow.close();
-                }
-                const role = Object.assign({}, member);
-                if (role.type == '行值') {
-                    prdType = '01';
-                    role.type = 'STATION_SUPERVISOR';
-                    this.$store.dispatch('training/setRoles', 'STATION_SUPERVISOR');
-                    this.$store.dispatch('training/setRoleDeviceCode', role.deviceCode);
-                } else if (role.type == '行调') {
-                    prdType = '02';
-                    role.type = 'DISPATCHER';
-                    this.$store.dispatch('training/setRoles', 'DISPATCHER');
-                } else if (role.type == '司机') {
-                    prdType = '04';
-                    role.type = 'DRIVER';
-                    this.$store.dispatch('training/setRoles', 'DRIVER');
-                } else if (role.type == '通号') {
-                    prdType = '';
-                    role.type = 'MAINTAINER';
-                    this.$store.dispatch('training/setRoles', 'MAINTAINER');
-                    const routeData = this.$router.resolve({
-                        path:'/jlmap3d/maintainer',
-                        query:{
-                            mapid:this.$route.query.mapId,
-                            group:this.group,
-                            token:getToken(),
-                            project: this.project,
-                            noPreLogout: true
-                        }
-                    });
-                    this.openWindow = window.open(routeData.href);
-                } else if (role.type == '车辆段调度') {
-                    prdType = '05';
-                    role.type = 'DEPOT_DISPATCHER';
-                    this.$store.dispatch('training/setRoles', 'DEPOT_DISPATCHER');
-                } else if (role.type == '上级部门') {
-                    prdType = '';
-                    role.type = 'PARENT_DEPARTMENT';
-                    this.$store.dispatch('training/setRoles', 'PARENT_DEPARTMENT');
-                } else {
-                    prdType = '';
-                }
-                this.$store.dispatch('training/updateMemberListInScript',
-                    {
-                        oldMemberId:this.oldMember.id,
-                        newMemberId:role.id,
-                        userId:this.$store.state.user.id,
-                        name:this.$store.state.user.nickname
-                    }
-                );
-                this.$store.dispatch('training/setPrdType', prdType);
-                this.$store.dispatch('scriptRecord/updateRole', role.type + ':' + role.id);
-                this.$emit('setMemberId', {newRole:role, oldRole:this.oldMember});
-                this.oldMember = {id:role.id, type:role.type};
-                this.$message('切换角色成功');
-                // this.$refs.changeScriptRole.blur();
+                this.$emit('changeMode', member);
             }).catch(()=>{
+                this.loading = false;
                 this.$messageBox('切换角色失败');
                 // this.$refs.changeScriptRole.blur();
             });
@@ -173,3 +123,11 @@ export default {
 
 }
 </style>
+<style>
+.eachScriptPanel .el-tree-node:focus>.el-tree-node__content {
+    background-color: #b7b7b7;
+}
+.eachScriptPanel .el-tree-node__content:hover {
+    background-color: #b7b7b7;
+}
+</style>
diff --git a/src/views/scriptManage/getAction.vue b/src/views/scriptManage/getAction.vue
index e9a0c6d99..6ebd15082 100644
--- a/src/views/scriptManage/getAction.vue
+++ b/src/views/scriptManage/getAction.vue
@@ -56,7 +56,7 @@
 <script>
 import {getScriptAllAction, modifyScriptActionNew } from '@/api/simulation';
 import CMD from '@/scripts/cmdPlugin/CommandEnum';
-// import CommandHandler from '@/scripts/cmdPlugin/CommandHandler';
+
 export default {
     name: 'GetActionNew',
     props: {
diff --git a/src/views/scriptManage/home.vue b/src/views/scriptManage/home.vue
index c4f52deb1..2a099a1bb 100644
--- a/src/views/scriptManage/home.vue
+++ b/src/views/scriptManage/home.vue
@@ -3,11 +3,15 @@
     <div class="scriptHeader">
       <div class="scriptList">草稿{{ $t('scriptRecord.scriptList') }}</div>
       <el-button size="small" type="primary" class="createScript" @click="handleCreate">{{ $t('scriptRecord.scriptCreate') }}</el-button>
+      <el-button type="primary" class="uploadDemo" size="mini" @click="importScript">
+        导入剧本
+      </el-button>
     </div>
     <QueryListPage ref="queryListPage" :pager-config="pagerConfig" :query-form="queryForm" :query-list="queryList" style="width: 91%;margin-left:4%;margin-top:20px;" />
     <script-publish ref="publishScript" :title="$t('scriptRecord.publishScript')" @reloadTable="reloadTable" @create="handleConfirmPublish" />
     <create-script ref="createScript" :title="$t('scriptRecord.createScript')" @reloadTable="reloadTable" @create="handleConfirmCreate" />
     <create-script ref="modifyScript" :title="$t('scriptRecord.modifyScript')" @reloadTable="reloadTable" @create="handleConfirmModify" />
+    <import-script ref="importScript" @refresh="reloadTable" />
   </div>
 </template>
 
@@ -16,18 +20,20 @@ import Cookies from 'js-cookie';
 import ConstConfig from '@/scripts/ConstConfig';
 import { UrlConfig } from '@/scripts/ConstDic';
 import { admin, superAdmin} from '@/router/index_APP_TARGET';
-import {retractScript, publishScript, updateScript, deleteScript, getScriptPageList, createScript} from '@/api/script';
+import {retractScript, publishScript, updateScript, deleteScript, getScriptPageList, createScript, getScriptExport} from '@/api/script';
 import { launchFullscreen } from '@/utils/screen';
-import { scriptDraftRecordNotify, scriptDraftRecordNotifyNew, scriptRecordNotify, scriptRecordNotifyNew } from '@/api/simulation';
+import { scriptDraftRecordNotifyNew, scriptRecordNotifyNew } from '@/api/simulation';
 import CreateScript from './create';
 import ScriptPublish from './publish';
+import ImportScript from './importScript';
 import { getSessionStorage } from '@/utils/auth';
 
 export default {
     name: 'ScriptDraft',
     components: {
         CreateScript,
-        ScriptPublish
+        ScriptPublish,
+        ImportScript
     },
     data() {
         return {
@@ -68,7 +74,7 @@ export default {
                     {
                         type: 'button',
                         title: this.$t('scriptRecord.operate'),
-                        width: '400',
+                        width: '450',
                         buttons: [
                             {
                                 name: this.$t('scriptRecord.scriptRecord'),
@@ -105,6 +111,12 @@ export default {
                                 handleClick: this.previewScript,
                                 type: 'success'
                                 // showControl:(row) => { return row.status==1},
+                            },
+                            {
+                                name: '导出',
+                                handleClick: this.exportScript,
+                                type: 'primary',
+                                showControl:(row) => { return !(row.status == 1); }
                             }
                         ]
                     }
@@ -132,25 +144,13 @@ export default {
             }
         },
         drawUp(index, row) {
-            const drawWay = this.$route.query.drawWay;
-            if (drawWay && JSON.parse(drawWay)) {
-                scriptRecordNotifyNew(row.id).then(resp => {
-                    const query = { mapId: row.mapId, group: resp.data, scriptId: row.id, lang:row.lang, lineCode:this.$route.query.lineCode, drawWay:drawWay};
-                    this.$router.push({ path: `${UrlConfig.scriptDisplayNew}/script`, query });
-                    launchFullscreen();
-                }).catch(error => {
-                    this.$messageBox(`${this.$t('scriptRecord.createSimulationFail')}: ${error.message}`);
-                });
-            } else {
-                scriptRecordNotify(row.id).then(resp => {
-                    const query = { mapId: row.mapId, group: resp.data, scriptId: row.id, lang:row.lang, lineCode:this.$route.query.lineCode };
-                    this.$router.push({ path: `${UrlConfig.scriptDisplay}/script`, query });
-                    launchFullscreen();
-                }).catch(error => {
-                    this.$messageBox(`${this.$t('scriptRecord.createSimulationFail')}: ${error.message}`);
-                });
-            }
-
+            scriptRecordNotifyNew(row.id).then(resp => {
+                const query = { mapId: row.mapId, group: resp.data, scriptId: row.id, lang:row.lang, lineCode:this.$route.query.lineCode};
+                this.$router.push({ path: `${UrlConfig.scriptDisplayNew}/script`, query });
+                launchFullscreen();
+            }).catch(error => {
+                this.$messageBox(`${this.$t('scriptRecord.createSimulationFail')}: ${error.message}`);
+            });
         },
         deleteScript(index, row) {
             this.$confirm(this.$t('scriptRecord.deleteScriptTip'), this.$t('global.tips'), {
@@ -271,28 +271,35 @@ export default {
         },
         // 剧本预览
         previewScript(index, row) {
-            const drawWay = this.$route.query.drawWay;
-            if (drawWay && JSON.parse(drawWay)) {
-                scriptDraftRecordNotifyNew(row.id).then(resp => {
-                    if (this.loadingProjectList.includes(this.project)) {
-                        this.$store.dispatch('app/transitionAnimations');
-                    }
-                    const query = { mapId: row.mapId, group: resp.data, scriptId: row.id, try:0, lineCode:this.$route.query.lineCode, drawWay:true};
-                    this.$router.push({ path: `${UrlConfig.design.displayNew}/demon`, query });
-                    launchFullscreen();
-                }).catch(error => {
-                    this.$messageBox(`${this.$t('scriptRecord.createSimulationFail')}: ${error.message}`);
-                });
-            } else {
-                scriptDraftRecordNotify(row.id).then(resp => {
-                    const query = { mapId: row.mapId, group: resp.data, scriptId: row.id, try:0, lineCode:this.$route.query.lineCode, drawWay:false};
-                    this.$router.push({ path: `${UrlConfig.design.display}/demon`, query });
-                    launchFullscreen();
-                }).catch(error => {
-                    this.$messageBox(`${this.$t('scriptRecord.createSimulationFail')}: ${error.message}`);
-                });
-            }
-
+            scriptDraftRecordNotifyNew(row.id).then(resp => {
+                if (this.loadingProjectList.includes(this.project)) {
+                    this.$store.dispatch('app/transitionAnimations');
+                }
+                const query = { mapId: row.mapId, group: resp.data, scriptId: row.id, try:0, lineCode:this.$route.query.lineCode};
+                this.$router.push({ path: `${UrlConfig.design.displayNew}/demon`, query });
+                launchFullscreen();
+            }).catch(error => {
+                this.$messageBox(`${this.$t('scriptRecord.createSimulationFail')}: ${error.message}`);
+            });
+        },
+        exportScript(index, row) {
+            getScriptExport(row.id).then(res=>{
+                const resultData = res.data;
+                if (resultData === false) {
+                    return;
+                }
+                const content = new Blob([JSON.stringify(resultData)]);
+                const urlObject = window.URL || window.webkitURL || window;
+                const url = urlObject.createObjectURL(content);
+                const el = document.createElement('a');
+                el.href = url;
+                el.download = `${resultData.name}.json`;
+                el.click();
+                urlObject.revokeObjectURL(url);
+            });
+        },
+        importScript() {
+            this.$refs.importScript.doShow();
         }
     }
 };
@@ -317,4 +324,13 @@ export default {
 		margin-left: 5px;
 		margin-top: 5px;
 	}
+    .uploadDemo {
+		position: relative;
+        overflow: hidden;
+        float: right;
+        margin-right: 10px;
+        cursor: pointer;
+        padding: 10px 15px;
+        margin-top: 0px !important;
+	}
 </style>
diff --git a/src/views/scriptManage/importScript.vue b/src/views/scriptManage/importScript.vue
new file mode 100644
index 000000000..5143c6b1e
--- /dev/null
+++ b/src/views/scriptManage/importScript.vue
@@ -0,0 +1,162 @@
+<template>
+  <el-dialog v-dialogDrag title="剧本导入" :visible.sync="dialogShow" width="360px" :before-close="handleClose" custom-class="importClass">
+    <div>
+      <div v-show="!formDisplay" class="eachButton uploadDemo">
+        <i class="el-icon-plus avatar-uploader-icon el-icon-other" />
+        <input ref="files" type="file" class="file_box" accept=".json, application/json" @change="importf">
+      </div>
+      <el-form v-show="formDisplay" ref="form" label-position="right" :rules="editRules" :model="editModel" label-width="100px" size="mini" @submit.native.prevent>
+        <el-form-item label="剧本名称" prop="name">
+          <el-input v-model="editModel.name" />
+        </el-form-item>
+      </el-form>
+      <div style="margin-left:18px;color:red;font-size:13px;">{{ validateText }}</div>
+    </div>
+    <span slot="footer" class="dialog-footer">
+      <el-button @click="handleClose">{{ $t('map.cancel') }}</el-button>
+      <el-button type="primary" :loading="loading" @click="importScene">{{ $t('map.confirm') }}</el-button>
+    </span>
+  </el-dialog>
+</template>
+<script>
+import { postScriptImport } from '@/api/script';
+export default {
+    name:'ImportScene',
+    props: {
+        scriptList:{
+            type: Array,
+            default() {
+                return [];
+            }
+        }
+    },
+    data() {
+        return {
+            formDisplay:false,
+            dialogShow: false,
+            loading: false,
+            jsonData:null,
+            validateText:'',
+            editModel: {
+                name: ''
+            },
+            editRules: {
+                name: [
+                    { required: true, message: '请输入剧本名称', trigger: 'blur' }
+                ]
+            }
+        };
+    },
+    methods:{
+        close() {
+            this.$refs.form.resetFields();
+            this.formDisplay = false;
+            this.editModel.scriptId = '';
+            this.jsonData = null;
+            this.dialogShow = false;
+            this.validateText = '';
+        },
+        handleClose() {
+            this.close();
+        },
+        doShow() {
+            this.validateText = '';
+            this.dialogShow = true;
+        },
+        importf() {
+            const that = this;
+            setTimeout(() => {
+                const obj = this.$refs.files;
+                if (!obj.files) return;
+                const f = obj.files[0];
+                if (f.type != 'application/json') {
+                    this.$message.error('请上传json格式的文件');
+                    return;
+                }
+                const reader = new FileReader();
+                reader.readAsText(f, 'utf-8');
+                reader.onload = function(e) {
+                    const data = e.target.result;
+                    that.formDisplay = true;
+                    const json = JSON.parse(data);
+                    that.jsonData = json;
+                    that.editModel.name = json.name;
+                    obj.value = '';
+                    that.validateText = '';
+                };
+            });
+        },
+        importScene() {
+            if (!this.jsonData) {
+                this.validateText = '请选择文件';
+                return false;
+            }
+            this.$refs['form'].validate((valid) => {
+                if (valid) {
+                    this.submitData();
+                } else {
+                    return false;
+                }
+            });
+        },
+        submitData() {
+            const loading = this.$loading({
+                lock: true,
+                text: '正在导入中...',
+                spinner: 'el-icon-loading',
+                background: 'rgba(0, 0, 0, 0.7)'
+            });
+            this.loading = true;
+            this.dialogShow = false;
+            this.validateText = '';
+            const that = this;
+            postScriptImport(that.$route.params.mapId, that.editModel.name, that.jsonData).then(res => {
+                loading.close();
+                that.loading = false;
+                that.$message.success('导入成功！');
+                this.$emit('refresh');
+                // loading.close();
+                this.close();
+            }).catch(error => {
+                loading.close();
+                that.loading = false;
+                this.close();
+                that.$message.error('导入失败' + error.message);
+            });
+        }
+    }
+};
+</script>
+<style lang="scss" scoped>
+.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: 72px;
+    font-size: 16px;
+}
+.uploadDemo {
+    position: relative;
+    overflow: hidden;
+    // float: right;
+    padding: 9px 15px;
+    margin-right: 3px;
+    cursor: pointer;
+    input {
+        width: 100%;
+        height: 100%;
+        position: absolute;
+        left: 0;
+        top: 0;
+        opacity: 0;
+        cursor: pointer;
+    }
+}
+</style>
diff --git a/src/views/scriptManage/tipScriptRecord.vue b/src/views/scriptManage/tipScriptRecord.vue
index d72022579..c55476af2 100644
--- a/src/views/scriptManage/tipScriptRecord.vue
+++ b/src/views/scriptManage/tipScriptRecord.vue
@@ -33,7 +33,7 @@
                 </el-button-group>
               </div>
               <div class="scriptPanelRight">
-                <get-action-new ref="getAction" :group="group" :size="size" :member-list="memberList" @setAction="setAction" />
+                <get-action-new ref="getAction" :group="group" :size="size" :member-list="memberList" />
               </div>
             </div>
           </el-tab-pane>
@@ -44,7 +44,7 @@
                 :member-id="memberId"
                 :tree-data="treeData"
                 :group="group"
-                @setMemberId="setMemberId"
+                @changeMode="changeMode"
                 @addMember="addMember"
               />
             </div>
@@ -60,15 +60,15 @@
 </template>
 <script>
 import Vue from 'vue';
-import GetActionNew from './getAction';
-// getSimulationMemberList
-import {executeScriptNew, dumpScriptDataNew, saveScriptDataNew, saveScriptScenesNew, updateMapLocationNew, simulationPause} from '@/api/simulation';
-import ConstConfig from '@/scripts/ConstConfig';
-import {getDraftScriptByGroupNew, getAllSelectedScriptRole } from '@/api/script';
-import AddScriptMember from './addScriptMember';
 import Cookies from 'js-cookie';
+import {getDraftScriptByGroupNew, getAllSelectedScriptRole } from '@/api/script';
+import ConstConfig from '@/scripts/ConstConfig';
+import AddScriptMember from './addScriptMember';
+import {covertMemberData} from '@/views/newMap/displayNew/utils';
+import GetActionNew from './getAction';
 import AllScriptRole from './allScriptRole';
-
+import { getToken } from '@/utils/auth';
+import {executeScriptNew, dumpScriptDataNew, saveScriptDataNew, saveScriptScenesNew, updateMapLocationNew, simulationPause} from '@/api/simulation';
 export default {
     name:'TipScriptRecord',
     components: {
@@ -88,14 +88,6 @@ export default {
         offset:{
             type: Number,
             required: true
-        },
-        treeData:{
-            type:Array,
-            required: true
-        },
-        memberList:{
-            type:Array,
-            required: true
         }
     },
     data() {
@@ -114,13 +106,21 @@ export default {
                 width: 300,
                 height: 300
             },
-            openWindow:null
+            openWindow:null,
+            treeData:[],
+            memberList:[],
+            driverList:[],
+            activeTrainList:[],
+            oldMember:{id:null, type:''}
         };
     },
     computed:{
         memberId() {
             return this.$store.state.scriptRecord.updateRoleId;
         },
+        memberType() {
+            return this.$store.state.scriptRecord.userRole;
+        },
         orignalUserRoleId() {
             return this.$store.state.training.orignalUserRoleId;
         }
@@ -145,6 +145,82 @@ export default {
                 this.isFirst = false;
                 this.initData();
             }
+        },
+        '$store.state.training.memberList': function (val) {
+            if (val && val.length) {
+                const memberData = this.$store.state.training.memberData;
+                this.driverList = [];
+                this.treeData = [];
+                if (this.$store.state.training.started) {
+                    this.activeTrainList = this.$store.state.map.activeTrainList;
+                }
+                // 获取仿真成员列表
+                const result = covertMemberData(this.activeTrainList, Object.values(memberData));
+                this.driverList = result.driverList;
+                this.treeData = [{
+                    label: '行调',
+                    id: 'dispatcher',
+                    type: 'role',
+                    children: result.deviceListData[0]
+                }, {
+                    label: '车站值班员',
+                    id: 'stationSupervisor',
+                    type: 'role',
+                    children: result.deviceListData[2]
+                }, {
+                    label: '司机',
+                    id: 'driver',
+                    type: 'role',
+                    children: result.deviceListData[3]
+                }, {
+                    label: '通号',
+                    id: 'maintainer',
+                    type: 'role',
+                    children: result.deviceListData[1]
+                }, {
+                    label: '车辆段',
+                    id: 'depotDispatcher',
+                    type: 'role',
+                    children: result.deviceListData[4]
+                }, {
+                    label: '上级部门',
+                    id: 'parentDepartment',
+                    type: 'role',
+                    children: result.deviceListData[5]
+                }, {
+                    label: '电力调度',
+                    id: 'electricDispatcher',
+                    type: 'role',
+                    children: result.deviceListData[6]
+                }
+                // PARENT_DEPARTMENT
+                ];
+                this.memberList = result.lastMemberList;
+            }
+        },
+        // 按计划行车的列车列表更新(更新司机列表)
+        '$store.state.map.activeTrainListChange': function (val) {
+            // driverList
+            const activeTrainList = this.$store.state.map.activeTrainList;
+            if (this.driverList.length > 0) {
+                const driverList = [];
+                if (activeTrainList && activeTrainList.length) {
+                    activeTrainList.sort();
+                    activeTrainList.forEach(groupNumber => {
+                        const drivers = this.driverList.find(driver=>{
+                            return driver.deviceCode == groupNumber;
+                        });
+                        if (drivers) {
+                            driverList.push(drivers);
+
+                        }
+                    });
+                }
+                // this.memberData = [...this.treeData[0].children, ...this.treeData[1].children, ...this.treeData[2].children, ...this.treeData[3].children, ...this.treeData[4].children];
+                this.treeData[2].children = driverList;
+            } else {
+                this.activeTrainList = activeTrainList;
+            }
         }
     },
     mounted() {
@@ -164,6 +240,7 @@ export default {
                         this.quickChangeMember.list.push(eachMember);
                     }
                 });
+                this.oldMember = {id:this.memberId, type:this.memberType};
             });
         },
         addScriptMember(member) {
@@ -171,23 +248,14 @@ export default {
             member.disabled = false;
             const lastData = JSON.stringify([member]);
             const covertmember = this.covert(lastData, ConstConfig.ConstSelect.roleTypeNew);
-            this.$emit('addScriptMember', covertmember[0]);
-        },
-        setMemberId({newRole, oldRole}) {
-            this.$emit('changeTreeData', {newRole:newRole, oldRole:oldRole});
-            const quickChangeMember = this.quickChangeMember.list;
-            quickChangeMember.forEach((mem, index)=>{
-                if (oldRole.id && mem.id == oldRole.id) {
-                    delete mem.userId;
-                }
-                if (newRole.id == mem.id) {
-                    mem.userId = this.$store.state.user.id;
-                }
-            });
-            this.quickChangeMember = {list:quickChangeMember};
-            const memberdata = this.quickChangeMember.list.find(mem=>{ return mem.id == newRole.id; });
-            if (!memberdata) {
-                newRole.userId = this.$store.state.user.id; this.quickChangeMember.list.push(newRole);
+            const newMember = covertmember[0];
+            this.memberList.push(newMember);
+            const deviceTypeList = ['行调', '行值', '司机', '通号', '车辆段调度', '上级部门', '电力调度'];
+            const index = deviceTypeList.indexOf(newMember.type);
+            if (index >= 0) {
+                const treeDataIn = this.treeData[index];
+                treeDataIn.children.push(newMember);
+                this.treeData[index] = treeDataIn;
             }
         },
         addMember() {
@@ -242,9 +310,6 @@ export default {
                 each.label = each.normalName;
             });
             return lastData;
-        },
-        setAction() {
-
         },
         pauseScript() {
             simulationPause(this.group).then(resp => {
@@ -316,7 +381,7 @@ export default {
             });
         },
         dumpScenesData() {
-            this.clearAutoSave();
+            // this.clearAutoSave();
             const group = this.group;
             this.$confirm(this.$t('scriptRecord.clearDataTip'), this.$t('global.tips'), {
                 confirmButtonText: this.$t('global.confirm'),
@@ -326,7 +391,6 @@ export default {
                 dumpScriptDataNew(group).then(resp => {
                     this.$parent.resetBeginTime();
                     this.$refs['getAction'].loadInitData();
-                    // this.changeRunPlanStatus();
                     this.$store.dispatch('training/updateMemberListInScript',
                         {
                             oldMemberId:this.memberId,
@@ -341,31 +405,108 @@ export default {
                         new_member.userId = this.$store.state.user.id;
                         new_member.disabled = true;
                         this.quickChangeMember.list = [new_member];
-                        const deviceList = ['行值', '行调', '司机', '通号', '车辆段', '上级部门'];
-                        const deviceType = ['STATION_SUPERVISOR', 'DISPATCHER', 'DRIVER', 'MAINTAINER', 'DEPOT_DISPATCHER', 'PARENT_DEPARTMENT'];
-                        const new_index = deviceList.indexOf(new_member.type);
-                        const old_index = deviceList.indexOf(old_member.type);
-                        let oldType, newType;
-                        if (new_index >= 0) {
-                            newType = deviceType[new_index];
-                        }
-                        if (old_index >= 0) {
-                            oldType = deviceType[old_index];
-                        }
-                        this.$emit('changeTreeData', {oldRole:{id:this.memberId, type:oldType }, newRole:{id:this.orignalUserRoleId, type:newType}});
                         this.$emit('resetChat');
                     }
-                    // this.initAutoSaveScript();
                     this.$store.dispatch('training/setPrdType', '02');
                     this.$store.dispatch('map/resetActiveTrainList');
                     this.$store.dispatch('scriptRecord/updateRole', new_member.type + ':' + this.orignalUserRoleId);
                     this.$store.dispatch('scriptRecord/updateBgSet', false);
                     // this.memberId = this.orignalUserRoleId;
+                    this.oldMember = {id:this.orignalUserRoleId, type:new_member.type};
                     this.$message.success(this.$t('scriptRecord.resetDataSuccess'));
                 }).catch(() => {
                     this.$messageBox(this.$t('scriptRecord.resetDataFail'));
                 });
             });
+        },
+        changeMode(member) {
+            let prdType = '';
+            if (this.openWindow) {
+                this.openWindow.close();
+            }
+            const role = Object.assign({}, member);
+            if (role.type == '行值') {
+                prdType = '01';
+                role.type = 'STATION_SUPERVISOR';
+                this.$store.dispatch('training/setRoles', 'STATION_SUPERVISOR');
+                this.$store.dispatch('training/setRoleDeviceCode', role.deviceCode);
+            } else if (role.type == '行调') {
+                prdType = '02';
+                role.type = 'DISPATCHER';
+                this.$store.dispatch('training/setRoles', 'DISPATCHER');
+            } else if (role.type == '司机') {
+                prdType = '04';
+                role.type = 'DRIVER';
+                this.$store.dispatch('training/setRoles', 'DRIVER');
+            } else if (role.type == '通号') {
+                prdType = '';
+                role.type = 'MAINTAINER';
+                this.$store.dispatch('training/setRoles', 'MAINTAINER');
+                const routeData = this.$router.resolve({
+                    path:'/jlmap3d/maintainer',
+                    query:{
+                        mapid:this.$route.query.mapId,
+                        group:this.group,
+                        token:getToken(),
+                        project: this.project,
+                        noPreLogout: true
+                    }
+                });
+                this.openWindow = window.open(routeData.href);
+            } else if (role.type == '车辆段调度') {
+                prdType = '05';
+                role.type = 'DEPOT_DISPATCHER';
+                this.$store.dispatch('training/setRoles', 'DEPOT_DISPATCHER');
+            } else if (role.type == '上级部门') {
+                prdType = '';
+                role.type = 'PARENT_DEPARTMENT';
+                this.$store.dispatch('training/setRoles', 'PARENT_DEPARTMENT');
+            } else if (role.type == '电力调度') {
+                prdType = '';
+                role.type = 'ELECTRIC_DISPATCHER';
+                this.$store.dispatch('training/setRoles', 'ELECTRIC_DISPATCHER');
+            } else {
+                prdType = '';
+            }
+            this.$store.dispatch('training/setPrdType', prdType);
+            this.$store.dispatch('scriptRecord/updateRole', role.type + ':' + role.id);
+            const newRole = role;
+            const oldRole = this.oldMember;
+            const quickChangeMember = this.quickChangeMember.list;
+            quickChangeMember.forEach((mem, index)=>{
+                if (oldRole.id && mem.id == oldRole.id) {
+                    delete mem.userId;
+                }
+                if (newRole.id == mem.id) {
+                    mem.userId = this.$store.state.user.id;
+                }
+            });
+            this.quickChangeMember = {list:quickChangeMember};
+            const memberdata = this.quickChangeMember.list.find(mem=>{ return mem.id == newRole.id; });
+            if (!memberdata) {
+                newRole.userId = this.$store.state.user.id;
+                const roleTypeEnumMap = {
+                    'STATION_SUPERVISOR':'行值',
+                    'DISPATCHER':'行调',
+                    'DRIVER':'司机',
+                    'MAINTAINER':'通号',
+                    'DEPOT_DISPATCHER':'车辆段调度',
+                    'PARENT_DEPARTMENT':'上级部门',
+                    'ELECTRIC_DISPATCHER':'电力调度'
+                };
+                newRole.type = roleTypeEnumMap[newRole.type];
+                this.quickChangeMember.list.push(newRole);
+            }
+            this.$store.dispatch('training/updateMemberListInScript',
+                {
+                    oldMemberId:this.oldMember.id,
+                    newMemberId:role.id,
+                    userId:this.$store.state.user.id,
+                    name:this.$store.state.user.nickname
+                }
+            );
+            this.oldMember = Object.assign({}, role);
+            this.$refs.allScriptRole.updateLoading();
         }
     }
 };
@@ -446,6 +587,10 @@ export default {
     border-radius: 4px;
 }
 .setGroupOut{
-        margin-bottom: 5px;
+    padding: 4px 6px;
+}
+.setGroupOut:hover{
+    background-color:#ccc;
 }
 </style>
+
diff --git a/src/views/system/cacheControl/index.vue b/src/views/system/cacheControl/index.vue
index f33809271..1ad9977d2 100644
--- a/src/views/system/cacheControl/index.vue
+++ b/src/views/system/cacheControl/index.vue
@@ -8,76 +8,76 @@
 import { getCacheList, delCacheList } from '@/api/management/user';
 
 export default {
-	name: 'CacheControl',
-	components: {
-	},
-	data() {
-		return {
-			pagerConfig: {
-				pageSize: 'pageSize',
-				pageIndex: 'pageNum'
-			},
-			queryForm: {
-				labelWidth: '80px',
-				reset: true,
-				queryObject: {
-					key: {
-						type: 'text',
-						label: 'key'
-					}
-				}
+    name: 'CacheControl',
+    components: {
+    },
+    data() {
+        return {
+            pagerConfig: {
+                pageSize: 'pageSize',
+                pageIndex: 'pageNum'
+            },
+            queryForm: {
+                labelWidth: '80px',
+                reset: true,
+                queryObject: {
+                    key: {
+                        type: 'text',
+                        label: 'key'
+                    }
+                }
 
-			},
-			queryList: {
-				query: this.queryFunction,
-				selectCheckShow: false,
-				indexShow: true,
-				columns: [
-					{
-						title: 'key',
-						prop: 'key'
-					},
-					{
-						type: 'button',
-						title: this.$t('global.operate'),
-						width: '250',
-						buttons: [
-							{
-								name: this.$t('global.delete'),
-								handleClick: this.handledelete,
-								type: 'danger'
-							}
-						]
-					}
-				]
-			},
-			currentModel: {}
-		};
-	},
-	created() {
-	},
-	methods: {
-		// 删除
-		handledelete(index, row) {
-			this.$confirm( this.$t('tip.deleteListHint'), this.$t('global.tips'), {
-				confirmButtonText: this.$t('global.confirm'),
-				cancelButtonText: this.$t('global.cancel'),
-				type: 'warning'
-			}).then(() => {
-				delCacheList(row.key).then(response => {
-					this.$message.success(this.$t('tip.successfullyDelete'));
-					this.reloadTable();
-				}).catch(() => {
-					this.$messageBox(this.$t('tip.failDelete'));
-				});
-			});
-		},
-		queryFunction(params) {
-			return getCacheList(params);
-		},
-		reloadTable() {
-			this.queryList.reload();
-		}
-	}
+            },
+            queryList: {
+                query: this.queryFunction,
+                selectCheckShow: false,
+                indexShow: true,
+                columns: [
+                    {
+                        title: 'key',
+                        prop: 'key'
+                    },
+                    {
+                        type: 'button',
+                        title: this.$t('global.operate'),
+                        width: '250',
+                        buttons: [
+                            {
+                                name: this.$t('global.delete'),
+                                handleClick: this.handledelete,
+                                type: 'danger'
+                            }
+                        ]
+                    }
+                ]
+            },
+            currentModel: {}
+        };
+    },
+    created() {
+    },
+    methods: {
+        // 删除
+        handledelete(index, row) {
+            this.$confirm( this.$t('tip.deleteListHint'), this.$t('global.tips'), {
+                confirmButtonText: this.$t('global.confirm'),
+                cancelButtonText: this.$t('global.cancel'),
+                type: 'warning'
+            }).then(() => {
+                delCacheList(row.key).then(response => {
+                    this.$message.success(this.$t('tip.successfullyDelete'));
+                    this.reloadTable();
+                }).catch(() => {
+                    this.$messageBox(this.$t('tip.failDelete'));
+                });
+            });
+        },
+        queryFunction(params) {
+            return getCacheList(params);
+        },
+        reloadTable() {
+            this.queryList.reload();
+        }
+    }
 };
 </script>
diff --git a/src/views/system/commandDictionary/copyParam.vue b/src/views/system/commandDictionary/copyParam.vue
index 4f3490760..1d6bd21c0 100644
--- a/src/views/system/commandDictionary/copyParam.vue
+++ b/src/views/system/commandDictionary/copyParam.vue
@@ -9,22 +9,24 @@
 </template>
 
 <script>
-import { postCopyCmd } from '@/api/management/dictionary'
+import { postCopyCmd } from '@/api/management/dictionary';
 
 export default {
     name: 'EditCondition',
     props: {
         taskStatusList: {
             type: Array,
-            default: []
+            default() {
+                return [];
+            }
         }
     },
     data() {
         return {
             dialogVisible: false,
             formModel: {
-				fromCode: '',
-				fromName: '',
+                fromCode: '',
+                fromName: '',
                 targetIds: '',
                 deviceType: []
             },
@@ -79,28 +81,28 @@ export default {
                 this.lineCode = lineCode;
                 this.targetList = [];
                 this.taskStatusList.forEach(item => {
-					item.value = item.code;
-					item.label = item.name;
-					if (item.code != lineCode) {
-						this.targetList.push(item);
-					} else {
-						this.formModel.fromCode = item.code;
-						this.formModel.fromName = item.name;
-					}
-				})
+                    item.value = item.code;
+                    item.label = item.name;
+                    if (item.code != lineCode) {
+                        this.targetList.push(item);
+                    } else {
+                        this.formModel.fromCode = item.code;
+                        this.formModel.fromName = item.name;
+                    }
+                });
             }
         },
         doSave() {
             this.$refs.dataform.validateForm(() => {
-				const param = {
-					fromLineCode: this.formModel.fromCode,
-					targetLineCodes: this.formModel.targetIds,
-					operateObjects: this.formModel.deviceType
-				}
-				postCopyCmd(param).then(res => {
-					this.handleClose();
-					this.$message.success('复制指令成功！');
-				})
+                const param = {
+                    fromLineCode: this.formModel.fromCode,
+                    targetLineCodes: this.formModel.targetIds,
+                    operateObjects: this.formModel.deviceType
+                };
+                postCopyCmd(param).then(res => {
+                    this.handleClose();
+                    this.$message.success('复制指令成功！');
+                });
             });
         },
         handleClose() {
diff --git a/src/views/system/companyManage/add.vue b/src/views/system/companyManage/add.vue
index c776c0ba0..366f55680 100644
--- a/src/views/system/companyManage/add.vue
+++ b/src/views/system/companyManage/add.vue
@@ -1,5 +1,5 @@
 <template>
-  <el-dialog v-dialogDrag title="添加单位" :visible.sync="dialogVisible" width="30%" :before-close="handleClose" center :close-on-click-modal="false">
+  <el-dialog v-dialogDrag :title="title" :visible.sync="dialogVisible" width="30%" :before-close="handleClose" 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="doSave">{{ update? '修改' : $t('global.confirm') }}</el-button>
@@ -29,7 +29,7 @@ export default {
             const form = {
                 labelWidth: '100px',
                 items: [
-                    { prop: 'name', label: '昵称', type: 'text' },
+                    { prop: 'name', label: '名称', type: 'text' },
                     { prop: 'phone', label: '电话', type: 'text' },
                     { prop: 'address', label: '地址', type: 'text' }
                 ]
@@ -50,6 +50,9 @@ export default {
                 ]
             };
             return crules;
+        },
+        title() {
+            return this.update ? '添加单位' : '修改单位';
         }
     },
     methods: {
diff --git a/src/views/system/companyManage/index.vue b/src/views/system/companyManage/index.vue
index fa6beabad..8f6afafe5 100644
--- a/src/views/system/companyManage/index.vue
+++ b/src/views/system/companyManage/index.vue
@@ -2,16 +2,19 @@
   <div>
     <QueryListPage ref="queryListPage" :pager-config="pagerConfig" :query-form="queryForm" :query-list="queryList" />
     <edit-company ref="editCompany" @reloadTable="reloadTable" />
+    <qr-code ref="qrCode" />
   </div>
 </template>
 
 <script>
 import { getCompanyListPaging, deleteCompany } from '@/api/company';
 import EditCompany from './add';
+import QrCode from '@/components/QrCode';
 export default {
     name: 'CompanyManage',
     components: {
-        EditCompany
+        EditCompany,
+        QrCode
     },
     data() {
         return {
@@ -31,15 +34,15 @@ export default {
                 indexShow: true,
                 columns: [
                     {
-                        title: '公司名称',
+                        title: '单位名称',
                         prop: 'name'
                     },
                     {
-                        title: '公司电话',
+                        title: '单位电话',
                         prop: 'phone'
                     },
                     {
-                        title: '公司地址',
+                        title: '单位地址',
                         prop: 'address'
                     },
                     {
@@ -51,6 +54,10 @@ export default {
                                 name: this.$t('global.edit'),
                                 handleClick: this.handleUpdate
                             },
+                            {
+                                name: '生成二维码',
+                                handleClick: this.handleGenerateQrCode
+                            },
                             {
                                 name: '删除',
                                 handleClick: this.handleDeleteCompany,
@@ -87,6 +94,13 @@ export default {
         },
         handlerBack() {
             this.$router.go(-1);
+        },
+        handleGenerateQrCode(index, row) {
+            const param = {
+                url: `companyName=${row.name}&&companyId=${row.id}`,
+                title: '单位二维码'
+            };
+            this.$refs.qrCode.doShow(param);
         }
     }
 };
diff --git a/src/views/system/configLine/config.vue b/src/views/system/configLine/config.vue
index aa401765c..cabcd67ce 100644
--- a/src/views/system/configLine/config.vue
+++ b/src/views/system/configLine/config.vue
@@ -80,9 +80,9 @@ export default {
             height: 800,
             roadData: [],
             focus: false,
-            booleanList: ['upRight', 'lockFirst', 'switchSingleHandle', 'switchNRTurnChain', 'switchSingleLockChain', 'switchLossChain', 'signalForceCancelRoute', 'initSingleLockSwitch', 'ctcOverlapOnlyTurnBackStationLock', 'guideNeedRouteSettingFirst', 'signalOpenAfterParking', 'standHoldCloseLogicLight'],
+            booleanList: ['upRight', 'lockFirst', 'switchSingleHandle', 'switchNRTurnChain', 'switchSingleLockChain', 'switchLossChain', 'signalForceCancelRoute', 'initSingleLockSwitch', 'ctcOverlapOnlyTurnBackStationLock', 'guideNeedRouteSettingFirst', 'signalOpenAfterParking', 'standHoldCloseLogicLight', 'atsAutoHandleManualFrontTurnBack'],
             selectList: ['runMode'],
-            generalConfig: ['lockFirst', 'switchSingleHandle', 'upRight', 'switchNRTurnChain', 'switchSingleLockChain', 'switchLossChain', 'signalForceCancelRoute', 'runMode', 'initSingleLockSwitch', 'ctcOverlapOnlyTurnBackStationLock', 'noParkingSM', 'parkingSM', 'rmAtpSpeed', 'urmAtpSpeed', 'guideNeedRouteSettingFirst', 'signalOpenAfterParking', 'standHoldCloseLogicLight'],
+            generalConfig: ['lockFirst', 'switchSingleHandle', 'upRight', 'switchNRTurnChain', 'switchSingleLockChain', 'switchLossChain', 'signalForceCancelRoute', 'runMode', 'initSingleLockSwitch', 'ctcOverlapOnlyTurnBackStationLock', 'noParkingSM', 'parkingSM', 'rmAtpSpeed', 'urmAtpSpeed', 'guideNeedRouteSettingFirst', 'signalOpenAfterParking', 'standHoldCloseLogicLight', 'atsAutoHandleManualFrontTurnBack'],
             rangeList: ['noParkingSM', 'parkingSM'],
             speedList: ['rmAtpSpeed', 'urmAtpSpeed'],
             numberList: [],
@@ -106,7 +106,8 @@ export default {
                 urmAtpSpeed: 'URM下ATP防护速度',
                 guideNeedRouteSettingFirst: '引导办理是否需要先排列进路',
                 signalOpenAfterParking: '是否列车停站开门后，才办理出站进路开放出站信号机',
-                standHoldCloseLogicLight: '站台扣车是否关闭逻辑点灯的信号机'
+                standHoldCloseLogicLight: '站台扣车是否关闭逻辑点灯的信号机',
+                atsAutoHandleManualFrontTurnBack:'ATS是否自动处理人工设置的站前折返自动更新车次'
             }
         };
     },
diff --git a/src/views/system/deviceManage/editConfigGateway.vue b/src/views/system/deviceManage/editConfigGateway.vue
index 6ae05e198..a59904974 100644
--- a/src/views/system/deviceManage/editConfigGateway.vue
+++ b/src/views/system/deviceManage/editConfigGateway.vue
@@ -1,70 +1,48 @@
 <template>
   <el-dialog v-dialogDrag :title="title" :visible.sync="dialogVisible" width="60%" :before-close="handleClose" center :close-on-click-modal="false">
-    <data-form ref="datatop" :form="formTop" :inline="inline" :form-model="formModel" :rules="topRules" />
-    <el-form v-if="data.type === 'PSL' || data.type === 'PSC'" ref="form" :model="formModel" label-width="220px" :rules="topRules" :inline="inline">
-      <el-form-item label="关联地图:" prop="mapId">
-        <el-select v-model="mapId" placeholder="请选择" size="small" style="width: 180px" @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="stationCode">
-        <el-select v-model="stationCode" placeholder="请选择" size="small" style="width: 180px" @change="stationCodeChange">
-          <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="standCode">
-        <el-select v-model="standCode" placeholder="请选择" size="small" style="width: 180px" @change="standCodeChange">
-          <el-option
-            v-for="item in standList"
-            :key="item.code"
-            :label="item.name"
-            :value="item.code"
-          />
-        </el-select>
-      </el-form-item>
-      <el-form-item label="关联屏蔽门:" prop="psdCode">
-        <el-select v-model="formModel.psdCode" placeholder="请选择" style="width: 180px" size="small">
-          <el-option
-            v-for="item in psdList"
-            :key="item.code"
-            :label="item.code"
-            :value="item.code"
-          />
-        </el-select>
-      </el-form-item>
-    </el-form>
-    <el-row :gutter="20">
-      <el-col :span="data.type !== 'PSC'?12:24">
-        <el-card class="box-card">
-          <div slot="header" class="clearfix">
-            <span>输入配置:</span>
-          </div>
-          <div style="margin-top: 20px">
-            <data-form ref="dataleft" :form="formLeft" :form-model="formModel" :rules="leftRules" :inline="data.type === 'PSC'" />
-          </div>
-        </el-card>
-      </el-col>
-      <el-col v-if="data.type !== 'PSC'" :span="12">
-        <el-card class="box-card">
-          <div slot="header" class="clearfix">
-            <span>输出配置:</span>
-          </div>
-          <div style="margin-top: 20px">
-            <data-form ref="dataright" :form="formRight" :form-model="formModel" :rules="rightRules" />
-          </div>
-        </el-card>
-      </el-col>
-    </el-row>
+    <!--<el-form v-if="data.type === 'PSL' || data.type === 'PSC'" ref="form" :model="formModel" label-width="220px" :rules="topRules" :inline="inline">-->
+    <!--<el-form-item label="关联地图:" prop="mapId">-->
+    <!--<el-select v-model="mapId" placeholder="请选择" size="small" style="width: 180px" @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="stationCode">-->
+    <!--<el-select v-model="stationCode" placeholder="请选择" size="small" style="width: 180px" @change="stationCodeChange">-->
+    <!--<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="standCode">-->
+    <!--<el-select v-model="standCode" placeholder="请选择" size="small" style="width: 180px" @change="standCodeChange">-->
+    <!--<el-option-->
+    <!--v-for="item in standList"-->
+    <!--:key="item.code"-->
+    <!--:label="item.name"-->
+    <!--:value="item.code"-->
+    <!--/>-->
+    <!--</el-select>-->
+    <!--</el-form-item>-->
+    <!--<el-form-item label="关联屏蔽门:" prop="psdCode">-->
+    <!--<el-select v-model="formModel.psdCode" placeholder="请选择" style="width: 180px" size="small">-->
+    <!--<el-option-->
+    <!--v-for="item in psdList"-->
+    <!--:key="item.code"-->
+    <!--:label="item.code"-->
+    <!--:value="item.code"-->
+    <!--/>-->
+    <!--</el-select>-->
+    <!--</el-form-item>-->
+    <!--</el-form>-->
+    <el-input v-model="jsonConfig" autosize type="textarea" />
     <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>
@@ -91,89 +69,19 @@ export default {
             addrName: '',
             data: {},
             titleMap: { SWITCH: '道岔', PSD:'屏蔽门', SIGNAL: '信号机', PSL:'端头控制盒', PSC: 'PSC控制柜' },
-            psdLeftValue: [
-                {label: '输入-是否关门位', value: 'i_c'},
-                {label: '输入-PSL关门按钮位', value: 'i_dc_b'},
-                {label: '输入-PSL开门按钮位', value: 'i_do_b'},
-                {label: '输入-互锁解除钥匙开关位', value: 'i_ir'},
-                {label: '输入-是否锁闭位', value: 'i_l'},
-                {label: '输入-PSL允许钥匙开关位', value: 'i_psl'},
-                {label: '输入-PSL试灯按钮位', value: 'i_ts_b'}
-            ],
-            psdRightValue: [
-                {label: '输出-关门位', value: 'o_c'},
-                {label: '输出-关门信号灯控制位', value: 'o_dc_s'},
-                {label: '输出-关门且锁闭信号灯控制位', value: 'o_dcl_s'},
-                {label: '输出-开门信号灯控制位', value: 'o_do_s'},
-                {label: '输出-互锁解除信号灯控制位', value: 'o_ir_s'},
-                {label: '输出-锁闭位', value: 'o_l'},
-                {label: '输出-开门位', value: 'o_o'},
-                {label: '输出-PSL信号灯控制位', value: 'o_psl_s'}
-            ],
-            switchValue: [
-                {label: '网关地址', value: 'addr'},
-                {label: '定位表示', value: 'rnp'},
-                {label: '反位表示', value: 'rrp'},
-                {label: '定位控制', value: 'wnp'},
-                {label: '反位控制', value: 'wrp'},
-                {label: '锁闭控制', value: 'wl'}
-            ],
-            signalLeftValue: [
-                {label: '输入-故障表示位', value: 'i_f'},
-                {label: '输入-绿灯表示位', value: 'i_g'},
-                {label: '输入-黄灯表示位', value: 'i_y'},
-                {label: '输入-黄红灯表示位', value: 'i_yr'}
-            ],
-            signalRightValue: [
-                {label: '输出-故障控制位', value: 'o_f'},
-                {label: '输出-绿灯控制位', value: 'o_g'},
-                {label: '输出-红灯控制位', value: 'o_r'},
-                {label: '输出-黄灯控制位', value: 'o_y'},
-                {label: '输出-黄红灯控制位', value: 'o_yr'}
-            ],
-            pslLeftValue: [
-                {label: '读PSL操作旋钮位', value: 'rpslcz'},
-                {label: '读关门按钮位', value: 'rgman'},
-                {label: '读开门按钮位', value: 'rkman'},
-                {label: '读互锁解除开关位', value: 'rjc'},
-                {label: '读试灯按钮位', value: 'rsdan'},
-                {label: '读紧急停车按钮位', value: 'rjtan'}
-            ],
-            pslRightValue: [
-                {label: '写全部关门指示灯位', value: 'wqbgbd'},
-                {label: '写开门到位指示灯位', value: 'wkmdwd'},
-                {label: '写PSL允许指示灯位', value: 'wpslyxd'},
-                {label: '写互锁解除指示灯位', value: 'wjcd'},
-                {label: '写IBP盘操作指示灯位', value: 'wibpczd'},
-                {label: '写PST操作指示灯位', value: 'wpstczd'}
-            ],
             mapId: '',
             mapList: [],
             stationCode: '',
             stationList: [],
             standList: [],
             standCode: '',
-            psdList: []
+            psdList: [],
+            jsonConfig: ''
         };
     },
     computed: {
-        formTop() {
-            return {
-                labelWidth: '220px',
-                items: [
-                    { prop:'addr', label: this.addrName, type: 'number', min: 0, max: 20000, step: 1, precisionFlag: true, precision: 0},
-                    { prop: 'quantity', label: '位数量:', type: 'number', min: 0, max: 20000, step: 1, precisionFlag: true, precision: 0 }
-                ]
-            };
-        },
         topRules() {
             return {
-                addr: [
-                    { required: true, message: '请填写网关地址', trigger: 'blur' }
-                ],
-                quantity: [
-                    { required: true, message: '请填写位数量', trigger: 'blur'}
-                ],
                 psdCode: [
                     { required: true, message: '请选择关联屏蔽门', trigger: 'change'}
                 ]
@@ -185,372 +93,40 @@ export default {
     },
     methods: {
         initForm(row) {
-            var validateDevice = (rule, value, callback) => {
-                const list = [];
-                rule.list.forEach(item=> {
-                    if (this.formModel[item.value] && this.formModel[item.value] === value) {
-                        list.push(item.label);
-                    }
-                });
-                if (!this.formModel.quantity) {
-                    this.$refs.datatop.validateField('quantity');
-                }
-                if (list.length > 1) {
-                    let repeatedValue = '';
-                    list.forEach((item, index) => {
-                        repeatedValue += item;
-                        if (index !== list.length - 1) {
-                            repeatedValue += '与';
-                        }
-                    });
-                    callback(new Error(repeatedValue + '位置重复，请调整！'));
-                } else if (this.formModel.quantity && value >= this.formModel.quantity) {
-                    callback(new Error('网关位应小于位数量！'));
-                } else {
-                    callback();
-                }
-            };
-            var validateAddr = (rule, value, callback) => {
-                if (!value && value !== 0) {
-                    callback(new Error(rule.messageEmpty));
-                } else if (this.formModel.i_addr === this.formModel.o_addr) {
-                    callback(new Error('输入网关字地址与输出网关字地址不能相同！'));
-                } else {
-                    callback();
-                }
-            };
             switch (row.type) {
             case 'PSD': {
                 this.setDeviceConfigFunction = setPsdConfig;
-                this.formLeft = {
-                    labelWidth: '220px',
-                    items: [
-                        { prop:'i_addr', label:'输入网关字地址:', type: 'number', min: 0, max: 20000, step: 1, precisionFlag: true, precision: 0},
-                        { prop: 'i_c', label: '输入-是否关门位:', type: 'text', rightWidth: '100px', maxlength: 4},
-                        { prop: 'i_dc_b', label: '输入-PSL关门按钮位:', type: 'text', rightWidth: '100px', maxlength: 4},
-                        { prop: 'i_do_b', label: '输入-PSL开门按钮位:', type: 'text', rightWidth: '100px', maxlength: 4},
-                        { prop: 'i_ir', label: '输入-互锁解除钥匙开关位:', type: 'text', rightWidth: '100px', maxlength: 4},
-                        { prop: 'i_l', label: '输入-是否锁闭位:', type: 'text', rightWidth: '100px', maxlength: 4},
-                        { prop: 'i_psl', label: '输入-PSL允许钥匙开关位:', type: 'text', rightWidth: '100px', maxlength: 4},
-                        { prop: 'i_ts_b', label: '输入-PSL试灯按钮位:', type: 'text', rightWidth: '100px', maxlength: 4}
-                    ]
-                };
-                this.leftRules = {
-                    i_addr: [
-                        { validator: validateAddr, messageEmpty: '请填写输入网关字地址', trigger: 'blur' }
-                    ],
-                    i_c: [
-                        { validator: validateDevice, messageEmpty: '请填写输入-是否关门位', list: this.psdLeftValue, trigger: 'blur' }
-                    ],
-                    i_dc_b: [
-                        {validator: validateDevice, messageEmpty: '请填写输入-PSL关门按钮位', list: this.psdLeftValue, trigger: 'blur' }
-                    ],
-                    i_do_b: [
-                        { validator: validateDevice, messageEmpty: '请填写输入-PSL开门按钮位', list: this.psdLeftValue, trigger: 'blur' }
-                    ],
-                    i_ir: [
-                        { validator: validateDevice, messageEmpty: '请填写输入-互锁解除钥匙开关位', list: this.psdLeftValue, trigger: 'blur' }
-                    ],
-                    i_l: [
-                        { validator: validateDevice, messageEmpty: '请填写输入-是否锁闭位', list: this.psdLeftValue, trigger: 'blur' }
-                    ],
-                    i_psl: [
-                        { validator: validateDevice, messageEmpty: '请填写输入-PSL允许钥匙开关位', list: this.psdLeftValue, trigger: 'blur' }
-                    ],
-                    i_ts_b: [
-                        { validator: validateDevice, messageEmpty: '请填写输入-PSL试灯按钮位', list: this.psdLeftValue, trigger: 'blur' }
-                    ]
-                };
-                this.formRight = {
-                    labelWidth: '220px',
-                    items: [
-                        { prop: 'o_addr', label: '输出网关字地址:', type: 'number', min: 0, max: 20000, step: 1, precisionFlag: true, precision: 0},
-                        { prop: 'o_c', label: '输出-关门位:', type: 'text', rightWidth: '100px', maxlength: 4},
-                        { prop: 'o_dc_s', label: '输出-关门信号灯控制位:', type: 'text', rightWidth: '100px', maxlength: 4},
-                        { prop: 'o_dcl_s', label: '输出-关门且锁闭信号灯控制位:', type: 'text', rightWidth: '100px', maxlength: 4},
-                        { prop: 'o_do_s', label: '输出-开门信号灯控制位:', type: 'text', rightWidth: '100px', maxlength: 4},
-                        { prop: 'o_ir_s', label: '输出-互锁解除信号灯控制位:', type: 'text', rightWidth: '100px', maxlength: 4},
-                        { prop: 'o_l', label: '输出-锁闭位:', type: 'text', rightWidth: '100px', maxlength: 4},
-                        { prop: 'o_o', label: '输出-开门位:', type: 'text', rightWidth: '100px', maxlength: 4},
-                        { prop: 'o_psl_s', label: '输出-PSL信号灯控制位:', type: 'text', rightWidth: '100px', maxlength: 4}
-                    ]
-                };
-                this.rightRules = {
-                    o_addr: [
-                        { validator: validateAddr, messageEmpty: '请填写输出网关字地址', trigger: 'blur' }
-                    ],
-                    o_c: [
-                        { validator: validateDevice, messageEmpty: '请填写输出-关门位', list: this.psdRightValue, trigger: 'blur' }
-                    ],
-                    o_dc_s: [
-                        { validator: validateDevice, messageEmpty: '请填写输出-关门信号灯控制位', list: this.psdRightValue, trigger: 'blur' }
-                    ],
-                    o_dcl_s: [
-                        { validator: validateDevice, messageEmpty: '请填写输出-关门且锁闭信号灯控制位', list: this.psdRightValue, trigger: 'blur' }
-                    ],
-                    o_do_s: [
-                        { validator: validateDevice, messageEmpty: '请填写输出-开门信号灯控制位', list: this.psdRightValue, trigger: 'blur' }
-                    ],
-                    o_ir_s: [
-                        { validator: validateDevice, messageEmpty: '请填写输出-互锁解除信号灯控制位', list: this.psdRightValue, trigger: 'blur' }
-                    ],
-                    o_l: [
-                        { validator: validateDevice, messageEmpty: '请填写输出-锁闭位', list: this.psdRightValue, trigger: 'blur' }
-                    ],
-                    o_o: [
-                        { validator: validateDevice, messageEmpty: '请填写输出-开门位', list: this.psdRightValue, trigger: 'blur' }
-                    ],
-                    o_psl_s: [
-                        { validator: validateDevice, messageEmpty: '请填写输出-PSL信号灯控制位', list: this.psdRightValue, trigger: 'blur' }
-                    ]
-                };
                 break;
             }
             case 'SIGNAL': {
                 this.setDeviceConfigFunction = setSignalConfig;
-                this.formTop.labelWidth = '150px';
-                this.formLeft = {
-                    labelWidth: '150px',
-                    items: [
-                        { prop:'i_addr', label:'输入网关字地址:', type: 'number', min: 0, max: 20000, step: 1, precisionFlag: true, precision: 0},
-                        { prop: 'i_f', label: '输入-故障表示位:', type: 'text', rightWidth: '100px', maxlength: 4},
-                        { prop: 'i_g', label: '输入-绿灯表示位:', type: 'text', rightWidth: '100px', maxlength: 4},
-                        { prop: 'i_y', label: '输入-黄灯表示位:', type: 'text', rightWidth: '100px', maxlength: 4},
-                        { prop: 'i_yr', label: '输入-黄红灯表示位:', type: 'text', rightWidth: '100px', maxlength: 4}
-                    ]
-                };
-                this.leftRules = {
-                    i_addr: [
-                        { validator: validateAddr, messageEmpty: '请填写输入网关字地址', trigger: 'blur' }
-                    ],
-                    i_f: [
-                        { validator: validateDevice, messageEmpty: '请填写输入-故障表示位', list: this.signalLeftValue, trigger: 'blur' }
-                    ],
-                    i_g: [
-                        { validator: validateDevice, messageEmpty: '请填写输入-绿灯表示位', list: this.signalLeftValue, trigger: 'blur' }
-                    ],
-                    i_y: [
-                        { validator: validateDevice, messageEmpty: '请填写输入-黄灯表示位', list: this.signalLeftValue, trigger: 'blur' }
-                    ],
-                    i_yr: [
-                        { validator: validateDevice, messageEmpty: '请填写输入-黄红灯表示位', list: this.signalLeftValue, trigger: 'blur'}
-                    ]
-                };
-                this.formRight = {
-                    labelWidth: '150px',
-                    size: 'mini',
-                    items: [
-                        { prop: 'o_addr', label: '输出网关字地址:', type: 'number', min: 0, max: 20000, step: 1, precisionFlag: true, precision: 0},
-                        { prop: 'o_f', label: '输出-故障控制位:', type: 'text', rightWidth: '100px', maxlength: 4},
-                        { prop: 'o_g', label: '输出-绿灯控制位:', type: 'text', rightWidth: '100px', maxlength: 4},
-                        { prop: 'o_r', label: '输出-红灯控制位:', type: 'text', rightWidth: '100px', maxlength: 4},
-                        { prop: 'o_y', label: '输出-黄灯控制位:', type: 'text', rightWidth: '100px', maxlength: 4},
-                        { prop: 'o_yr', label: '输出-黄红灯控制位', type: 'text', rightWidth: '100px', maxlength: 4}
-                    ]
-                };
-                this.rightRules = {
-                    o_addr: [
-                        { validator: validateAddr, messageEmpty: '请填写输出网关字地址', trigger: 'blur' }
-                    ],
-                    o_f: [
-                        { validator: validateDevice, messageEmpty: '请填写输出-故障控制位', list: this.signalRightValue, trigger: 'blur' }
-                    ],
-                    o_g: [
-                        { validator: validateDevice, messageEmpty: '请填写输出-绿灯控制位', list: this.signalRightValue, trigger: 'blur' }
-                    ],
-                    o_r: [
-                        { validator: validateDevice, messageEmpty: '请填写输出-红灯控制位', list: this.signalRightValue, trigger: 'blur' }
-                    ],
-                    o_y: [
-                        { validator: validateDevice, messageEmpty: '请填写输出-黄灯控制位', list: this.signalRightValue, trigger: 'blur' }
-                    ],
-                    o_yr: [
-                        { validator: validateDevice, messageEmpty: '请填写输出-黄红灯控制位', list: this.signalRightValue, trigger: 'blur'}
-                    ]
-                };
                 break;
             }
             case 'SWITCH': {
                 this.setDeviceConfigFunction = setSwitchConfig;
                 this.addrName = '网关地址:';
-                this.formTop.labelWidth = '220';
-                this.formLeft = {
-                    labelWidth: '220px',
-                    items: [
-                        { prop: 'rnp', label: '定位表示:', type: 'number', min: 0, max: 20000, step: 1, precisionFlag: true, precision: 0},
-                        { prop: 'rrp', label: '反位表示:', type: 'number', min: 0, max: 20000, step: 1, precisionFlag: true, precision: 0}
-                    ]
-                };
-                this.leftRules = {
-                    rnp: [
-                        { required: true, message: '请填写-定位表示', trigger: 'blur' },
-                        { validator: validateDevice, list: this.switchValue, trigger:  ['blur', 'change'] }
-                    ],
-                    rrp: [
-                        { required: true, message: '请填写反位表示', trigger: 'blur' },
-                        { validator: validateDevice, list: this.switchValue, trigger:  ['blur', 'change'] }
-                    ]
-                };
-                this.formRight = {
-                    labelWidth: '160px',
-                    items: [
-                        { prop: 'wnp', label: '定位控制:', type: 'number', min: 0, max: 20000, step: 1, precisionFlag: true, precision: 0},
-                        { prop: 'wrp', label: '反位控制:', type: 'number', min: 0, max: 20000, step: 1, precisionFlag: true, precision: 0},
-                        { prop: 'wl', label: '锁闭控制:', type: 'number', min: 0, max: 20000, step: 1, precisionFlag: true, precision: 0}
-                    ]
-                };
-                this.rightRules = {
-                    wnp: [
-                        { required: true, message: '请填写定位控制', trigger: 'blur' },
-                        { validator: validateDevice, list: this.switchValue, trigger:  ['blur', 'change'] }
-                    ],
-                    wrp: [
-                        { required: true, message: '请填写反位控制', trigger: 'blur' },
-                        { validator: validateDevice, list: this.switchValue, trigger:  ['blur', 'change'] }
-                    ],
-                    wl: [
-                        { required: true, message: '请填写锁闭控制', trigger: 'blur' },
-                        { validator: validateDevice, list: this.switchValue, trigger:  ['blur', 'change'] }
-                    ]
-                };
                 break;
             }
             case 'PSL': {
                 this.setDeviceConfigFunction = setPslConfig;
                 this.addrName = '网关地址:';
-                this.formLeft = {
-                    labelWidth: '170px',
-                    items: [
-                        { prop: 'rpslcz', label: '读PSL操作旋钮位:', type: 'number', min: 0, max: 20000, step: 1, precisionFlag: true, precision: 0},
-                        { prop: 'rgman', label: '读关门按钮位:', type: 'number', min: 0, max: 20000, step: 1, precisionFlag: true, precision: 0},
-                        { prop: 'rkman', label: '读开门按钮位:', type: 'number', min: 0, max: 20000, step: 1, precisionFlag: true, precision: 0},
-                        { prop: 'rjc', label: '读互锁解除开关位:', type: 'number', min: 0, max: 20000, step: 1, precisionFlag: true, precision: 0},
-                        { prop: 'rsdan', label: '读试灯按钮位:', type: 'number', min: 0, max: 20000, step: 1, precisionFlag: true, precision: 0},
-                        { prop: 'rjtan', label: '读紧急停车按钮位', type: 'number', min: 0, max: 20000, step: 1, precisionFlag: true, precision: 0}
-                    ]
-                };
-                this.leftRules = {
-                    rpslcz: [
-                        { required: true, message: '请填写\'读PSL操作旋钮位\'', trigger: 'blur' },
-                        { validator: validateDevice, list: this.pslLeftValue, trigger:  ['blur', 'change'] }
-                    ],
-                    rgman: [
-                        { required: true, message: '请填写\'读关门按钮位\'', trigger: 'blur' },
-                        { validator: validateDevice, list: this.pslLeftValue, trigger:  ['blur', 'change'] }
-                    ],
-                    rkman: [
-                        { required: true, message: '请填写\'读开门按钮位\'', trigger: 'blur' },
-                        { validator: validateDevice, list: this.pslLeftValue, trigger:  ['blur', 'change'] }
-                    ],
-                    rjc: [
-                        { required: true, message: '请填写\'读互锁解除开关位\'', trigger: 'blur' },
-                        { validator: validateDevice, list: this.pslLeftValue, trigger:  ['blur', 'change'] }
-                    ],
-                    rsdan: [
-                        { required: true, message: '请填写\'读试灯按钮位\'', trigger: 'blur' },
-                        { validator: validateDevice, list: this.pslLeftValue, trigger:  ['blur', 'change'] }
-                    ],
-                    rjtan: [
-                        { required: true, message: '请填写\'读紧急停车按钮位\'', trigger: 'blur' },
-                        { validator: validateDevice, list: this.pslLeftValue, trigger:  ['blur', 'change'] }
-                    ]
-                };
-                this.formRight = {
-                    labelWidth: '170px',
-                    items: [
-                        { prop: 'wqbgbd', label: '写全部关门指示灯位:', type: 'number', min: 0, max: 20000, step: 1, precisionFlag: true, precision: 0},
-                        { prop: 'wkmdwd', label: '写开门到位指示灯位:', type: 'number', min: 0, max: 20000, step: 1, precisionFlag: true, precision: 0},
-                        { prop: 'wpslyxd', label: '写PSL允许指示灯位:', type: 'number', min: 0, max: 20000, step: 1, precisionFlag: true, precision: 0},
-                        { prop: 'wjcd', label: '写互锁解除指示灯位:', type: 'number', min: 0, max: 20000, step: 1, precisionFlag: true, precision: 0},
-                        { prop: 'wibpczd', label: '写IBP盘操作指示灯位:', type: 'number', min: 0, max: 20000, step: 1, precisionFlag: true, precision: 0},
-                        { prop: 'wpstczd', label: '写PST操作指示灯位:', type: 'number', min: 0, max: 20000, step: 1, precisionFlag: true, precision: 0}
-                    ]
-                };
-                this.rightRules = {
-                    wqbgbd: [
-                        { required: true, message: '请填写\'写全部关门指示灯位\'', trigger: 'blur' },
-                        { validator: validateDevice, list: this.pslRightValue, trigger: ['blur', 'change'] }
-                    ],
-                    wkmdwd: [
-                        { required: true, message: '请填写\'写开门到位指示灯位\'', trigger: 'blur' },
-                        { validator: validateDevice, list: this.pslRightValue, trigger:  ['blur', 'change'] }
-                    ],
-                    wpslyxd: [
-                        { required: true, message: '请填写\'写PSL允许指示灯位\'', trigger: 'blur' },
-                        { validator: validateDevice, list: this.pslRightValue, trigger:  ['blur', 'change'] }
-                    ],
-                    wjcd: [
-                        { required: true, message: '请填写\'写互锁解除指示灯位\'', trigger: 'blur' },
-                        { validator: validateDevice, list: this.pslRightValue, trigger:  ['blur', 'change'] }
-                    ],
-                    wibpczd: [
-                        { required: true, message: '请填写\'写IBP盘操作指示灯位\'', trigger: 'blur' },
-                        { validator: validateDevice, list: this.pslRightValue, trigger:  ['blur', 'change'] }
-                    ],
-                    wpstczd: [
-                        { required: true, message: '请填写\'写PST操作指示灯位\'', trigger: 'blur' },
-                        { validator: validateDevice, list: this.pslRightValue, trigger:  ['blur', 'change'] }
-                    ]
-                };
                 break;
             }
             case 'PSC': {
                 this.setDeviceConfigFunction = setPscConfig;
                 this.addrName = '网关位地址:';
-                this.formLeft = {
-                    labelWidth: '220px',
-                    items: [
-                        { prop: 'wpslsn', label: 'PSL使能:', type: 'number', min: 0, max: 20000, step: 1, precisionFlag: true, precision: 0},
-                        { prop: 'wpslkm', label: 'PSL开门:', type: 'number', min: 0, max: 20000, step: 1, precisionFlag: true, precision: 0},
-                        { prop: 'wpslgm', label: 'PSL关门:', type: 'number', min: 0, max: 20000, step: 1, precisionFlag: true, precision: 0},
-                        { prop: 'wpslhsjc', label: 'PSL互锁解除:', type: 'number', min: 0, max: 20000, step: 1, precisionFlag: true, precision: 0},
-                        { prop: 'wibpsn', label: 'IBP使能:', type: 'number', min: 0, max: 20000, step: 1, precisionFlag: true, precision: 0},
-                        { prop: 'wibpkm', label: 'IBP开门:', type: 'number', min: 0, max: 20000, step: 1, precisionFlag: true, precision: 0},
-                        { prop: 'wibpgm', label: 'IBP关门:', type: 'number', min: 0, max: 20000, step: 1, precisionFlag: true, precision: 0}
-                    ]
-                };
-                this.leftRules = {
-                    wpslsn: [
-                        { required: true, message: '请填写PSL使能', trigger: 'blur' },
-                        { validator: validateDevice, list: this.pslLeftValue, trigger:  ['blur', 'change'] }
-                    ],
-                    wpslkm: [
-                        { required: true, message: '请填写PSL开门', trigger: 'blur' },
-                        { validator: validateDevice, list: this.pslLeftValue, trigger:  ['blur', 'change'] }
-                    ],
-                    wpslgm: [
-                        { required: true, message: '请填写PSL关门', trigger: 'blur' },
-                        { validator: validateDevice, list: this.pslLeftValue, trigger:  ['blur', 'change'] }
-                    ],
-                    wpslhsjc: [
-                        { required: true, message: '请填写PSL互锁解除', trigger: 'blur' },
-                        { validator: validateDevice, list: this.pslLeftValue, trigger:  ['blur', 'change'] }
-                    ],
-                    wibpsn: [
-                        { required: true, message: '请填写IBP使能', trigger: 'blur' },
-                        { validator: validateDevice, list: this.pslLeftValue, trigger:  ['blur', 'change'] }
-                    ],
-                    wibpkm: [
-                        { required: true, message: '请填写IBP开门', trigger: 'blur' },
-                        { validator: validateDevice, list: this.pslLeftValue, trigger:  ['blur', 'change'] }
-                    ],
-                    wibpgm: [
-                        { required: true, message: '请填写IBP关门', trigger: 'blur' },
-                        { validator: validateDevice, list: this.pslLeftValue, trigger:  ['blur', 'change'] }
-                    ]
-                };
-                this.formRight = {};
-                this.rightRules = {};
                 break;
             }
             }
         },
         initData(row) {
+            this.jsonConfig = '{}';
             getDeviceDetail(row.id).then(resp => {
                 if (resp.data.config) {
                     this.formModel = JSON.parse(resp.data.config);
+                    this.jsonConfig = JSON.stringify(JSON.parse(resp.data.config), null, 4);
                 }
-            }).catch(()=> {
+            }).catch((e)=> {
                 this.$message.error('获取项目设备详情失败！');
             });
             if (row.type === 'PSL' || row.type === 'PSC') {
@@ -579,36 +155,28 @@ export default {
                     flag = valid;
                 });
             }
-            this.$refs.datatop.validateForm(() => {
-                self.$refs.dataleft.validateForm(()=> {
-                    if (this.data.type === 'PSC') {
-                        flag && self.setDeviceConfigFunction(this.data.id, this.formModel).then(response => {
-                            self.$message.success('设置设备网关映射配置成功');
-                            self.handleClose();
-                            self.$emit('reloadTable');
-                        }).catch(error => {
-                            self.$message.error(this.$t('tip.modifyTheFailure') + error.message);
-                        });
-                    } else {
-                        self.$refs.dataright.validateForm(()=> {
-                            flag && self.setDeviceConfigFunction(this.data.id, this.formModel).then(response => {
-                                self.$message.success('设置设备网关映射配置成功');
-                                self.handleClose();
-                                self.$emit('reloadTable');
-                            }).catch(error => {
-                                self.$message.error(this.$t('tip.modifyTheFailure') + error.message);
-                            });
-                        });
-                    }
-                });
+            const form = JSON.parse(this.jsonConfig);
+            // if (this.data.type === 'PSC' || this.data.type === 'PSL') {
+            //     form.psdCode = this.formModel.psdCode;
+            //     flag && self.setDeviceConfigFunction(this.data.id, form).then(response => {
+            //         self.$message.success('设置设备网关映射配置成功');
+            //         self.handleClose();
+            //         self.$emit('reloadTable');
+            //     }).catch(error => {
+            //         self.$message.error(this.$t('tip.modifyTheFailure') + error.message);
+            //     });
+            // } else {
+            flag && self.setDeviceConfigFunction(this.data.id, form).then(response => {
+                self.$message.success('设置设备网关映射配置成功');
+                self.handleClose();
+                self.$emit('reloadTable');
+            }).catch(error => {
+                self.$message.error(this.$t('tip.modifyTheFailure') + error.message);
             });
+            // }
         },
         handleClose() {
             this.formModel = {};
-            this.formLeft = {};
-            this.formRight = {};
-            this.leftRules = {};
-            this.rightRules = {};
             this.data = {};
             this.mapList = [];
             this.stationList = [];
@@ -618,9 +186,6 @@ export default {
             this.stationCode = '';
             this.standCode = '';
             this.dialogVisible = false;
-            this.$refs.datatop.resetForm();
-            this.$refs.dataleft.resetForm();
-            this.$refs.dataright && this.$refs.dataright.resetForm();
             this.$refs.form && this.$refs.form.resetFields();
         },
         mapIdChange(mapId) {
diff --git a/src/views/system/deviceManage/editConfigIbp.vue b/src/views/system/deviceManage/editConfigIbp.vue
index 2bbffba69..5408bd983 100644
--- a/src/views/system/deviceManage/editConfigIbp.vue
+++ b/src/views/system/deviceManage/editConfigIbp.vue
@@ -1,272 +1,29 @@
 <template>
   <el-dialog v-dialogDrag :title="title" :visible.sync="dialogVisible" top="10vh" width="60%" :before-close="handleClose" center :close-on-click-modal="false">
-    <data-form ref="dataTop" :form="formTop" :inline="inline" :form-model="formModel" :rules="topRules" />
-    <el-form ref="formStation" :model="formModel" label-width="220px" :rules="rulesStation" :inline="inline">
-      <el-form-item label="关联地图:" prop="mapId">
-        <el-select v-model="mapId" placeholder="请选择" size="small" style="width: 180px" @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="stationCode">
-        <el-select v-model="formModel.stationCode" placeholder="请选择" style="width: 180px" size="small">
-          <el-option
-            v-for="item in stationList"
-            :key="item.code"
-            :label="item.name"
-            :value="item.code"
-          />
-        </el-select>
-      </el-form-item>
-    </el-form>
-    <div style="height: 485px; overflow-y: auto;">
-      <el-collapse v-model="activeNames">
-        <el-collapse-item title="IBP盘AFC闸机配置对象" name="1">
-          <el-row :gutter="20">
-            <el-col :span="12">
-              <el-card class="box-card">
-                <div slot="header" class="clearfix">
-                  <span>输入配置:</span>
-                </div>
-                <div style="margin-top: 20px">
-                  <data-form ref="dataAfcLeft" :form="formAfc.left" :form-model="formModel.afczjConfig" :rules="rulesAfc" />
-                </div>
-              </el-card>
-            </el-col>
-            <el-col :span="12">
-              <el-card class="box-card">
-                <div slot="header" class="clearfix">
-                  <span>输出配置:</span>
-                </div>
-                <div style="margin-top: 20px">
-                  <data-form ref="dataAfcRight" :form="formAfc.right" :form-model="formModel.afczjConfig" :rules="rulesAfc" />
-                </div>
-              </el-card>
-            </el-col>
-          </el-row>
-        </el-collapse-item>
-        <el-collapse-item title="IBP盘电梯和扶梯配置对象" name="2">
-          <el-row :gutter="20">
-            <el-col :span="12">
-              <el-card class="box-card">
-                <div slot="header" class="clearfix">
-                  <span>输入配置:</span>
-                </div>
-                <div style="margin-top: 20px">
-                  <data-form ref="dataElevatorLeft" :form="formElevator.left" :form-model="formModel.dftConfig" :rules="rulesElevator" />
-                </div>
-              </el-card>
-            </el-col>
-            <el-col :span="12">
-              <el-card class="box-card">
-                <div slot="header" class="clearfix">
-                  <span>输出配置:</span>
-                </div>
-                <div style="margin-top: 20px">
-                  <data-form ref="dataElevatorRight" :form="formElevator.right" :form-model="formModel.dftConfig" :rules="rulesElevator" />
-                </div>
-              </el-card>
-            </el-col>
-          </el-row>
-        </el-collapse-item>
-        <el-collapse-item title="IBP盘环境与设备监控配置对象" name="3">
-          <el-row :gutter="20">
-            <el-col :span="12">
-              <el-card class="box-card">
-                <div slot="header" class="clearfix">
-                  <span>输入配置:</span>
-                </div>
-                <div style="margin-top: 20px">
-                  <data-form ref="dataMonitorLeft" :form="formMonitor.left" :form-model="formModel.hjsbjkConfig" :rules="rulesMonitor" />
-                </div>
-              </el-card>
-            </el-col>
-            <el-col :span="12">
-              <el-card class="box-card">
-                <div slot="header" class="clearfix">
-                  <span>输出配置:</span>
-                </div>
-                <div style="margin-top: 20px">
-                  <data-form ref="dataMonitorRight" :form="formMonitor.right" :form-model="formModel.hjsbjkConfig" :rules="rulesMonitor" />
-                </div>
-              </el-card>
-            </el-col>
-          </el-row>
-        </el-collapse-item>
-        <el-collapse-item title="IBP盘门禁配置对象" name="4">
-          <el-row :gutter="20">
-            <el-col :span="12">
-              <el-card class="box-card">
-                <div slot="header" class="clearfix">
-                  <span>输入配置:</span>
-                </div>
-                <div style="margin-top: 20px">
-                  <data-form ref="dataEgLeft" :form="formEg.left" :form-model="formModel.mjConfig" :rules="rulesEg" />
-                </div>
-              </el-card>
-            </el-col>
-            <el-col :span="12">
-              <el-card class="box-card">
-                <div slot="header" class="clearfix">
-                  <span>输出配置:</span>
-                </div>
-                <div style="margin-top: 20px">
-                  <data-form ref="dataEgRight" :form="formEg.right" :form-model="formModel.mjConfig" :rules="rulesEg" />
-                </div>
-              </el-card>
-            </el-col>
-          </el-row>
-        </el-collapse-item>
-        <el-collapse-item title="IBP盘屏蔽门配置对象" name="5">
-          <el-row :gutter="20">
-            <el-col :span="12">
-              <el-card class="box-card">
-                <div slot="header" class="clearfix">
-                  <span>输入配置:</span>
-                </div>
-                <div style="margin-top: 20px">
-                  <data-form ref="dataPsdLeft" :form="formPsd.left" :form-model="formModel.pbmConfig" :rules="rulesPsd" />
-                </div>
-              </el-card>
-            </el-col>
-            <el-col :span="12">
-              <el-card class="box-card">
-                <div slot="header" class="clearfix">
-                  <span>输出配置:</span>
-                </div>
-                <div style="margin-top: 20px">
-                  <data-form ref="dataPsdRight" :form="formPsd.right" :form-model="formModel.pbmConfig" :rules="rulesPsd" />
-                </div>
-              </el-card>
-            </el-col>
-          </el-row>
-        </el-collapse-item>
-        <el-collapse-item title="IBP盘隧道通风配置对象" name="6">
-          <el-row :gutter="20">
-            <el-col :span="12">
-              <el-card class="box-card">
-                <div slot="header" class="clearfix">
-                  <span>输入配置:</span>
-                </div>
-                <div style="margin-top: 20px">
-                  <data-form ref="dataTunnelLeft" :form="formTunnel.left" :form-model="formModel.sdtfConfig" :rules="rulesTunnel" />
-                </div>
-              </el-card>
-            </el-col>
-            <el-col :span="12">
-              <el-card class="box-card">
-                <div slot="header" class="clearfix">
-                  <span>输出配置:</span>
-                </div>
-                <div style="margin-top: 20px">
-                  <data-form ref="dataTunnelRight" :form="formTunnel.right" :form-model="formModel.sdtfConfig" :rules="rulesTunnel" />
-                </div>
-              </el-card>
-            </el-col>
-          </el-row>
-        </el-collapse-item>
-        <el-collapse-item title="IBP盘信号配置对象" name="7">
-          <el-row :gutter="20">
-            <el-col :span="12">
-              <el-card class="box-card">
-                <div slot="header" class="clearfix">
-                  <span>输入配置:</span>
-                </div>
-                <div style="margin-top: 20px">
-                  <data-form ref="dataSignLeft" :form="formSign.left" :form-model="formModel.xhConfig" :rules="rulesSign" />
-                </div>
-              </el-card>
-            </el-col>
-            <el-col :span="12">
-              <el-card class="box-card">
-                <div slot="header" class="clearfix">
-                  <span>输出配置:</span>
-                </div>
-                <div style="margin-top: 20px">
-                  <data-form ref="dataSignRight" :form="formSign.right" :form-model="formModel.xhConfig" :rules="rulesSign" />
-                </div>
-              </el-card>
-            </el-col>
-          </el-row>
-        </el-collapse-item>
-        <el-collapse-item title="IBP盘消火栓泵配置对象" name="8">
-          <el-row :gutter="20">
-            <el-col :span="12">
-              <el-card class="box-card">
-                <div slot="header" class="clearfix">
-                  <span>输入配置:</span>
-                </div>
-                <div style="margin-top: 20px">
-                  <data-form ref="dataFhLeft" :form="formFh.left" :form-model="formModel.xhsbConfig" :rules="rulesFh" />
-                </div>
-              </el-card>
-            </el-col>
-            <el-col :span="12">
-              <el-card class="box-card">
-                <div slot="header" class="clearfix">
-                  <span>输出配置:</span>
-                </div>
-                <div style="margin-top: 20px">
-                  <data-form ref="dataFhRight" :form="formFh.right" :form-model="formModel.xhsbConfig" :rules="rulesFh" />
-                </div>
-              </el-card>
-            </el-col>
-          </el-row>
-        </el-collapse-item>
-        <el-collapse-item title="IBP盘环境与设备监控——站台层配置对象" name="9">
-          <el-row :gutter="20">
-            <el-col :span="12">
-              <el-card class="box-card">
-                <div slot="header" class="clearfix">
-                  <span>输入配置:</span>
-                </div>
-                <div style="margin-top: 20px">
-                  <data-form ref="dataEemPlatformLeft" :form="formEemPlatform.left" :form-model="formModel.hjsbjkConfig.pfConfig" :rules="rulesEemPlatform" />
-                </div>
-              </el-card>
-            </el-col>
-            <el-col :span="12">
-              <el-card class="box-card">
-                <div slot="header" class="clearfix">
-                  <span>输出配置:</span>
-                </div>
-                <div style="margin-top: 20px">
-                  <data-form ref="dataEemPlatformRight" :form="formEemPlatform.right" :form-model="formModel.hjsbjkConfig.pfConfig" :rules="rulesEemPlatform" />
-                </div>
-              </el-card>
-            </el-col>
-          </el-row>
-        </el-collapse-item>
-        <el-collapse-item title="IBP盘环境与设备监控——站厅层配置对象" name="10">
-          <el-row :gutter="20">
-            <el-col :span="12">
-              <el-card class="box-card">
-                <div slot="header" class="clearfix">
-                  <span>输入配置:</span>
-                </div>
-                <div style="margin-top: 20px">
-                  <data-form ref="dataEemHallLeft" :form="formEemHall.left" :form-model="formModel.hjsbjkConfig.shfConfig" :rules="rulesEemHall" />
-                </div>
-              </el-card>
-            </el-col>
-            <el-col :span="12">
-              <el-card class="box-card">
-                <div slot="header" class="clearfix">
-                  <span>输出配置:</span>
-                </div>
-                <div style="margin-top: 20px">
-                  <data-form ref="dataEemHallRight" :form="formEemHall.right" :form-model="formModel.hjsbjkConfig.shfConfig" :rules="rulesEemHall" />
-                </div>
-              </el-card>
-            </el-col>
-          </el-row>
-        </el-collapse-item>
-      </el-collapse>
-    </div>
+    <!--<data-form ref="dataTop" :form="formTop" :inline="inline" :form-model="formModel" :rules="topRules" />-->
+    <!--<el-form ref="formStation" :model="formModel" label-width="220px" :rules="rulesStation" :inline="inline">-->
+    <!--<el-form-item label="关联地图:" prop="mapId">-->
+    <!--<el-select v-model="mapId" placeholder="请选择" size="small" style="width: 180px" @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="stationCode">-->
+    <!--<el-select v-model="formModel.stationCode" placeholder="请选择" style="width: 180px" size="small">-->
+    <!--<el-option-->
+    <!--v-for="item in stationList"-->
+    <!--:key="item.code"-->
+    <!--:label="item.name"-->
+    <!--:value="item.code"-->
+    <!--/>-->
+    <!--</el-select>-->
+    <!--</el-form-item>-->
+    <!--</el-form>-->
+    <el-input v-model="jsonConfig" autosize type="textarea" />
     <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>
@@ -276,209 +33,9 @@
 
 <script>
 import { getDeviceDetail, setIbpConfig} from '@/api/project';
-import { deepAssign } from '@/utils/index';
+// import { deepAssign } from '@/utils/index';
 import { getAllMapOnline, getStationListNeedAttendant } from '@/api/jmap/map';
-const propMap = {
-    ribpsd: 'IBP盘试灯按钮',
-    wibpsdand: 'IBP盘试灯指示灯',
-    afczjConfig: {
-        rjjsf: '紧急释放按钮[AFC配置]',
-        ryskg: '钥匙开关[AFC配置]',
-        wjjsfand: '紧急释放按钮灯[AFC配置]',
-        wjjsfztzsd: '紧急释放状态指示灯[AFC配置]',
-        wxfldzsd: '消防联动指示灯[AFC配置]',
-        wyxwzsd: '有效位指示灯[AFC配置]'
-    },
-    dftConfig: {
-        rdt01tt: '电梯01停梯按钮[电扶梯配置]',
-        rft01tt: '扶梯01停梯按钮[电扶梯配置]',
-        rft02tt: '扶梯02停梯按钮[电扶梯配置]',
-        rft03tt: '扶梯03停梯按钮[电扶梯配置]',
-        rft04tt: '扶梯04停梯按钮[电扶梯配置]',
-        ryskg: '钥匙开关[电扶梯配置]',
-        wdt01sxzsd: '电梯01上行指示灯[电扶梯配置]',
-        wdt01ttand: '电梯01停梯按钮灯[电扶梯配置]',
-        wdt01xxzsd: '电梯01下行指示灯[电扶梯配置]',
-        wdt01zsd: '电梯01指示灯[电扶梯配置]',
-        wft01sxzsd: '扶梯01上行指示灯[电扶梯配置]',
-        wft01ttand: '扶梯01停梯按钮灯[电扶梯配置]',
-        wft01xxzsd: '扶梯01下行指示灯[电扶梯配置]',
-        wft01zsd: '扶梯01指示灯[电扶梯配置]',
-        wft02sxzsd: '扶梯02上行指示灯[电扶梯配置]',
-        wft02ttand: '扶梯02停梯按钮灯[电扶梯配置]',
-        wft02xxzsd: '扶梯02下行指示灯[电扶梯配置]',
-        wft02zsd: '扶梯02指示灯[电扶梯配置]',
-        wft03sxzsd: '扶梯03上行指示灯[电扶梯配置]',
-        wft03ttand: '扶梯03停梯按钮灯[电扶梯配置]',
-        wft03xxzsd: '扶梯03下行指示灯[电扶梯配置]',
-        wft03zsd: '扶梯03指示灯[电扶梯配置]',
-        wft04sxzsd: '扶梯04上行指示灯[电扶梯配置]',
-        wft04ttand: '扶梯04停梯按钮灯[电扶梯配置]',
-        wft04xxzsd: '扶梯04下行指示灯[电扶梯配置]',
-        wft04zsd: '扶梯04指示灯[电扶梯配置]',
-        wyskgzsd: '开关指示灯[电扶梯配置]'
-    },
-    hjsbjkConfig: {
-        rfw: '复位按钮[环境设备监控配置]',
-        rzhkg: '自动/手动钥匙转换开关[环境设备监控配置]',
-        wfwand: '复位按钮灯[环境设备监控配置]',
-        wsdztzsd: '手动状态指示灯[环境设备监控配置]',
-        wzdztzsd: '自动状态指示灯[环境设备监控配置]',
-        wzhkgzsd: '自动/手动钥匙转换开关手动位指示灯[环境设备监控配置]',
-        pfConfig: {
-            r04kvdykggs: '0.4KV低压开关柜室按钮[站台监控配置]',
-            r35kvkggs: '35KV开关柜室按钮[站台监控配置]',
-            rggqhz: '公共区火灾按钮[站台监控配置]',
-            rkzs: '控制室按钮[站台监控配置]',
-            rsytxsbshz: '商用通信设备室火灾按钮[站台监控配置]',
-            rzlbyqs1: '整流变压器室一按钮[站台监控配置]',
-            rzlbyqs2: '整流变压器室二按钮[站台监控配置]',
-            rzlkggshz: '直流开关柜室火灾按钮[站台监控配置]',
-            rzszddzshz: '再生制动电阻室火灾按钮[站台监控配置]',
-            rzszdkzshz: '再生制动控制室火灾按钮[站台监控配置]',
-            w35kvkggsand: '35KV开关柜室按钮灯[站台监控配置]',
-            wggqhzand: '公共区火灾按钮灯[站台监控配置]',
-            wkzsand: '控制室按钮灯[站台监控配置]',
-            wr04kvdykggsand: '0.4KV低压开关柜室按钮灯[站台监控配置]',
-            wsytxsbshzand: '商用通信设备室火灾按钮灯[站台监控配置]',
-            wzlbyqs1and: '整流变压器室一按钮灯[站台监控配置]',
-            wzlbyqs2and: '整流变压器室二按钮灯[站台监控配置]',
-            wzlkggshzand: '直流开关柜室火灾按钮灯[站台监控配置]',
-            wzszddzshzand: '再生制动电阻室火灾按钮灯[站台监控配置]',
-            wzszdkzshzand: '再生制动控制室火灾按钮灯[站台监控配置]'
-        },
-        shfConfig: {
-            rczkzshz: '车站控制室火灾按钮[站厅监控配置]',
-            rggqhz: '公共区火灾按钮[站厅监控配置]',
-            rydhkdkshz: '右端环控电控室火灾按钮[站厅监控配置]',
-            rydjfkthz: '右端机房空调火灾按钮[站厅监控配置]',
-            rydlsjfhz: '右端冷水机房火灾按钮[站厅监控配置]',
-            rydqyfjhz: '右端其余房间火灾按钮[站厅监控配置]',
-            rydzlhz: '右端走廊火灾按钮[站厅监控配置]',
-            rzdhkdkshz: '左端环控电控室火灾按钮[站厅监控配置]',
-            rzdktjfhz: '左端空调机房火灾按钮[站厅监控配置]',
-            rzdqyfjhz: '左端其余房间火灾按钮[站厅监控配置]',
-            wczkzshzand: '车站控制室火灾按钮灯[站厅监控配置]',
-            wggqhzand: '公共区火灾按钮灯[站厅监控配置]',
-            wydhkdkshzand: '右端环控电控室火灾按钮灯[站厅监控配置]',
-            wydjfkthzand: '右端机房空调火灾按钮灯[站厅监控配置]',
-            wydlsjfhzand: '右端冷水机房火灾按钮灯[站厅监控配置]',
-            wydqyfjhzand: '右端其余房间火灾按钮灯[站厅监控配置]',
-            wydzlhzand: '右端走廊火灾按钮灯[站厅监控配置]',
-            wzdhkdkshzand: '左端环控电控室火灾按钮灯[站厅监控配置]',
-            wzdktjfhzand: '左端空调机房火灾按钮灯[站厅监控配置]',
-            wzdqyfjhzand: '左端其余房间火灾按钮灯[站厅监控配置]'
-        }
-    },
-    mjConfig: {
-        radjjsf: 'A端紧急释放按钮[门禁配置]',
-        rbdjjsf: 'B端紧急释放按钮[门禁配置]',
-        wadjjsfand: 'A端紧急释放按钮灯[门禁配置]',
-        wadjjsfzsdg: 'A端紧急释放绿色指示灯[门禁配置]',
-        wadjjsfzsdr: 'A端紧急释放红色指示灯[门禁配置]',
-        wadjjsfzsdy: 'A端紧急释放黄色指示灯[门禁配置]',
-        wbdjjsfand: 'B端紧急释放按钮灯[门禁配置]',
-        wbdjjsfzsdg: 'B端紧急释放绿色指示灯[门禁配置]',
-        wbdjjsfzsdr: 'B端紧急释放红色指示灯[门禁配置]',
-        wbdjjsfzsdy: 'B端紧急释放黄色指示灯[门禁配置]'
-    },
-    pbmConfig: {
-        rsxczyx: '上行操作允许钥匙开关[屏蔽门配置]',
-        rsxgm: '上行关门按钮[屏蔽门配置]',
-        rsxkm: '上行开门按钮[屏蔽门配置]',
-        rxxczyx: '下行操作允许钥匙开关[屏蔽门配置]',
-        rxxgm: '下行关门按钮[屏蔽门配置]',
-        rxxkm: '下行开门按钮[屏蔽门配置]',
-        wsxczyxzsd: '上行操作允许指示灯[屏蔽门配置]',
-        wsxgmand: '上行关门按钮灯[屏蔽门配置]',
-        wsxgmsbzsd: '上行关门锁闭指示灯[屏蔽门配置]',
-        wsxkmand: '上行开门按钮灯[屏蔽门配置]',
-        wsxkmdwzsd: '上行开门到位指示灯[屏蔽门配置]',
-        wxxczyxzsd: '下行操作允许指示灯[屏蔽门配置]',
-        wxxgmand: '下行关门按钮灯[屏蔽门配置]',
-        wxxgmsbzsd: '下行关门锁闭指示灯[屏蔽门配置]',
-        wxxkmand: '下行开门按钮灯[屏蔽门配置]',
-        wxxkmdwzsd: '下行开门到位指示灯[屏蔽门配置]'
-    },
-    sdtfConfig: {
-        rsxcrdx: '上行出入段线按钮p[隧道通风配置]',
-        rsxczsdhz: '上行车站隧道火灾按钮[隧道通风配置]',
-        rsxhz1y: '上行火灾1右按钮[隧道通风配置]',
-        rsxhz2y: '上行火灾2右按钮[隧道通风配置]',
-        rsxzc1y: '上行阻塞1右按钮[隧道通风配置]',
-        rsxzc2y: '上行阻塞2右按钮[隧道通风配置]',
-        rsxzthz: '上行站台火灾按钮[隧道通风配置]',
-        rxxcrdx: '下行出入段线按钮[隧道通风配置]',
-        rxxczsdhz: '下行车站隧道火灾按钮[隧道通风配置]',
-        rxxhz1y: '下行火灾1右按钮[隧道通风配置]',
-        rxxhz2y: '下行火灾2右按钮[隧道通风配置]',
-        rxxzc1y: '下行阻塞1右按钮[隧道通风配置]',
-        rxxzc2y: '下行阻塞2右按钮[隧道通风配置]',
-        rxxzthz: '下行站台火灾按钮[隧道通风配置]',
-        rtcxhz: '停火线火灾按钮[隧道通风配置]',
-        wsxcrdxand: '上行出入段线按钮灯[隧道通风配置]',
-        wsxczsdhzand: '上行车站隧道火灾按钮灯[隧道通风配置]',
-        wsxhz1yand: '上行火灾1右按钮灯[隧道通风配置]',
-        wsxhz2yand:'上行火灾2右按钮灯[隧道通风配置]',
-        wsxzc1yand: '上行阻塞1右按钮灯[隧道通风配置]',
-        wsxzc2yand: '上行阻塞2右按钮灯[隧道通风配置]',
-        wsxzthzand: '上行站台火灾按钮灯[隧道通风配置]',
-        wxxcrdxand: '下行出入段线按钮灯[隧道通风配置]',
-        wxxczsdhzand: '下行车站隧道火灾按钮灯[隧道通风配置]',
-        wxxhz1yand: '下行火灾1右按钮灯[隧道通风配置]',
-        wxxhz2yand: '下行火灾2右按钮灯[隧道通风配置]',
-        wxxzc1yand: '下行阻塞1右按钮灯[隧道通风配置]',
-        wxxzc2yand: '下行阻塞2右按钮灯[隧道通风配置]',
-        wxxzthzand: '下行站台火灾按钮灯[隧道通风配置]',
-        wtcxhzand: '停车线火灾按钮灯[隧道通风配置]'
-    },
-    xhConfig: {
-        rsxjjtc: '上行紧急停车按钮[信号配置]',
-        rsxjljc: '上行警铃解除按钮[信号配置]',
-        rsxkc: '上行扣车按钮[信号配置]',
-        rsxqxjjtc: '上行取消紧急停车按钮[信号配置]',
-        rsxqxkc: '上行取消扣车按钮[信号配置]',
-        rsxsd: '上行试灯按钮[信号配置]',
-        rxxjjtc: '下行紧急停车按钮[信号配置]',
-        rxxjljc: '下行警铃解除按钮[信号配置]',
-        rxxkc: '下行扣车按钮[信号配置]',
-        rxxqxjjtc: '下行取消紧急停车按钮[信号配置]',
-        rxxqxkc: '下行取消扣车按钮[信号配置]',
-        rxxsd: '下行试灯按钮[信号配置]',
-        wfmq: '蜂鸣器[信号配置]',
-        wsxjjtccand: '上行紧急停车按钮灯[信号配置]',
-        wsxjjtczsd: '上行紧急停车指示灯[信号配置]',
-        wsxjljcand: '上行警铃解除按钮灯[信号配置]',
-        wsxkcand: '上行扣车按钮灯[信号配置]',
-        wsxkczsd: '上行扣车指示灯[信号配置]',
-        wsxqxjjtcand: '上行取消紧急停车按钮灯[信号配置]',
-        wsxqxkcand: '上行取消扣车按钮灯[信号配置]',
-        wsxqxkczsd: '上行取消扣车指示灯[信号配置]',
-        wsxsdand: '上行试灯按钮灯[信号配置]',
-        wxxjjtccand: '下行紧急停车按钮灯[信号配置]',
-        wxxjjtczsd: '下行紧急停车指示灯[信号配置]',
-        wxxjljcand: '下行警铃解除按钮灯[信号配置]',
-        wxxkcand: '下行扣车按钮灯[信号配置]',
-        wxxkczsd: '下行扣车指示灯[信号配置]',
-        wxxqxjjtcand: '下行取消紧急停车按钮灯[信号配置]',
-        wxxqxkcand: '下行取消扣车按钮灯[信号配置]',
-        wxxqxkczsd: '下行取消扣车指示灯[信号配置]',
-        wxxsdand: '下行试灯按钮灯[信号配置]'
-    },
-    xhsbConfig: {
-        rqb: '启泵按钮[消火栓泵配置]',
-        rtb: '停泵按钮[消火栓泵配置]',
-        rxy: '消音按钮[消火栓泵配置]',
-        ryskg: '钥匙开关[消火栓泵配置]',
-        wgzbjzsd: '故障报警指示灯[消火栓泵配置]',
-        wqband: '启泵按钮灯[消火栓泵配置]',
-        wqbjl: '启泵警铃蜂鸣器[消火栓泵配置]',
-        wtband: '停泵按钮灯[消火栓泵配置]',
-        wxyand: '消音按钮灯[消火栓泵配置]',
-        wyxwzsd: '有效位指示灯[消火栓泵配置]',
-        wzdztzsd: '自动状态指示灯[消火栓泵配置]'
-    }
-};
+
 export default {
     name: 'EditConfigIbp',
     data() {
@@ -487,6 +44,7 @@ export default {
             activeNames: [],
             checkCount: 0,
             data: null,
+            jsonConfig: '',
             formModel: {
                 afczjConfig: {},
                 dftConfig: {},
@@ -506,14 +64,6 @@ export default {
                 ],
                 quantity: [
                     { required: true, message: '请填写位数量', trigger: 'blur'}
-                ],
-                ribpsd: [
-                    { required: true, message: '请填写IBP盘试灯按钮位', trigger: 'blur'},
-                    { validator: this.validateDevice, trigger: 'blur' }
-                ],
-                wibpsdand: [
-                    { required: true, message: '请填写IBP盘试灯指示灯位', trigger: 'blur'},
-                    { validator: this.validateDevice, trigger: 'blur' }
                 ]
             },
             rulesStation: {
@@ -523,368 +73,16 @@ export default {
             },
             dialogVisible: false,
             inline: true,
-            formAfc:{
-                left: {
-                    labelWidth: '220px',
-                    items: [
-                        { prop:'rjjsf', label: '紧急释放按钮:', type: 'number', min: 0, max: 20000, step: 1, precisionFlag: true, precision: 0, size: 'small', noControls: true},
-                        { prop:'ryskg', label: '钥匙开关:', type: 'number', min: 0, max: 20000, step: 1, precisionFlag: true, precision: 0, size: 'small', noControls: true}
-                    ]
-                },
-                right: {
-                    labelWidth: '220px',
-                    items: [
-                        { prop:'wjjsfand', label: '紧急释放按钮灯:', type: 'number', min: 0, max: 20000, step: 1, precisionFlag: true, precision: 0, size: 'small', noControls: true},
-                        { prop:'wjjsfztzsd', label: '紧急释放状态指示灯:', type: 'number', min: 0, max: 20000, step: 1, precisionFlag: true, precision: 0, size: 'small', noControls: true},
-                        { prop:'wxfldzsd', label: '消防联动指示灯:', type: 'number', min: 0, max: 20000, step: 1, precisionFlag: true, precision: 0, size: 'small', noControls: true},
-                        { prop:'wyxwzsd', label: '有效位指示灯:', type: 'number', min: 0, max: 20000, step: 1, precisionFlag: true, precision: 0, size: 'small', noControls: true}
-                    ]
-                }
-            },
-            formElevator: {
-                left: {
-                    labelWidth: '220px',
-                    items: [
-                        { prop:'rdt01tt', label: '电梯01停梯按钮:', type: 'number', min: 0, max: 20000, step: 1, precisionFlag: true, precision: 0, size: 'small', noControls: true},
-                        { prop:'rft01tt', label: '扶梯01停梯按钮:', type: 'number', min: 0, max: 20000, step: 1, precisionFlag: true, precision: 0, size: 'small', noControls: true},
-                        { prop:'rft02tt', label: '扶梯02停梯按钮:', type: 'number', min: 0, max: 20000, step: 1, precisionFlag: true, precision: 0, size: 'small', noControls: true},
-                        { prop:'rft03tt', label: '扶梯03停梯按钮:', type: 'number', min: 0, max: 20000, step: 1, precisionFlag: true, precision: 0, size: 'small', noControls: true},
-                        { prop:'rft04tt', label: '扶梯04停梯按钮:', type: 'number', min: 0, max: 20000, step: 1, precisionFlag: true, precision: 0, size: 'small', noControls: true},
-                        { prop:'ryskg', label: '钥匙开关:', type: 'number', min: 0, max: 20000, step: 1, precisionFlag: true, precision: 0, size: 'small', noControls: true}
-                    ]
-                },
-                right: {
-                    labelWidth: '220px',
-                    items: [
-                        { prop:'wdt01sxzsd', label: '电梯01上行指示灯:', type: 'number', min: 0, max: 20000, step: 1, precisionFlag: true, precision: 0, size: 'small', noControls: true},
-                        { prop:'wdt01ttand', label: '电梯01停梯按钮灯:', type: 'number', min: 0, max: 20000, step: 1, precisionFlag: true, precision: 0, size: 'small', noControls: true},
-                        { prop:'wdt01xxzsd', label: '电梯01下行指示灯:', type: 'number', min: 0, max: 20000, step: 1, precisionFlag: true, precision: 0, size: 'small', noControls: true},
-                        { prop:'wdt01zsd', label: '电梯01指示灯:', type: 'number', min: 0, max: 20000, step: 1, precisionFlag: true, precision: 0, size: 'small', noControls: true},
-                        { prop:'wft01sxzsd', label: '扶梯01上行指示灯:', type: 'number', min: 0, max: 20000, step: 1, precisionFlag: true, precision: 0, size: 'small', noControls: true},
-                        { prop:'wft01ttand', label: '扶梯01停梯按钮灯:', type: 'number', min: 0, max: 20000, step: 1, precisionFlag: true, precision: 0, size: 'small', noControls: true},
-                        { prop:'wft01xxzsd', label: '扶梯01下行指示灯:', type: 'number', min: 0, max: 20000, step: 1, precisionFlag: true, precision: 0, size: 'small', noControls: true},
-                        { prop:'wft01zsd', label: '扶梯01指示灯:', type: 'number', min: 0, max: 20000, step: 1, precisionFlag: true, precision: 0, size: 'small', noControls: true},
-                        { prop:'wft02sxzsd', label: '扶梯02上行指示灯:', type: 'number', min: 0, max: 20000, step: 1, precisionFlag: true, precision: 0, size: 'small', noControls: true},
-                        { prop:'wft02ttand', label: '扶梯02停梯按钮灯:', type: 'number', min: 0, max: 20000, step: 1, precisionFlag: true, precision: 0, size: 'small', noControls: true},
-                        { prop:'wft02xxzsd', label: '扶梯02下行指示灯:', type: 'number', min: 0, max: 20000, step: 1, precisionFlag: true, precision: 0, size: 'small', noControls: true},
-                        { prop:'wft02zsd', label: '扶梯02指示灯:', type: 'number', min: 0, max: 20000, step: 1, precisionFlag: true, precision: 0, size: 'small', noControls: true},
-                        { prop:'wft03sxzsd', label: '扶梯03上行指示灯:', type: 'number', min: 0, max: 20000, step: 1, precisionFlag: true, precision: 0, size: 'small', noControls: true},
-                        { prop:'wft03ttand', label: '扶梯03停梯按钮灯:', type: 'number', min: 0, max: 20000, step: 1, precisionFlag: true, precision: 0, size: 'small', noControls: true},
-                        { prop:'wft03xxzsd', label: '扶梯03下行指示灯:', type: 'number', min: 0, max: 20000, step: 1, precisionFlag: true, precision: 0, size: 'small', noControls: true},
-                        { prop:'wft03zsd', label: '扶梯03指示灯:', type: 'number', min: 0, max: 20000, step: 1, precisionFlag: true, precision: 0, size: 'small', noControls: true},
-                        { prop:'wft04sxzsd', label: '扶梯04上行指示灯:', type: 'number', min: 0, max: 20000, step: 1, precisionFlag: true, precision: 0, size: 'small', noControls: true},
-                        { prop:'wft04ttand', label: '扶梯04停梯按钮灯:', type: 'number', min: 0, max: 20000, step: 1, precisionFlag: true, precision: 0, size: 'small', noControls: true},
-                        { prop:'wft04xxzsd', label: '扶梯04下行指示灯:', type: 'number', min: 0, max: 20000, step: 1, precisionFlag: true, precision: 0, size: 'small', noControls: true},
-                        { prop:'wft04zsd', label: '扶梯04指示灯:', type: 'number', min: 0, max: 20000, step: 1, precisionFlag: true, precision: 0, size: 'small', noControls: true},
-                        { prop:'wyskgzsd', label: '开关指示灯:', type: 'number', min: 0, max: 20000, step: 1, precisionFlag: true, precision: 0, size: 'small', noControls: true}
-                    ]
-                }
-            },
-            formMonitor: {
-                left: {
-                    labelWidth: '220px',
-                    items: [
-                        { prop:'rfw', label: '复位按钮:', type: 'number', min: 0, max: 20000, step: 1, precisionFlag: true, precision: 0, size: 'small', noControls: true},
-                        { prop:'rzhkg', label: '自动/手动钥匙转换开关:', type: 'number', min: 0, max: 20000, step: 1, precisionFlag: true, precision: 0, size: 'small', noControls: true}
-                    ]
-                },
-                right: {
-                    labelWidth: '250px',
-                    items: [
-                        { prop:'wfwand', label: '复位按钮灯:', type: 'number', min: 0, max: 20000, step: 1, precisionFlag: true, precision: 0, size: 'small', noControls: true},
-                        { prop:'wsdztzsd', label: '手动状态指示灯:', type: 'number', min: 0, max: 20000, step: 1, precisionFlag: true, precision: 0, size: 'small', noControls: true},
-                        { prop:'wzdztzsd', label: '自动状态指示灯:', type: 'number', min: 0, max: 20000, step: 1, precisionFlag: true, precision: 0, size: 'small', noControls: true},
-                        { prop:'wzhkgzsd', label: '自动/手动钥匙转换开关手动位指示灯:', type: 'number', min: 0, max: 20000, step: 1, precisionFlag: true, precision: 0, size: 'small', noControls: true}
-                    ]
-                }
-            },
-            formEg: {
-                left: {
-                    labelWidth: '220px',
-                    items: [
-                        { prop:'radjjsf', label: 'A端紧急释放按钮:', type: 'number', min: 0, max: 20000, step: 1, precisionFlag: true, precision: 0, size: 'small', noControls: true},
-                        { prop:'rbdjjsf', label: 'B端紧急释放按钮:', type: 'number', min: 0, max: 20000, step: 1, precisionFlag: true, precision: 0, size: 'small', noControls: true}
-                    ]
-                },
-                right: {
-                    labelWidth: '220px',
-                    items: [
-                        { prop:'wadjjsfand', label: 'A端紧急释放按钮灯:', type: 'number', min: 0, max: 20000, step: 1, precisionFlag: true, precision: 0, size: 'small', noControls: true},
-                        { prop:'wadjjsfzsdg', label: 'A端紧急释放绿色指示灯:', type: 'number', min: 0, max: 20000, step: 1, precisionFlag: true, precision: 0, size: 'small', noControls: true},
-                        { prop:'wadjjsfzsdr', label: 'A端紧急释放红色指示灯:', type: 'number', min: 0, max: 20000, step: 1, precisionFlag: true, precision: 0, size: 'small', noControls: true},
-                        { prop:'wadjjsfzsdy', label: 'A端紧急释放黄色指示灯:', type: 'number', min: 0, max: 20000, step: 1, precisionFlag: true, precision: 0, size: 'small', noControls: true},
-                        { prop:'wbdjjsfand', label: 'B端紧急释放按钮灯:', type: 'number', min: 0, max: 20000, step: 1, precisionFlag: true, precision: 0, size: 'small', noControls: true},
-                        { prop:'wbdjjsfzsdg', label: 'B端紧急释放绿色指示灯:', type: 'number', min: 0, max: 20000, step: 1, precisionFlag: true, precision: 0, size: 'small', noControls: true},
-                        { prop:'wbdjjsfzsdr', label: 'B端紧急释放红色指示灯:', type: 'number', min: 0, max: 20000, step: 1, precisionFlag: true, precision: 0, size: 'small', noControls: true},
-                        { prop:'wbdjjsfzsdy', label: 'B端紧急释放黄色指示灯:', type: 'number', min: 0, max: 20000, step: 1, precisionFlag: true, precision: 0, size: 'small', noControls: true}
-                    ]
-                }
-
-            },
-            formPsd: {
-                left: {
-                    labelWidth: '220px',
-                    items: [
-                        { prop:'rsxczyx', label: '上行操作允许钥匙开关:', type: 'number', min: 0, max: 20000, step: 1, precisionFlag: true, precision: 0, size: 'small', noControls: true},
-                        { prop:'rsxgm', label: '上行关门按钮:', type: 'number', min: 0, max: 20000, step: 1, precisionFlag: true, precision: 0, size: 'small', noControls: true},
-                        { prop:'rsxkm', label: '上行开门按钮:', type: 'number', min: 0, max: 20000, step: 1, precisionFlag: true, precision: 0, size: 'small', noControls: true},
-                        { prop:'rxxczyx', label: '下行操作允许钥匙开关:', type: 'number', min: 0, max: 20000, step: 1, precisionFlag: true, precision: 0, size: 'small', noControls: true},
-                        { prop:'rxxgm', label: '下行关门按钮:', type: 'number', min: 0, max: 20000, step: 1, precisionFlag: true, precision: 0, size: 'small', noControls: true},
-                        { prop:'rxxkm', label: '下行开门按钮:', type: 'number', min: 0, max: 20000, step: 1, precisionFlag: true, precision: 0, size: 'small', noControls: true}
-                    ]
-                },
-                right: {
-                    labelWidth: '220px',
-                    items: [
-                        { prop:'wsxczyxzsd', label: '上行操作允许指示灯:', type: 'number', min: 0, max: 20000, step: 1, precisionFlag: true, precision: 0, size: 'small', noControls: true},
-                        { prop:'wsxgmand', label: '上行关门按钮灯:', type: 'number', min: 0, max: 20000, step: 1, precisionFlag: true, precision: 0, size: 'small', noControls: true},
-                        { prop:'wsxgmsbzsd', label: '上行关门锁闭指示灯:', type: 'number', min: 0, max: 20000, step: 1, precisionFlag: true, precision: 0, size: 'small', noControls: true},
-                        { prop:'wsxkmand', label: '上行开门按钮灯:', type: 'number', min: 0, max: 20000, step: 1, precisionFlag: true, precision: 0, size: 'small', noControls: true},
-                        { prop:'wsxkmdwzsd', label: '上行开门到位指示灯:', type: 'number', min: 0, max: 20000, step: 1, precisionFlag: true, precision: 0, size: 'small', noControls: true},
-                        { prop:'wxxczyxzsd', label: '下行操作允许指示灯:', type: 'number', min: 0, max: 20000, step: 1, precisionFlag: true, precision: 0, size: 'small', noControls: true},
-                        { prop:'wxxgmand', label: '下行关门按钮灯:', type: 'number', min: 0, max: 20000, step: 1, precisionFlag: true, precision: 0, size: 'small', noControls: true},
-                        { prop:'wxxgmsbzsd', label: '下行关门锁闭指示灯:', type: 'number', min: 0, max: 20000, step: 1, precisionFlag: true, precision: 0, size: 'small', noControls: true},
-                        { prop:'wxxkmand', label: '下行开门按钮灯:', type: 'number', min: 0, max: 20000, step: 1, precisionFlag: true, precision: 0, size: 'small', noControls: true},
-                        { prop:'wxxkmdwzsd', label: '下行开门到位指示灯:', type: 'number', min: 0, max: 20000, step: 1, precisionFlag: true, precision: 0, size: 'small', noControls: true}
-                    ]
-                }
-            },
-            formTunnel: {
-                left: {
-                    labelWidth: '220px',
-                    items: [
-                        { prop:'rsxcrdx', label: '上行出入段线按钮:', type: 'number', min: 0, max: 20000, step: 1, precisionFlag: true, precision: 0, size: 'small', noControls: true},
-                        { prop:'rsxczsdhz', label: '上行车站隧道火灾按钮:', type: 'number', min: 0, max: 20000, step: 1, precisionFlag: true, precision: 0, size: 'small', noControls: true},
-                        { prop:'rsxhz1y', label: '上行火灾1右按钮:', type: 'number', min: 0, max: 20000, step: 1, precisionFlag: true, precision: 0, size: 'small', noControls: true},
-                        { prop:'rsxhz2y', label: '上行火灾2右按钮:', type: 'number', min: 0, max: 20000, step: 1, precisionFlag: true, precision: 0, size: 'small', noControls: true},
-                        { prop:'rsxzc1y', label: '上行阻塞1右按钮:', type: 'number', min: 0, max: 20000, step: 1, precisionFlag: true, precision: 0, size: 'small', noControls: true},
-                        { prop:'rsxzc2y', label: '上行阻塞2右按钮 :', type: 'number', min: 0, max: 20000, step: 1, precisionFlag: true, precision: 0, size: 'small', noControls: true},
-                        { prop:'rsxzthz', label: '上行站台火灾按钮:', type: 'number', min: 0, max: 20000, step: 1, precisionFlag: true, precision: 0, size: 'small', noControls: true},
-                        { prop:'rxxcrdx', label: '下行出入段线按钮:', type: 'number', min: 0, max: 20000, step: 1, precisionFlag: true, precision: 0, size: 'small', noControls: true},
-                        { prop:'rxxczsdhz', label: '下行车站隧道火灾按钮:', type: 'number', min: 0, max: 20000, step: 1, precisionFlag: true, precision: 0, size: 'small', noControls: true},
-                        { prop:'rxxhz1y', label: '下行火灾1右按钮:', type: 'number', min: 0, max: 20000, step: 1, precisionFlag: true, precision: 0, size: 'small', noControls: true},
-                        { prop:'rxxhz2y', label: '下行火灾2右按钮:', type: 'number', min: 0, max: 20000, step: 1, precisionFlag: true, precision: 0, size: 'small', noControls: true},
-                        { prop:'rxxzc1y', label: '下行阻塞1右按钮:', type: 'number', min: 0, max: 20000, step: 1, precisionFlag: true, precision: 0, size: 'small', noControls: true},
-                        { prop:'rxxzc2y', label: '下行阻塞2右按钮:', type: 'number', min: 0, max: 20000, step: 1, precisionFlag: true, precision: 0, size: 'small', noControls: true},
-                        { prop:'rxxzthz', label: '下行站台火灾按钮:', type: 'number', min: 0, max: 20000, step: 1, precisionFlag: true, precision: 0, size: 'small', noControls: true},
-                        { prop: 'rtcxhz', label: '停火线火灾按钮:', type: 'number', min: 0, max: 20000, step: 1, precisionFlag: true, precision: 0, size: 'small', noControls: true}
-                    ]
-                },
-                right: {
-                    labelWidth: '220px',
-                    items: [
-                        { prop:'wsxcrdxand', label: '上行出入段线按钮灯:', type: 'number', min: 0, max: 20000, step: 1, precisionFlag: true, precision: 0, size: 'small', noControls: true},
-                        { prop:'wsxczsdhzand', label: '上行车站隧道火灾按钮灯:', type: 'number', min: 0, max: 20000, step: 1, precisionFlag: true, precision: 0, size: 'small', noControls: true},
-                        { prop:'wsxhz1yand', label: '上行火灾1右按钮灯:', type: 'number', min: 0, max: 20000, step: 1, precisionFlag: true, precision: 0, size: 'small', noControls: true},
-                        { prop:'wsxhz2yand', label: '上行火灾2右按钮灯:', type: 'number', min: 0, max: 20000, step: 1, precisionFlag: true, precision: 0, size: 'small', noControls: true},
-                        { prop:'wsxzc1yand', label: '上行阻塞1右按钮灯:', type: 'number', min: 0, max: 20000, step: 1, precisionFlag: true, precision: 0, size: 'small', noControls: true},
-                        { prop:'wsxzc2yand', label: '上行阻塞2右按钮灯:', type: 'number', min: 0, max: 20000, step: 1, precisionFlag: true, precision: 0, size: 'small', noControls: true},
-                        { prop:'wsxzthzand', label: '上行站台火灾按钮灯:', type: 'number', min: 0, max: 20000, step: 1, precisionFlag: true, precision: 0, size: 'small', noControls: true},
-                        { prop:'wxxcrdxand', label: '下行出入段线按钮灯:', type: 'number', min: 0, max: 20000, step: 1, precisionFlag: true, precision: 0, size: 'small', noControls: true},
-                        { prop:'wxxczsdhzand', label: '下行车站隧道火灾按钮灯:', type: 'number', min: 0, max: 20000, step: 1, precisionFlag: true, precision: 0, size: 'small', noControls: true},
-                        { prop:'wxxhz1yand', label: '下行火灾1右按钮灯:', type: 'number', min: 0, max: 20000, step: 1, precisionFlag: true, precision: 0, size: 'small', noControls: true},
-                        { prop:'wxxhz2yand', label: '下行火灾2右按钮灯:', type: 'number', min: 0, max: 20000, step: 1, precisionFlag: true, precision: 0, size: 'small', noControls: true},
-                        { prop:'wxxzc1yand', label: '下行阻塞1右按钮灯:', type: 'number', min: 0, max: 20000, step: 1, precisionFlag: true, precision: 0, size: 'small', noControls: true},
-                        { prop:'wxxzc2yand', label: '下行阻塞2右按钮灯:', type: 'number', min: 0, max: 20000, step: 1, precisionFlag: true, precision: 0, size: 'small', noControls: true},
-                        { prop:'wxxzthzand', label: '下行站台火灾按钮灯:', type: 'number', min: 0, max: 20000, step: 1, precisionFlag: true, precision: 0, size: 'small', noControls: true},
-                        { prop: 'wtcxhzand', label: '停车线火灾按钮灯:', type: 'number', min: 0, max: 20000, step: 1, precisionFlag: true, precision: 0, size: 'small', noControls: true}
-                    ]
-                }
-            },
-            formSign: {
-                left: {
-                    labelWidth: '220px',
-                    items:[
-                        { prop:'rsxjjtc', label: '上行紧急停车按钮:', type: 'number', min: 0, max: 20000, step: 1, precisionFlag: true, precision: 0, size: 'small', noControls: true},
-                        { prop:'rsxjljc', label: '上行警铃解除按钮:', type: 'number', min: 0, max: 20000, step: 1, precisionFlag: true, precision: 0, size: 'small', noControls: true},
-                        { prop:'rsxkc', label: '上行扣车按钮:', type: 'number', min: 0, max: 20000, step: 1, precisionFlag: true, precision: 0, size: 'small', noControls: true},
-                        { prop:'rsxqxjjtc', label: '上行取消紧急停车按钮:', type: 'number', min: 0, max: 20000, step: 1, precisionFlag: true, precision: 0, size: 'small', noControls: true},
-                        { prop:'rsxqxkc', label: '上行取消扣车按钮:', type: 'number', min: 0, max: 20000, step: 1, precisionFlag: true, precision: 0, size: 'small', noControls: true},
-                        { prop:'rsxsd', label: '上行试灯按钮:', type: 'number', min: 0, max: 20000, step: 1, precisionFlag: true, precision: 0, size: 'small', noControls: true},
-                        { prop:'rxxjjtc', label: '下行紧急停车按钮:', type: 'number', min: 0, max: 20000, step: 1, precisionFlag: true, precision: 0, size: 'small', noControls: true},
-                        { prop:'rxxjljc', label: '下行警铃解除按钮:', type: 'number', min: 0, max: 20000, step: 1, precisionFlag: true, precision: 0, size: 'small', noControls: true},
-                        { prop:'rxxkc', label: '下行扣车按钮:', type: 'number', min: 0, max: 20000, step: 1, precisionFlag: true, precision: 0, size: 'small', noControls: true},
-                        { prop:'rxxqxjjtc', label: '下行取消紧急停车按钮:', type: 'number', min: 0, max: 20000, step: 1, precisionFlag: true, precision: 0, size: 'small', noControls: true},
-                        { prop:'rxxqxkc', label: '下行取消扣车按钮:', type: 'number', min: 0, max: 20000, step: 1, precisionFlag: true, precision: 0, size: 'small', noControls: true},
-                        { prop:'rxxsd', label: '下行试灯按钮:', type: 'number', min: 0, max: 20000, step: 1, precisionFlag: true, precision: 0, size: 'small', noControls: true}
-                    ]
-                },
-                right: {
-                    labelWidth: '220px',
-                    items:[
-                        { prop:'wfmq', label: '蜂鸣器:', type: 'number', min: 0, max: 20000, step: 1, precisionFlag: true, precision: 0, size: 'small', noControls: true},
-                        { prop:'wsxjjtccand', label: '上行紧急停车按钮灯:', type: 'number', min: 0, max: 20000, step: 1, precisionFlag: true, precision: 0, size: 'small', noControls: true},
-                        { prop:'wsxjjtczsd', label: '上行紧急停车指示灯:', type: 'number', min: 0, max: 20000, step: 1, precisionFlag: true, precision: 0, size: 'small', noControls: true},
-                        { prop:'wsxjljcand', label: '上行警铃解除按钮灯:', type: 'number', min: 0, max: 20000, step: 1, precisionFlag: true, precision: 0, size: 'small', noControls: true},
-                        { prop:'wsxkcand', label: '上行扣车按钮灯:', type: 'number', min: 0, max: 20000, step: 1, precisionFlag: true, precision: 0, size: 'small', noControls: true},
-                        { prop:'wsxkczsd', label: '上行扣车指示灯:', type: 'number', min: 0, max: 20000, step: 1, precisionFlag: true, precision: 0, size: 'small', noControls: true},
-                        { prop:'wsxqxjjtcand', label: '上行取消紧急停车按钮灯:', type: 'number', min: 0, max: 20000, step: 1, precisionFlag: true, precision: 0, size: 'small', noControls: true},
-                        { prop:'wsxqxkcand', label: '上行取消扣车按钮灯:', type: 'number', min: 0, max: 20000, step: 1, precisionFlag: true, precision: 0, size: 'small', noControls: true},
-                        { prop:'wsxqxkczsd', label: '上行取消扣车指示灯:', type: 'number', min: 0, max: 20000, step: 1, precisionFlag: true, precision: 0, size: 'small', noControls: true},
-                        { prop:'wsxsdand', label: '上行试灯按钮灯:', type: 'number', min: 0, max: 20000, step: 1, precisionFlag: true, precision: 0, size: 'small', noControls: true},
-                        { prop:'wxxjjtccand', label: '下行紧急停车按钮灯:', type: 'number', min: 0, max: 20000, step: 1, precisionFlag: true, precision: 0, size: 'small', noControls: true},
-                        { prop:'wxxjjtczsd', label: '下行紧急停车指示灯:', type: 'number', min: 0, max: 20000, step: 1, precisionFlag: true, precision: 0, size: 'small', noControls: true},
-                        { prop:'wxxjljcand', label: '下行警铃解除按钮灯:', type: 'number', min: 0, max: 20000, step: 1, precisionFlag: true, precision: 0, size: 'small', noControls: true},
-                        { prop:'wxxkcand', label: '下行扣车按钮灯:', type: 'number', min: 0, max: 20000, step: 1, precisionFlag: true, precision: 0, size: 'small', noControls: true},
-                        { prop:'wxxkczsd', label: '下行扣车指示灯:', type: 'number', min: 0, max: 20000, step: 1, precisionFlag: true, precision: 0, size: 'small', noControls: true},
-                        { prop:'wxxqxjjtcand', label: '下行取消紧急停车按钮灯:', type: 'number', min: 0, max: 20000, step: 1, precisionFlag: true, precision: 0, size: 'small', noControls: true},
-                        { prop:'wxxqxkcand', label: '下行取消扣车按钮灯:', type: 'number', min: 0, max: 20000, step: 1, precisionFlag: true, precision: 0, size: 'small', noControls: true},
-                        { prop:'wxxqxkczsd', label: '下行取消扣车指示灯:', type: 'number', min: 0, max: 20000, step: 1, precisionFlag: true, precision: 0, size: 'small', noControls: true},
-                        { prop:'wxxsdand', label: '下行试灯按钮灯:', type: 'number', min: 0, max: 20000, step: 1, precisionFlag: true, precision: 0, size: 'small', noControls: true}
-                    ]
-                }
-            },
-            formFh: {
-                left: {
-                    labelWidth: '220px',
-                    items:[
-                        { prop:'rqb', label: '启泵按钮:', type: 'number', min: 0, max: 20000, step: 1, precisionFlag: true, precision: 0, size: 'small', noControls: true},
-                        { prop:'rtb', label: '停泵按钮:', type: 'number', min: 0, max: 20000, step: 1, precisionFlag: true, precision: 0, size: 'small', noControls: true},
-                        { prop:'rxy', label: '消音按钮:', type: 'number', min: 0, max: 20000, step: 1, precisionFlag: true, precision: 0, size: 'small', noControls: true},
-                        { prop:'ryskg', label: '钥匙开关:', type: 'number', min: 0, max: 20000, step: 1, precisionFlag: true, precision: 0, size: 'small', noControls: true}
-                    ]
-                },
-                right: {
-                    labelWidth: '220px',
-                    items:[
-                        { prop:'wgzbjzsd', label: '故障报警指示灯:', type: 'number', min: 0, max: 20000, step: 1, precisionFlag: true, precision: 0, size: 'small', noControls: true},
-                        { prop:'wqband', label: '启泵按钮灯:', type: 'number', min: 0, max: 20000, step: 1, precisionFlag: true, precision: 0, size: 'small', noControls: true},
-                        { prop:'wqbjl', label: '启泵警铃蜂鸣器:', type: 'number', min: 0, max: 20000, step: 1, precisionFlag: true, precision: 0, size: 'small', noControls: true},
-                        { prop:'wtband', label: '停泵按钮灯:', type: 'number', min: 0, max: 20000, step: 1, precisionFlag: true, precision: 0, size: 'small', noControls: true},
-                        { prop:'wxyand', label: '消音按钮灯:', type: 'number', min: 0, max: 20000, step: 1, precisionFlag: true, precision: 0, size: 'small', noControls: true},
-                        { prop:'wyxwzsd', label: '有效位指示灯:', type: 'number', min: 0, max: 20000, step: 1, precisionFlag: true, precision: 0, size: 'small', noControls: true},
-                        { prop:'wzdztzsd', label: '自动状态指示灯:', type: 'number', min: 0, max: 20000, step: 1, precisionFlag: true, precision: 0, size: 'small', noControls: true}
-                    ]
-                }
-            },
-            formEemPlatform: {
-                left: {
-                    labelWidth: '220px',
-                    items: [
-                        { prop:'r04kvdykggs', label: '0.4KV低压开关柜室按钮:', type: 'number', min: 0, max: 20000, step: 1, precisionFlag: true, precision: 0, size: 'small', noControls: true},
-                        { prop:'r35kvkggs', label: '35KV开关柜室按钮:', type: 'number', min: 0, max: 20000, step: 1, precisionFlag: true, precision: 0, size: 'small', noControls: true},
-                        { prop:'rggqhz', label: '公共区火灾按钮:', type: 'number', min: 0, max: 20000, step: 1, precisionFlag: true, precision: 0, size: 'small', noControls: true},
-                        { prop:'rkzs', label: '控制室按钮:', type: 'number', min: 0, max: 20000, step: 1, precisionFlag: true, precision: 0, size: 'small', noControls: true},
-                        { prop:'rsytxsbshz', label: '商用通信设备室火灾按钮:', type: 'number', min: 0, max: 20000, step: 1, precisionFlag: true, precision: 0, size: 'small', noControls: true},
-                        { prop:'rzlbyqs1', label: '整流变压器室一按钮:', type: 'number', min: 0, max: 20000, step: 1, precisionFlag: true, precision: 0, size: 'small', noControls: true},
-                        { prop:'rzlbyqs2', label: '整流变压器室二按钮:', type: 'number', min: 0, max: 20000, step: 1, precisionFlag: true, precision: 0, size: 'small', noControls: true},
-                        { prop:'rzlkggshz', label: '直流开关柜室火灾按钮:', type: 'number', min: 0, max: 20000, step: 1, precisionFlag: true, precision: 0, size: 'small', noControls: true},
-                        { prop:'rzszddzshz', label: '再生制动电阻室火灾按钮:', type: 'number', min: 0, max: 20000, step: 1, precisionFlag: true, precision: 0, size: 'small', noControls: true},
-                        { prop:'rzszdkzshz', label: '再生制动控制室火灾按钮:', type: 'number', min: 0, max: 20000, step: 1, precisionFlag: true, precision: 0, size: 'small', noControls: true}
-                    ]
-                },
-                right: {
-                    labelWidth: '220px',
-                    items: [
-                        { prop:'w35kvkggsand', label: '35KV开关柜室按钮灯:', type: 'number', min: 0, max: 20000, step: 1, precisionFlag: true, precision: 0, size: 'small', noControls: true},
-                        { prop:'wggqhzand', label: '公共区火灾按钮灯:', type: 'number', min: 0, max: 20000, step: 1, precisionFlag: true, precision: 0, size: 'small', noControls: true},
-                        { prop:'wkzsand', label: '控制室按钮灯:', type: 'number', min: 0, max: 20000, step: 1, precisionFlag: true, precision: 0, size: 'small', noControls: true},
-                        { prop:'wr04kvdykggsand', label: '0.4KV低压开关柜室按钮灯:', type: 'number', min: 0, max: 20000, step: 1, precisionFlag: true, precision: 0, size: 'small', noControls: true},
-                        { prop:'wsytxsbshzand', label: '商用通信设备室火灾按钮灯:', type: 'number', min: 0, max: 20000, step: 1, precisionFlag: true, precision: 0, size: 'small', noControls: true},
-                        { prop:'wzlbyqs1and', label: '整流变压器室一按钮灯:', type: 'number', min: 0, max: 20000, step: 1, precisionFlag: true, precision: 0, size: 'small', noControls: true},
-                        { prop:'wzlbyqs2and', label: '整流变压器室二按钮灯:', type: 'number', min: 0, max: 20000, step: 1, precisionFlag: true, precision: 0, size: 'small', noControls: true},
-                        { prop:'wzlkggshzand', label: '直流开关柜室火灾按钮灯:', type: 'number', min: 0, max: 20000, step: 1, precisionFlag: true, precision: 0, size: 'small', noControls: true},
-                        { prop:'wzszddzshzand', label: '再生制动电阻室火灾按钮灯:', type: 'number', min: 0, max: 20000, step: 1, precisionFlag: true, precision: 0, size: 'small', noControls: true},
-                        { prop:'wzszdkzshzand', label: '再生制动控制室火灾按钮灯:', type: 'number', min: 0, max: 20000, step: 1, precisionFlag: true, precision: 0, size: 'small', noControls: true}
-                    ]
-                }
-
-            },
-            formEemHall: {
-                left: {
-                    labelWidth: '220px',
-                    items: [
-                        { prop:'rczkzshz', label: '车站控制室火灾按钮:', type: 'number', min: 0, max: 20000, step: 1, precisionFlag: true, precision: 0, size: 'small', noControls: true},
-                        { prop:'rggqhz', label: '公共区火灾按钮:', type: 'number', min: 0, max: 20000, step: 1, precisionFlag: true, precision: 0, size: 'small', noControls: true},
-                        { prop:'rydhkdkshz', label: '右端环控电控室火灾按钮:', type: 'number', min: 0, max: 20000, step: 1, precisionFlag: true, precision: 0, size: 'small', noControls: true},
-                        { prop:'rydjfkthz', label: '右端机房空调火灾按钮:', type: 'number', min: 0, max: 20000, step: 1, precisionFlag: true, precision: 0, size: 'small', noControls: true},
-                        { prop:'rydlsjfhz', label: '右端冷水机房火灾按钮:', type: 'number', min: 0, max: 20000, step: 1, precisionFlag: true, precision: 0, size: 'small', noControls: true},
-                        { prop:'rydqyfjhz', label: '右端其余房间火灾按钮:', type: 'number', min: 0, max: 20000, step: 1, precisionFlag: true, precision: 0, size: 'small', noControls: true},
-                        { prop:'rydzlhz', label: '右端走廊火灾按钮:', type: 'number', min: 0, max: 20000, step: 1, precisionFlag: true, precision: 0, size: 'small', noControls: true},
-                        { prop:'rzdhkdkshz', label: '左端环控电控室火灾按钮:', type: 'number', min: 0, max: 20000, step: 1, precisionFlag: true, precision: 0, size: 'small', noControls: true},
-                        { prop:'rzdktjfhz', label: '左端空调机房火灾按钮:', type: 'number', min: 0, max: 20000, step: 1, precisionFlag: true, precision: 0, size: 'small', noControls: true},
-                        { prop:'rzdqyfjhz', label: '左端其余房间火灾按钮:', type: 'number', min: 0, max: 20000, step: 1, precisionFlag: true, precision: 0, size: 'small', noControls: true}
-                    ]
-                },
-                right: {
-                    labelWidth: '220px',
-                    items: [
-                        { prop:'wczkzshzand', label: '车站控制室火灾按钮灯:', type: 'number', min: 0, max: 20000, step: 1, precisionFlag: true, precision: 0, size: 'small', noControls: true},
-                        { prop:'wggqhzand', label: '公共区火灾按钮灯:', type: 'number', min: 0, max: 20000, step: 1, precisionFlag: true, precision: 0, size: 'small', noControls: true},
-                        { prop:'wydhkdkshzand', label: '右端环控电控室火灾按钮灯:', type: 'number', min: 0, max: 20000, step: 1, precisionFlag: true, precision: 0, size: 'small', noControls: true},
-                        { prop:'wydjfkthzand', label: '右端机房空调火灾按钮灯:', type: 'number', min: 0, max: 20000, step: 1, precisionFlag: true, precision: 0, size: 'small', noControls: true},
-                        { prop:'wydlsjfhzand', label: '右端冷水机房火灾按钮灯:', type: 'number', min: 0, max: 20000, step: 1, precisionFlag: true, precision: 0, size: 'small', noControls: true},
-                        { prop:'wydqyfjhzand', label: '右端其余房间火灾按钮灯:', type: 'number', min: 0, max: 20000, step: 1, precisionFlag: true, precision: 0, size: 'small', noControls: true},
-                        { prop:'wydzlhzand', label: '右端走廊火灾按钮灯:', type: 'number', min: 0, max: 20000, step: 1, precisionFlag: true, precision: 0, size: 'small', noControls: true},
-                        { prop:'wzdhkdkshzand', label: '左端环控电控室火灾按钮灯:', type: 'number', min: 0, max: 20000, step: 1, precisionFlag: true, precision: 0, size: 'small', noControls: true},
-                        { prop:'wzdktjfhzand', label: '左端空调机房火灾按钮灯:', type: 'number', min: 0, max: 20000, step: 1, precisionFlag: true, precision: 0, size: 'small', noControls: true},
-                        { prop:'wzdqyfjhzand', label: '左端其余房间火灾按钮灯:', type: 'number', min: 0, max: 20000, step: 1, precisionFlag: true, precision: 0, size: 'small', noControls: true}
-                    ]
-                }
-            },
-            rulesAfc: {},
-            rulesElevator: {},
-            rulesMonitor: {},
-            rulesEg: {},
-            rulesPsd: {},
-            rulesTunnel: {},
-            rulesSign: {},
-            rulesFh: {},
-            rulesEemPlatform:{},
-            rulesEemHall: {},
             mapId: '',
             mapList: [],
             stationList: []
         };
     },
     computed: {
-        formTop() {
-            return {
-                labelWidth: '220px',
-                items: [
-                    { prop:'addr', label: '网关位地址:', type: 'number', min: 0, max: 20000, step: 1, precisionFlag: true, precision: 0, noControls: true},
-                    { prop:'quantity', label: '位数量:', type: 'number', min: 0, max: 20000, step: 1, precisionFlag: true, precision: 0, noControls: true},
-                    { prop: 'ribpsd', label: 'IBP盘试灯按钮:', type: 'number', min: 0, max: 20000, step: 1, precisionFlag: true, precision: 0, noControls: true},
-                    { prop: 'wibpsdand', label: 'IBP盘试灯指示灯:', type: 'number', min: 0, max: 20000, step: 1, precisionFlag: true, precision: 0, noControls: true }
-                ]
-            };
-        }
     },
     watch: {
     },
     mounted() {
-        for (const prop in propMap.afczjConfig) {
-            this.rulesAfc[prop] = [{ validator: this.validateDevice, config: ['afczjConfig'], trigger: 'blur'}];
-        }
-        for (const prop in propMap.dftConfig) {
-            this.rulesElevator[prop] = [{ validator: this.validateDevice, config: ['dftConfig'], trigger: 'blur' }];
-        }
-        for (const prop in propMap.hjsbjkConfig) {
-            if (typeof propMap.hjsbjkConfig[prop] == 'string') {
-                this.rulesMonitor[prop] = [{ validator: this.validateDevice, config: ['hjsbjkConfig'], trigger: 'blur' }];
-            }
-        }
-        for (const prop in propMap.mjConfig) {
-            this.rulesEg[prop] = [{ validator: this.validateDevice, config: ['mjConfig'], trigger: 'blur' }];
-        }
-        for (const prop in propMap.pbmConfig) {
-            this.rulesPsd[prop] = [{ validator: this.validateDevice, config: ['pbmConfig'], trigger: 'blur' }];
-        }
-        for (const prop in propMap.sdtfConfig) {
-            this.rulesTunnel[prop] = [{validator: this.validateDevice, config: ['sdtfConfig'], trigger: 'blur'}];
-        }
-        for (const prop in propMap.xhConfig) {
-            this.rulesSign[prop] = [{validator: this.validateDevice, config: ['xhConfig'], trigger: 'blur'}];
-        }
-        for (const prop in propMap.xhsbConfig) {
-            this.rulesFh[prop] = [{validator: this.validateDevice, config: ['xhsbConfig'], trigger: 'blur'}];
-        }
-        for (const prop in propMap.hjsbjkConfig.pfConfig) {
-            this.rulesEemPlatform[prop] = [{validator: this.validateDevice, config: ['hjsbjkConfig', 'pfConfig'], trigger: 'blur'}];
-        }
-        for (const prop in propMap.hjsbjkConfig.shfConfig) {
-            this.rulesEemHall[prop] = [{validator: this.validateDevice, config: ['hjsbjkConfig', 'shfConfig'], trigger: 'blur'}];
-        }
     },
     methods: {
         doShow(row) {
@@ -901,95 +99,11 @@ export default {
             });
             this.dialogVisible = true;
         },
-        validateDevice(rule, value, callback) {
-            const list = [];
-            let flag = false;
-            for (const config in propMap) {
-                if (typeof propMap[config] == 'string') {
-                    if (this.formModel[config] && this.formModel[config] === value) {
-                        list.push(propMap[config]);
-                    }
-                } else {
-                    for (const prop in propMap[config]) {
-                        if (typeof propMap[config][prop] == 'string') {
-                            if (prop === rule.field && config === rule.config[0] && JSON.stringify(this.formModel[config]) !== '{}' && JSON.stringify(this.formModel[config]) !== '{"pfConfig":{},"shfConfig":{}}' && !value && value !== 0) {
-                                flag = true;
-                            }
-                            if (this.formModel[config][prop] && this.formModel[config][prop] === value) {
-                                list.push(propMap[config][prop]);
-                            }
-                        } else {
-                            for (const childProp in propMap[config][prop]) {
-                                if (typeof propMap[config][prop][childProp] == 'string') {
-                                    if (childProp === rule.field && config === rule.config[0] && prop === rule.config[1] && JSON.stringify(this.formModel[config][prop]) !== '{}' && !value) {
-                                        flag = true;
-                                    }
-                                    if (this.formModel[config][prop][childProp] && this.formModel[config][prop][childProp] === value) {
-                                        list.push(propMap[config][prop][childProp]);
-                                    }
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-            if (!this.formModel.quantity) {
-                this.$refs.dataTop.validateField('quantity');
-            }
-            if (flag) {
-                callback(new Error('应完整填写一整个配置项'));
-            } else if (list.length > 1) {
-                let repeatedValue = '';
-                list.forEach((item, index) => {
-                    repeatedValue += item;
-                    if (index !== list.length - 1) {
-                        repeatedValue += '与';
-                    }
-                });
-                callback(new Error(repeatedValue + '位置重复，请调整！'));
-            } else if (this.formModel.quantity && value >= this.formModel.quantity) {
-                callback(new Error('网关位应小于位数量！'));
-            } else {
-                callback();
-            }
-        },
         initData(row) {
             getDeviceDetail(row.id).then(resp => {
                 if (resp.data.config) {
                     const model = JSON.parse(resp.data.config) || {};
-                    if (!model.afczjConfig) {
-                        model.afczjConfig = {};
-                    }
-                    if (!model.dftConfig) {
-                        model.dftConfig = {};
-                    }
-                    if (!model.hjsbjkConfig) {
-                        model.hjsbjkConfig = {
-                            pfConfig: {},
-                            shfConfig: {}
-                        };
-                    }
-                    if (!model.hjsbjkConfig.pfConfig) {
-                        model.hjsbjkConfig.pfConfig = {};
-                    }
-                    if (!model.hjsbjkConfig.shfConfig) {
-                        model.hjsbjkConfig.shfConfig = {};
-                    }
-                    if (!model.mjConfig) {
-                        model.mjConfig = {};
-                    }
-                    if (!model.pbmConfig) {
-                        model.pbmConfig = {};
-                    }
-                    if (!model.sdtfConfig) {
-                        model.sdtfConfig = {};
-                    }
-                    if (!model.xhConfig) {
-                        model.xhConfig = {};
-                    }
-                    if (!model.xhsbConfig) {
-                        model.xhsbConfig = {};
-                    }
+                    this.jsonConfig = JSON.stringify(JSON.parse(resp.data.config), null, 4);
                     this.formModel = model;
                 }
             }).catch(()=> {
@@ -998,104 +112,22 @@ export default {
         },
         doSave() {
             this.checkCount = 0;
-            const that = this;
-            this.$refs.dataTop.validateForm(() => { that.checkCount++; });
-            this.$refs.formStation.validate((valid) => { if (valid)that.checkCount++; });
-            this.$refs.dataAfcLeft.validateForm(() => { that.checkCount++; });
-            this.$refs.dataAfcRight.validateForm(() => { that.checkCount++; });
-            this.$refs.dataElevatorLeft.validateForm(() => { that.checkCount++; });
-            this.$refs.dataElevatorRight.validateForm(() => { that.checkCount++; });
-            this.$refs.dataMonitorLeft.validateForm(() => { that.checkCount++; });
-            this.$refs.dataMonitorRight.validateForm(() => { that.checkCount++; });
-            this.$refs.dataEgLeft.validateForm(() => { that.checkCount++; });
-            this.$refs.dataEgRight.validateForm(() => { that.checkCount++; });
-            this.$refs.dataPsdLeft.validateForm(() => { that.checkCount++; });
-            this.$refs.dataPsdRight.validateForm(() => { that.checkCount++; });
-            this.$refs.dataTunnelLeft.validateForm(() => { that.checkCount++; });
-            this.$refs.dataTunnelRight.validateForm(() => { that.checkCount++; });
-            this.$refs.dataSignLeft.validateForm(() => { that.checkCount++; });
-            this.$refs.dataSignRight.validateForm(() => { that.checkCount++; });
-            this.$refs.dataFhLeft.validateForm(() => { that.checkCount++; });
-            this.$refs.dataFhRight.validateForm(() => { that.checkCount++; });
-            this.$refs.dataEemPlatformLeft.validateForm(() => { that.checkCount++; });
-            this.$refs.dataEemPlatformRight.validateForm(() => { that.checkCount++; });
-            this.$refs.dataEemHallLeft.validateForm(() => { that.checkCount++; });
-            this.$refs.dataEemHallRight.validateForm(() => { that.checkCount++; });
-            if (this.checkCount === 22) {
-                const model = deepAssign({}, this.formModel);
-                if (JSON.stringify(model.afczjConfig) === '{}') {
-                    model.afczjConfig = null;
-                }
-                if (JSON.stringify(model.dftConfig) === '{}') {
-                    model.dftConfig = null;
-                }
-                if (JSON.stringify(model.hjsbjkConfig) === '{"pfConfig":{},"shfConfig":{}}') {
-                    model.hjsbjkConfig = null;
-                }
-                if (model.hjsbjkConfig && JSON.stringify(model.hjsbjkConfig.pfConfig) === '{}') {
-                    model.hjsbjkConfig.pfConfig = null;
-                }
-                if (model.hjsbjkConfig && JSON.stringify(model.hjsbjkConfig.shfConfig) === '{}') {
-                    model.hjsbjkConfig.shfConfig = null;
-                }
-                if (JSON.stringify(model.mjConfig) === '{}') {
-                    model.mjConfig = null;
-                }
-                if (JSON.stringify(model.pbmConfig) === '{}') {
-                    model.pbmConfig = null;
-                }
-                if (JSON.stringify(model.sdtfConfig) === '{}') {
-                    model.sdtfConfig = null;
-                }
-                if (JSON.stringify(model.xhConfig) === '{}') {
-                    model.xhConfig = null;
-                }
-                if (JSON.stringify(model.xhsbConfig) === '{}') {
-                    model.xhsbConfig = null;
-                }
-                setIbpConfig(this.data.id, model).then(resp => {
-                    this.$message.success('设置IBP网关映射配置成功');
-                    this.handleClose();
-                    this.$emit('reloadTable');
-                }).catch(error => {
-                    this.$message.error(this.$t('tip.modifyTheFailure') + error.message);
-                });
-            }
+            const form = JSON.parse(this.jsonConfig);
+            setIbpConfig(this.data.id, form).then(resp => {
+                this.$message.success('设置IBP网关映射配置成功');
+                this.handleClose();
+                this.$emit('reloadTable');
+            }).catch(error => {
+                this.$message.error(this.$t('tip.modifyTheFailure') + error.message);
+            });
+            // this.$refs.formStation.validate((valid) => {
+            //     const model = deepAssign({}, this.formModel);
+            //
+            // });
         },
         handleClose() {
-            this.formModel = {
-                afczjConfig: {},
-                dftConfig: {},
-                hjsbjkConfig: {
-                    pfConfig: {},
-                    shfConfig: {}
-                },
-                mjConfig: {},
-                pbmConfig: {},
-                sdtfConfig: {},
-                xhConfig: {},
-                xhsbConfig: {}
-            };
-            this.$refs.dataTop.resetForm();
-            this.$refs.formStation.resetFields();
-            this.$refs.dataAfcLeft.resetForm();
-            this.$refs.dataAfcRight.resetForm();
-            this.$refs.dataElevatorLeft.resetForm();
-            this.$refs.dataElevatorRight.resetForm();
-            this.$refs.dataMonitorLeft.resetForm();
-            this.$refs.dataMonitorRight.resetForm();
-            this.$refs.dataEgLeft.resetForm();
-            this.$refs.dataEgRight.resetForm();
-            this.$refs.dataPsdLeft.resetForm();
-            this.$refs.dataPsdRight.resetForm();
-            this.$refs.dataTunnelLeft.resetForm();
-            this.$refs.dataTunnelRight.resetForm();
-            this.$refs.dataFhLeft.resetForm();
-            this.$refs.dataFhRight.resetForm();
-            this.$refs.dataEemPlatformLeft.resetForm();
-            this.$refs.dataEemPlatformRight.resetForm();
-            this.$refs.dataEemHallLeft.resetForm();
-            this.$refs.dataEemHallRight.resetForm();
+            this.formModel = {};
+            // this.$refs.formStation.resetFields();
             this.data = null;
             this.activeNames = [];
             this.dialogVisible = false;
diff --git a/src/views/system/deviceManage/editConfigScreen.vue b/src/views/system/deviceManage/editConfigScreen.vue
index 42bcda9d8..8b81348ff 100644
--- a/src/views/system/deviceManage/editConfigScreen.vue
+++ b/src/views/system/deviceManage/editConfigScreen.vue
@@ -9,7 +9,7 @@
 </template>
 
 <script>
-import { getDevicesByType, getDeviceDetail, setLswConfig, setCctvConfig, setVrPsdConfig, setPlcConfig, setSandboxConfig } from '@/api/project';
+import { getDevicesByType, getDeviceDetail, setLswConfig, setCctvConfig, setVrPsdConfig, setPlcConfig, setSandboxConfig, setIlwConfig } from '@/api/project';
 import { getAllMapOnline, getStationListNeedAttendant, getPsdListByStandCode, getStandListByStationCode } from '@/api/jmap/map';
 
 export default {
@@ -108,6 +108,13 @@ export default {
                         { prop: 'deviceCode', label: '教研机', type: 'select', options: this.deviceList, optionLabel: 'code', optionValue: 'code'}
                     ]
                 };
+            } else if (this.data.type === 'ILW') {
+                form = {
+                    labelWidth: '150px',
+                    items: [
+                        { prop: 'deviceCode', label: '教研机', type: 'select', options: this.deviceList, optionLabel: 'code', optionValue: 'code'}
+                    ]
+                };
             }
             return form;
         }
@@ -245,7 +252,20 @@ export default {
                         deviceCode: this.formData.deviceCode
                     };
                     setSandboxConfig(this.data.id, param).then(() => {
-                        self.$message.success('设置电子沙盘配置成员');
+                        self.$message.success('设置电子沙盘配置成功');
+                        self.handleClose();
+                        self.$emit('reloadTable');
+                    }).catch(error => {
+                        self.$message.error(this.$t('tip.modifyTheFailure') + error.message);
+                    });
+                });
+            } else if (this.data.type === 'ILW') {
+                this.$refs.dataForm.validateForm(() => {
+                    const param = {
+                        deviceCode: this.formData.deviceCode
+                    };
+                    setIlwConfig(this.data.id, param).then(() => {
+                        self.$message.success('设置联锁工作站配置成功');
                         self.handleClose();
                         self.$emit('reloadTable');
                     }).catch(error => {
diff --git a/src/views/system/deviceManage/index.vue b/src/views/system/deviceManage/index.vue
index 710c524a9..068756d2c 100644
--- a/src/views/system/deviceManage/index.vue
+++ b/src/views/system/deviceManage/index.vue
@@ -183,7 +183,7 @@ export default {
                 this.$refs.editConfig.doShow(row);
             } else if (row.type === 'SWITCH' || row.type === 'SIGNAL' || row.type === 'PSD' || row.type === 'PSL' || row.type === 'PSC') {
                 this.$refs.editConfigGateway.doShow(row);
-            } else if (row.type == 'LSW' || row.type == 'CCTV' || row.type == 'VR_PSD' || row.type === 'PLC_GATEWAY' || row.type === 'SANDBOX') {
+            } else if (row.type == 'LSW' || row.type == 'CCTV' || row.type == 'VR_PSD' || row.type === 'PLC_GATEWAY' || row.type === 'SANDBOX' || row.type === 'ILW') {
                 this.$refs.editConfigScreen.doShow(row);
             } else if (row.type === 'IBP') {
                 this.$refs.editConfigIbp.doShow(row);
@@ -196,7 +196,7 @@ export default {
         },
         getPath(index, row) {
             let url = '';
-            url = `${window.location.protocol}//${window.location.host}/login?project=${row.project.toLowerCase()}&projectDevice=${row.code}&type=${row.type}`;
+            url = `${window.location.protocol}//${window.location.host}/cbtc/login?project=${row.project.toLowerCase()}&projectDevice=${row.code}&type=${row.type}`;
             this.url = url;
             this.$messageBox();
             this.$confirm(`登录路径：${url}`, '登录路径', {
diff --git a/src/views/system/dictionary/edit.vue b/src/views/system/dictionary/edit.vue
index ea50415eb..626209530 100644
--- a/src/views/system/dictionary/edit.vue
+++ b/src/views/system/dictionary/edit.vue
@@ -12,142 +12,142 @@
 import { create, checkDicCodeExist, getData, update } from '@/api/management/dictionary';
 import { validateCharCode } from '@/utils/validate';
 export default {
-	name: 'DictionaryEdit',
-	props: {
-		type: {
-			type: String,
-			required: true
-		}
-	},
-	data() {
-		return {
-			dialogVisible: false,
-			formModel: {
-				code: '',
-				name: '',
-				status: '1',
-				remarks: ''
-			}
-		};
-	},
-	computed: {
-		form() {
-			const isAdd = this.type === 'ADD';
-			const form = {
-				labelWidth: '60px',
-				items: [
-					{ prop: 'code', label: this.$t('system.code'), type: 'text', required: true, disabled: !isAdd },
-					{ prop: 'name', label: this.$t('system.name'), type: 'text', required: true },
-					{
-						prop: 'status', label: this.$t('system.status'), type: 'select', required: true, options: this.$ConstSelect.Status
-					},
-					{ prop: 'remarks', label: this.$t('system.remarks'), type: 'textarea', required: false }
-				]
-			};
-			return form;
-		},
-		rules() {
-			const crules = {
-				name: [
-					{ required: true, message: this.$t('rules.pleaseInputName'), trigger: 'blur' },
-					{ min: 1, max: 25, message: this.$t('rules.strLength1To25'), trigger: 'blur' }
-				],
-				status: [
-					{ required: true, message: this.$t('rules.pleaseSelectStatus'), trigger: 'change' }
-				],
-				remarks: [
-					{ max: 50, message: this.$t('rules.strLengthNotExceed50'), trigger: 'blur' }
-				]
-			};
-			if (this.type === 'ADD') {
-				return Object.assign(crules, {
-					code: [
-						{ required: true, message: this.$t('rules.pleaseInputCode'), trigger: 'blur' },
-						{ min: 1, max: 25, message: this.$t('rules.strLength1To25'), trigger: 'blur' },
-						{ validator: this.validateCode, trigger: 'blur' }
-					]
-				});
-			} else {
-				return crules;
-			}
-		},
-		title() {
-			if (this.type === 'ADD') {
-				return this.$t('system.createDirectory');
-			} else {
-				return this.$t('system.editDictionary');
-			}
-		}
-	},
-	methods: {
-		validateCode(rule, value, callback) {
-			if (!validateCharCode(value)) {
-				return callback(new Error(this.$t('error.formartError')));
-			} else {
-				checkDicCodeExist(value).then(response => {
-					if (response.data) {
-						return callback(new Error(this.$t('error.codeHasExist')));
-					} else {
-						return callback();
-					}
-				}).catch(() => {
-					return callback(new Error(this.$t('error.serviceException')));
-				});
-			}
-		},
-		show(id) {
-			this.dialogVisible = true;
-			if (id) {
-				getData(id).then(response => {
-					this.formModel = response.data;
-					this.$refs.dataform.resetForm();
-				});
-			}
-		},
-		doSave() {
-			const self = this;
-			this.$refs.dataform.validateForm(() => {
-				if (self.type === 'ADD') {
-					self.create();
-				} else {
-					self.update();
-				}
-			});
-		},
-		create() {
-			const self = this;
-			create(this.formModel).then(response => {
-				self.$message.success(this.$t('system.createSuccess'));
-				self.handleClose();
-				self.$emit('reloadTable');
-			}).catch(error => {
-				self.$message.error(`${this.$t('error.createDictionaryFailed')}:${error.message}`);
-			});
-		},
-		update() {
-			const self = this;
-			update(this.formModel).then(response => {
-				self.$message.success(this.$t('system.updateSuccess'));
-				self.handleClose();
-				self.$emit('reloadTable');
-			}).catch(error => {
-				self.$message.error(`${this.$t('error.updateDictionaryFailed')}:${error.message}`);
-			});
-		},
-		handleClose(done) {
-			this.formModel = {
-				code: '',
-				name: '',
-				status: '1',
-				remarks: ''
-			};
-			this.$refs.dataform.resetForm();
-			if (done) {
-				done();
-			} else {
-				this.dialogVisible = false;
-			}
-		}
-	}
+    name: 'DictionaryEdit',
+    props: {
+        type: {
+            type: String,
+            required: true
+        }
+    },
+    data() {
+        return {
+            dialogVisible: false,
+            formModel: {
+                code: '',
+                name: '',
+                status: '1',
+                remarks: ''
+            }
+        };
+    },
+    computed: {
+        form() {
+            const isAdd = this.type === 'ADD';
+            const form = {
+                labelWidth: '60px',
+                items: [
+                    { prop: 'code', label: this.$t('system.code'), type: 'text', required: true, disabled: !isAdd },
+                    { prop: 'name', label: this.$t('system.name'), type: 'text', required: true },
+                    {
+                        prop: 'status', label: this.$t('system.status'), type: 'select', required: true, options: this.$ConstSelect.Status
+                    },
+                    { prop: 'remarks', label: this.$t('system.remarks'), type: 'textarea', required: false }
+                ]
+            };
+            return form;
+        },
+        rules() {
+            const crules = {
+                name: [
+                    { required: true, message: this.$t('rules.pleaseInputName'), trigger: 'blur' },
+                    { min: 1, max: 25, message: this.$t('rules.strLength1To25'), trigger: 'blur' }
+                ],
+                status: [
+                    { required: true, message: this.$t('rules.pleaseSelectStatus'), trigger: 'change' }
+                ],
+                remarks: [
+                    { max: 50, message: this.$t('rules.strLengthNotExceed50'), trigger: 'blur' }
+                ]
+            };
+            if (this.type === 'ADD') {
+                return Object.assign(crules, {
+                    code: [
+                        { required: true, message: this.$t('rules.pleaseInputCode'), trigger: 'blur' },
+                        { min: 1, max: 25, message: this.$t('rules.strLength1To25'), trigger: 'blur' },
+                        { validator: this.validateCode, trigger: 'blur' }
+                    ]
+                });
+            } else {
+                return crules;
+            }
+        },
+        title() {
+            if (this.type === 'ADD') {
+                return this.$t('system.createDirectory');
+            } else {
+                return this.$t('system.editDictionary');
+            }
+        }
+    },
+    methods: {
+        validateCode(rule, value, callback) {
+            if (!validateCharCode(value)) {
+                return callback(new Error(this.$t('error.formartError')));
+            } else {
+                checkDicCodeExist(value).then(response => {
+                    if (response.data) {
+                        return callback(new Error(this.$t('error.codeHasExist')));
+                    } else {
+                        return callback();
+                    }
+                }).catch(() => {
+                    return callback(new Error(this.$t('error.serviceException')));
+                });
+            }
+        },
+        show(id) {
+            this.dialogVisible = true;
+            if (id) {
+                getData(id).then(response => {
+                    this.formModel = response.data;
+                    this.$refs.dataform.resetForm();
+                });
+            }
+        },
+        doSave() {
+            const self = this;
+            this.$refs.dataform.validateForm(() => {
+                if (self.type === 'ADD') {
+                    self.create();
+                } else {
+                    self.update();
+                }
+            });
+        },
+        create() {
+            const self = this;
+            create(this.formModel).then(response => {
+                self.$message.success(this.$t('system.createSuccess'));
+                self.handleClose();
+                self.$emit('reloadTable');
+            }).catch(error => {
+                self.$message.error(`${this.$t('error.createDictionaryFailed')}:${error.message}`);
+            });
+        },
+        update() {
+            const self = this;
+            update(this.formModel).then(response => {
+                self.$message.success(this.$t('system.updateSuccess'));
+                self.handleClose();
+                self.$emit('reloadTable');
+            }).catch(error => {
+                self.$message.error(`${this.$t('error.updateDictionaryFailed')}:${error.message}`);
+            });
+        },
+        handleClose(done) {
+            this.formModel = {
+                code: '',
+                name: '',
+                status: '1',
+                remarks: ''
+            };
+            this.$refs.dataform.resetForm();
+            if (done) {
+                done();
+            } else {
+                this.dialogVisible = false;
+            }
+        }
+    }
 };
 </script>
diff --git a/src/views/system/dictionaryDetail/edit.vue b/src/views/system/dictionaryDetail/edit.vue
index 543ccf79f..8a4836146 100644
--- a/src/views/system/dictionaryDetail/edit.vue
+++ b/src/views/system/dictionaryDetail/edit.vue
@@ -12,146 +12,146 @@
 import { create, checkDicDetailCodeExist, getData, update } from '@/api/management/dictionaryDetail';
 import { validateCharCode } from '@/utils/validate';
 export default {
-	name: 'DictionaryDetailEdit',
-	props: {
-		type: {
-			type: String,
-			required: true
-		},
-		dicId: {
-			type: String,
-			required: true
-		}
-	},
-	data() {
-		return {
-			dialogVisible: false,
-			formModel: {
-				code: '',
-				name: '',
-				status: '1',
-				remarks: ''
-			}
-		};
-	},
-	computed: {
-		form() {
-			const isAdd = this.type === 'ADD';
-			const form = {
-				labelWidth: '60px',
-				items: [
-					{ prop: 'code', label: this.$t('system.code'), type: 'text', required: true, disabled: !isAdd },
-					{ prop: 'name', label: this.$t('system.name'), type: 'text', required: true },
-					{
-						prop: 'status', label: this.$t('system.status'), type: 'select', required: true, options: this.$ConstSelect.Status
-					},
-					{ prop: 'remarks', label: this.$t('system.remarks'), type: 'textarea', required: false }
-				]
-			};
-			return form;
-		},
-		rules() {
-			const crules = {
-				name: [
-					{ required: true, message: this.$t('rules.pleaseInputName'), trigger: 'blur' },
-					{ min: 1, max: 25, message: this.$t('rules.strLength1To25'), trigger: 'blur' }
-				],
-				status: [
-					{ required: true, message: this.$t('rules.pleaseSelectStatus'), trigger: 'change' }
-				],
-				remarks: [
-					{ max: 50, message: this.$t('rules.strLengthNotExceed50'), trigger: 'blur' }
-				]
-			};
-			if (this.type === 'ADD') {
-				return Object.assign(crules, {
-					code: [
-						{ required: true, message: this.$t('rules.pleaseInputCode'), trigger: 'blur' },
-						{ min: 1, max: 25, message: this.$t('rules.strLength1To25'), trigger: 'blur' },
-						{ validator: this.validateCode, trigger: 'blur' }
-					]
-				});
-			} else {
-				return crules;
-			}
-		},
-		title() {
-			if (this.type === 'ADD') {
-				return this.$t('system.createDetail');
-			} else {
-				return this.$t('system.editDetail');
-			}
-		}
-	},
-	methods: {
-		validateCode(rule, value, callback) {
-			if (!validateCharCode(value)) {
-				return callback(new Error(this.$t('error.formartError')));
-			} else {
-				checkDicDetailCodeExist(this.dicId, value).then(response => {
-					if (response.data) {
-						return callback(new Error(this.$t('error.codeHasExist')));
-					} else {
-						return callback();
-					}
-				}).catch(() => {
-					return callback(new Error(this.$t('error.serviceException')));
-				});
-			}
-		},
-		show(id) {
-			this.dialogVisible = true;
-			if (id) {
-				getData(this.dicId, id).then(response => {
-					this.formModel = response.data;
-					this.$refs.dataform.resetForm();
-				});
-			}
-		},
-		doSave() {
-			const self = this;
-			this.$refs.dataform.validateForm(() => {
-				if (self.type === 'ADD') {
-					self.create();
-				} else {
-					self.update();
-				}
-			});
-		},
-		create() {
-			const self = this;
-			create(this.dicId, this.formModel).then(response => {
-				self.$message.success(this.$t('system.createSuccess'));
-				self.handleClose();
-				self.$emit('reloadTable');
-			}).catch(error => {
-				self.$message.error(`${this.$t('error.createDetailFailed')}:${error.message}`);
-			});
-		},
-		update() {
-			const self = this;
-			update(this.dicId, this.formModel).then(response => {
-				self.$message.success(this.$t('system.updateSuccess'));
-				self.handleClose();
-				self.$emit('reloadTable');
-			}).catch(error => {
-				self.$message.error(`${this.$t('error.updateDetailFailed')}:${error.message}`);
-			});
-		},
-		handleClose(done) {
-			this.formModel = {
-				code: '',
-				name: '',
-				status: '1',
-				remarks: ''
-			};
-			this.$refs.dataform.resetForm();
-			if (done) {
-				done();
-			} else {
-				this.dialogVisible = false;
-			}
-		}
-	}
+    name: 'DictionaryDetailEdit',
+    props: {
+        type: {
+            type: String,
+            required: true
+        },
+        dicId: {
+            type: String,
+            required: true
+        }
+    },
+    data() {
+        return {
+            dialogVisible: false,
+            formModel: {
+                code: '',
+                name: '',
+                status: '1',
+                remarks: ''
+            }
+        };
+    },
+    computed: {
+        form() {
+            const isAdd = this.type === 'ADD';
+            const form = {
+                labelWidth: '60px',
+                items: [
+                    { prop: 'code', label: this.$t('system.code'), type: 'text', required: true, disabled: !isAdd },
+                    { prop: 'name', label: this.$t('system.name'), type: 'text', required: true },
+                    {
+                        prop: 'status', label: this.$t('system.status'), type: 'select', required: true, options: this.$ConstSelect.Status
+                    },
+                    { prop: 'remarks', label: this.$t('system.remarks'), type: 'textarea', required: false }
+                ]
+            };
+            return form;
+        },
+        rules() {
+            const crules = {
+                name: [
+                    { required: true, message: this.$t('rules.pleaseInputName'), trigger: 'blur' },
+                    { min: 1, max: 25, message: this.$t('rules.strLength1To25'), trigger: 'blur' }
+                ],
+                status: [
+                    { required: true, message: this.$t('rules.pleaseSelectStatus'), trigger: 'change' }
+                ],
+                remarks: [
+                    { max: 50, message: this.$t('rules.strLengthNotExceed50'), trigger: 'blur' }
+                ]
+            };
+            if (this.type === 'ADD') {
+                return Object.assign(crules, {
+                    code: [
+                        { required: true, message: this.$t('rules.pleaseInputCode'), trigger: 'blur' },
+                        { min: 1, max: 25, message: this.$t('rules.strLength1To25'), trigger: 'blur' },
+                        { validator: this.validateCode, trigger: 'blur' }
+                    ]
+                });
+            } else {
+                return crules;
+            }
+        },
+        title() {
+            if (this.type === 'ADD') {
+                return this.$t('system.createDetail');
+            } else {
+                return this.$t('system.editDetail');
+            }
+        }
+    },
+    methods: {
+        validateCode(rule, value, callback) {
+            if (!validateCharCode(value)) {
+                return callback(new Error(this.$t('error.formartError')));
+            } else {
+                checkDicDetailCodeExist(this.dicId, value).then(response => {
+                    if (response.data) {
+                        return callback(new Error(this.$t('error.codeHasExist')));
+                    } else {
+                        return callback();
+                    }
+                }).catch(() => {
+                    return callback(new Error(this.$t('error.serviceException')));
+                });
+            }
+        },
+        show(id) {
+            this.dialogVisible = true;
+            if (id) {
+                getData(this.dicId, id).then(response => {
+                    this.formModel = response.data;
+                    this.$refs.dataform.resetForm();
+                });
+            }
+        },
+        doSave() {
+            const self = this;
+            this.$refs.dataform.validateForm(() => {
+                if (self.type === 'ADD') {
+                    self.create();
+                } else {
+                    self.update();
+                }
+            });
+        },
+        create() {
+            const self = this;
+            create(this.dicId, this.formModel).then(response => {
+                self.$message.success(this.$t('system.createSuccess'));
+                self.handleClose();
+                self.$emit('reloadTable');
+            }).catch(error => {
+                self.$message.error(`${this.$t('error.createDetailFailed')}:${error.message}`);
+            });
+        },
+        update() {
+            const self = this;
+            update(this.dicId, this.formModel).then(response => {
+                self.$message.success(this.$t('system.updateSuccess'));
+                self.handleClose();
+                self.$emit('reloadTable');
+            }).catch(error => {
+                self.$message.error(`${this.$t('error.updateDetailFailed')}:${error.message}`);
+            });
+        },
+        handleClose(done) {
+            this.formModel = {
+                code: '',
+                name: '',
+                status: '1',
+                remarks: ''
+            };
+            this.$refs.dataform.resetForm();
+            if (done) {
+                done();
+            } else {
+                this.dialogVisible = false;
+            }
+        }
+    }
 };
 </script>
diff --git a/src/views/system/questionsRuleManage/add.vue b/src/views/system/questionsRuleManage/add.vue
new file mode 100644
index 000000000..8aea52a1d
--- /dev/null
+++ b/src/views/system/questionsRuleManage/add.vue
@@ -0,0 +1,266 @@
+<template>
+  <el-dialog v-dialogDrag :title="title" :visible.sync="dialogVisible" width="710px" :before-close="handleClose" center :close-on-click-modal="false">
+    <el-form ref="form" :model="formModel" label-width="100px" :inline="true">
+      <el-form-item v-if="!isProject" label="单位">
+        <el-select v-model="formModel.companyId" placeholder="请选择单位" clearable size="small" style="width: 400px;" :disabled="update" @change="selectQuestion">
+          <el-option
+            v-for="item in companyList"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="判断题数量">
+        <el-input-number v-model="formModel.judgeNum" :min="0" :max="questionNum.judge" /><div style="display: inline-block;width: 70px;">{{ `(共${questionNum.judge}题)` }}</div>
+      </el-form-item>
+      <el-form-item label="判断题分值">
+        <el-input-number v-model="formModel.judgePoint" :min="0" :max="10" />
+      </el-form-item>
+      <el-form-item label="单选题数量">
+        <el-input-number v-model="formModel.selectNum" :min="0" :max="questionNum.select" /><div style="display: inline-block;width: 70px;">{{ `(共${questionNum.select}题)` }}</div>
+      </el-form-item>
+      <el-form-item label="单选题分值">
+        <el-input-number v-model="formModel.selectPoint" :min="0" :max="10" />
+      </el-form-item>
+      <el-form-item label="多选题数量">
+        <el-input-number v-model="formModel.multiNum" :min="0" :max="questionNum.multi" /><div style="display: inline-block;width: 70px;">{{ `(共${questionNum.multi}题)` }}</div>
+      </el-form-item>
+      <el-form-item label="多选题分值">
+        <el-input-number v-model="formModel.multiPoint" :min="0" :max="10" />
+      </el-form-item>
+      <el-form-item label="填空题数量">
+        <el-input-number v-model="formModel.fillNum" :min="0" :max="questionNum.fill" /><div style="display: inline-block;width: 70px;">{{ `(共${questionNum.fill}题)` }}</div>
+      </el-form-item>
+      <el-form-item label="填空题分值">
+        <el-input-number v-model="formModel.fillPoint" :min="0" :max="10" />
+      </el-form-item>
+      <el-form-item label="填空题数量">
+        <el-input-number v-model="formModel.answerNum" :min="0" :max="questionNum.answer" /><div style="display: inline-block;width: 70px;">{{ `(共${questionNum.answer}题)` }}</div>
+      </el-form-item>
+      <el-form-item label="填空题分值">
+        <el-input-number v-model="formModel.answerPoint" :min="0" :max="10" />
+      </el-form-item>
+    </el-form>
+    <div style="width: 100%;text-align: center;">{{ `共${totalNum}题，${totalScore}分` }}</div>
+    <span slot="footer" class="dialog-footer">
+      <el-button type="primary" @click="doSave">{{ update? '修改' : $t('global.confirm') }}</el-button>
+      <el-button @click="handleClose">{{ $t('global.cancel') }}</el-button>
+    </span>
+  </el-dialog>
+</template>
+
+<script>
+import { addQuestionRule, updateQuestionRule } from '@/api/questionsRule';
+import { getSessionStorage } from '@/utils/auth';
+import { selectQuestionTypeNum } from '@/api/race';
+export default {
+    name: 'Add',
+    props: {
+        companyList: {
+            type: Array,
+            required: true
+        }
+    },
+    data() {
+        return {
+            dialogVisible: false,
+            formModel: {
+                id: '',
+                companyId: '',
+                judgeNum: 0,
+                judgePoint: 0,
+                selectNum: 0,
+                selectPoint: 0,
+                multiNum: 0,
+                multiPoint: 0,
+                fillNum: 0,
+                fillPoint: 0,
+                answerNum: 0,
+                answerPoint: 0
+            },
+            questionNum: {
+                select: 999,
+                judge: 999,
+                multi: 999,
+                fill:999,
+                answer: 999
+            },
+            update: false
+        };
+    },
+    computed:{
+        isProject() {
+            const project = getSessionStorage('project');
+            return project !== 'login' && project !== 'design';
+        },
+        totalNum() {
+            return this.formModel.judgeNum + this.formModel.selectNum + this.formModel.multiNum + this.formModel.fillNum + this.formModel.answerNum;
+        },
+        totalScore() {
+            return (this.formModel.judgePoint * this.formModel.judgeNum) + (this.formModel.selectPoint * this.formModel.selectNum ) +
+				(this.formModel.multiPoint * this.formModel.multiNum) + (this.formModel.fillPoint * this.formModel.fillNum) + (this.formModel.answerPoint * this.formModel.answerNum);
+        },
+        title() {
+            return this.update ? '修改出题规则' : '添加出题规则';
+        }
+    },
+    watch: {
+    },
+    methods: {
+        async selectQuestion() {
+            const questionNumTem = {
+                select: 0,
+                judge: 0,
+                multi: 0,
+                fill:0,
+                answer: 0
+            };
+            const resp = await selectQuestionTypeNum(this.formModel.companyId || '');
+            (resp.data || []).forEach(item => {
+                questionNumTem[item.type] = item.num;
+            });
+            this.questionNum = questionNumTem;
+        },
+        async doShow(data) {
+            this.dialogVisible = true;
+            this.update = false;
+            if (data) {
+                this.update = true;
+                this.formModel.id = data.id;
+                this.formModel.companyId = data.companyId;
+                const questionNumTem = {
+                    select: 0,
+                    judge: 0,
+                    multi: 0,
+                    fill:0,
+                    answer: 0
+                };
+                const resp = await selectQuestionTypeNum(this.formModel.companyId || '');
+                (resp.data || []).forEach(item => {
+                    questionNumTem[item.type] = item.num;
+                });
+                this.questionNum = questionNumTem;
+                data.rules.forEach(item => {
+
+                    if (item.type === 'judge') {
+                        this.formModel.judgeNum = item.num;
+                        console.log(this.formModel.judgeNum, item.num);
+                        this.formModel.judgePoint = item.point;
+                    } else if (item.type === 'select') {
+                        this.formModel.selectNum = item.num;
+                        this.formModel.selectPoint = item.point;
+                    } else if (item.type === 'multi') {
+                        this.formModel.multiNum = item.num;
+                        this.formModel.multiPoint = item.point;
+                    } else if (item.type === 'fill') {
+                        this.formModel.fillNum = item.num;
+                        this.formModel.fillPoint = item.point;
+                    } else if (item.type === 'answer') {
+                        this.formModel.answerNum = item.num;
+                        this.formModel.answerPoint = item.point;
+                    }
+                });
+            } else {
+                const questionNumTem = {
+                    select: 0,
+                    judge: 0,
+                    multi: 0,
+                    fill:0,
+                    answer: 0
+                };
+                const resp = await selectQuestionTypeNum(this.formModel.companyId || '');
+                (resp.data || []).forEach(item => {
+                    questionNumTem[item.type] = item.num;
+                });
+                this.questionNum = questionNumTem;
+                this.formModel = {
+                    id: '',
+                    companyId: '',
+                    judgeNum: 0,
+                    judgePoint: 0,
+                    selectNum: 0,
+                    selectPoint: 0,
+                    multiNum: 0,
+                    multiPoint: 0,
+                    fillNum: 0,
+                    fillPoint: 0,
+                    answerNum: 0,
+                    answerPoint: 0
+                };
+            }
+        },
+        handleClose() {
+            this.dialogVisible = false;
+            this.formModel = {
+                id: '',
+                companyId: '',
+                judgeNum: 0,
+                judgePoint: 0,
+                selectNum: 0,
+                selectPoint: 0,
+                multiNum: 0,
+                multiPoint: 0,
+                fillNum: 0,
+                fillPoint: 0,
+                answerNum: 0,
+                answerPoint: 0
+            };
+            this.questionNum = {
+                select: 999,
+                judge: 999,
+                multi: 999,
+                fill:999,
+                answer: 999
+            };
+        },
+        doSave() {
+            const params = {
+                id: this.formModel.id,
+                companyId: this.formModel.companyId,
+                rules: []
+            };
+            if (this.formModel.judgeNum && this.formModel.judgePoint) {
+                params.rules.push({ type:'judge', num: this.formModel.judgeNum, point: this.formModel.judgePoint });
+            }
+            if (this.formModel.selectNum && this.formModel.selectPoint) {
+                params.rules.push({ type: 'select', num: this.formModel.selectNum, point: this.formModel.selectPoint});
+            }
+            if (this.formModel.multiNum && this.formModel.multiPoint) {
+                params.rules.push({ type: 'multi', num: this.formModel.multiNum, point: this.formModel.multiPoint});
+            }
+            if (this.formModel.fillNum && this.formModel.fillPoint) {
+                params.rules.push({ type: 'fill', num: this.formModel.fillNum, point: this.formModel.fillPoint });
+            }
+            if (this.formModel.answerNum && this.formModel.answerPoint) {
+                params.rules.push({ type: 'answer', num: this.formModel.answerNum, point: this.formModel.point});
+            }
+            if (this.update) {
+                updateQuestionRule(this.formModel.id, params).then(resp => {
+                    this.$message.success('更新出题规则成功！');
+                    this.dialogVisible = false;
+                    this.$emit('reloadTable');
+                }).catch(e => {
+                    this.$message.error('更新出题规则失败！');
+                });
+            } else {
+                addQuestionRule(params).then(resp => {
+                    this.$message.success('添加出题规则成功！');
+                    this.dialogVisible = false;
+                    this.$emit('reloadTable');
+                }).catch(e => {
+                    if (e.code == 10010) {
+                        this.$message.error('关联该单位数据已存在！');
+                    } else {
+                        this.$message.error('添加出题规则失败！');
+                    }
+                });
+            }
+        }
+    }
+};
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/system/questionsRuleManage/index.vue b/src/views/system/questionsRuleManage/index.vue
new file mode 100644
index 000000000..b7f0e524c
--- /dev/null
+++ b/src/views/system/questionsRuleManage/index.vue
@@ -0,0 +1,193 @@
+<template>
+  <div style="text-align: center;">
+    <div style="text-align: right;margin: 10px;">
+      <el-button
+        size="mini"
+        type="primary"
+        @click="queryData"
+      >查询</el-button>
+      <el-button
+        size="mini"
+        type="primary"
+        @click="handlerAddCompany"
+      >添加</el-button>
+      <el-button
+        size="mini"
+        type="success"
+        @click="handlerBack"
+      >返回</el-button>
+    </div>
+    <el-table :data="tableData" border style="width: 100%">
+      <el-table-column prop="companyId" label="单位名称">
+        <template slot-scope="scope">
+          <span>{{ $convertField(scope.row.companyId, companyList, ['id', 'name']) }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="判断题">
+        <el-table-column prop="rules" label="数量">
+          <template slot-scope="scope">
+            <span>{{ handlerRuleData(scope.row.rules, 'judge', 'num') }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column prop="rules" label="分数">
+          <template slot-scope="scope">
+            <span>{{ handlerRuleData(scope.row.rules, 'judge', 'point') }}</span>
+          </template>
+        </el-table-column>
+      </el-table-column>
+      <el-table-column label="单选题">
+        <el-table-column prop="rules" label="数量">
+          <template slot-scope="scope">
+            <span>{{ handlerRuleData(scope.row.rules, 'select', 'num') }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column prop="rules" label="分数">
+          <template slot-scope="scope">
+            <span>{{ handlerRuleData(scope.row.rules, 'select', 'point') }}</span>
+          </template>
+        </el-table-column>
+      </el-table-column>
+      <el-table-column label="多选题">
+        <el-table-column prop="rules" label="数量">
+          <template slot-scope="scope">
+            <span>{{ handlerRuleData(scope.row.rules, 'multi', 'num') }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column prop="rules" label="分数">
+          <template slot-scope="scope">
+            <span>{{ handlerRuleData(scope.row.rules, 'multi', 'point') }}</span>
+          </template>
+        </el-table-column>
+      </el-table-column>
+      <el-table-column label="填空题">
+        <el-table-column prop="rules" label="数量">
+          <template slot-scope="scope">
+            <span>{{ handlerRuleData(scope.row.rules, 'fill', 'num') }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column prop="rules" label="分数">
+          <template slot-scope="scope">
+            <span>{{ handlerRuleData(scope.row.rules, 'fill', 'point') }}</span>
+          </template>
+        </el-table-column>
+      </el-table-column>
+      <el-table-column label="问答题">
+        <el-table-column prop="rules" label="数量">
+          <template slot-scope="scope">
+            <span>{{ handlerRuleData(scope.row.rules, 'answer', 'num') }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column prop="rules" label="分数">
+          <template slot-scope="scope">
+            <span>{{ handlerRuleData(scope.row.rules, 'answer', 'point') }}</span>
+          </template>
+        </el-table-column>
+      </el-table-column>
+      <el-table-column label="操作" width="200">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="primary"
+            @click="handleUpdate(scope.$index, scope.row)"
+          >编辑</el-button>
+          <el-button
+            size="mini"
+            type="danger"
+            @click="handleDeleteCompany(scope.$index, scope.row)"
+          >删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <el-pagination
+      :current-page.sync="currentPage"
+      :page-size="pageSize"
+      layout="total, sizes, prev, pager, next, jumper"
+      :page-sizes="[10, 20, 30, 50]"
+      :total="totalNum"
+      @size-change="handleSizeChange"
+      @current-change="handleCurrentChange"
+    />
+    <edit-questions-rule ref="editQuestionsRule" :company-list="companyList" @reloadTable="reloadTable" />
+  </div>
+</template>
+
+<script>
+import { getQustionRuleListPage, deleteQuestionRule } from '@/api/questionsRule';
+import { getCompanyList } from '@/api/company';
+import EditQuestionsRule from './add';
+export default {
+    name: 'CompanyManage',
+    components: {
+        EditQuestionsRule
+    },
+    data() {
+        return {
+            companyList: [],
+            currentPage: 1,
+            tableData: [],
+            pageSize: 10,
+            totalNum: 0,
+            currentModel: {}
+        };
+    },
+    mounted() {
+        getCompanyList().then(resp => {
+            this.companyList = resp.data;
+        });
+        this.queryData();
+    },
+    methods: {
+        queryData() {
+            const param = {
+                pageSize: this.pageSize,
+                pageNum: this.currentPage
+            };
+            getQustionRuleListPage(param).then(resp => {
+                this.totalNum = resp.data.total;
+                this.tableData = resp.data.list;
+            });
+        },
+        handleSizeChange(val) {
+            this.pageSize = val;
+            this.queryData();
+        },
+        handleCurrentChange(val) {
+            this.currentPage = val;
+            this.queryData();
+        },
+        handlerAddCompany() {
+            this.$refs.editQuestionsRule.doShow();
+        },
+        handleDeleteCompany(index, row) {
+            deleteQuestionRule(row.id).then(resp => {
+                this.$message.success('删除规则信息成功！');
+                this.reloadTable();
+            }).catch(() => {
+                this.$message.error('删除规则信息失败!');
+            });
+        },
+        handleUpdate(index, row) {
+            this.$refs.editQuestionsRule.doShow(row);
+        },
+        reloadTable() {
+            this.queryData();
+        },
+        handlerBack() {
+            this.$router.go(-1);
+        },
+        handlerRuleData(rules, type, param) {
+            let value = 0;
+            rules && rules.forEach(item => {
+                if (item.type === type) {
+                    value = item[param];
+                }
+            });
+            return value;
+        }
+    }
+};
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/system/userControl/createUser.vue b/src/views/system/userControl/createUser.vue
index b515370ad..c2c5344b4 100644
--- a/src/views/system/userControl/createUser.vue
+++ b/src/views/system/userControl/createUser.vue
@@ -10,7 +10,7 @@
     </el-form>
     <div v-if="addModel.generatePermission" style="max-height: 400px;overflow-y: scroll;">
       <template v-for="(item, index) in permissionConfigVOList">
-        <el-card class="box-card">
+        <el-card :key="index" class="box-card">
           <div slot="header" class="clearfix">
             <el-button v-if="index!==0" size="mini" icon="el-icon-minus" circle style="float: right;" @click="delPermission(index)" />
             <el-button size="mini" icon="el-icon-plus" circle style="float: right;margin-right: 10px" @click="addPermission(index)" />
diff --git a/src/views/system/userControl/edit.vue b/src/views/system/userControl/edit.vue
index 39f3d66d8..d7415f00d 100644
--- a/src/views/system/userControl/edit.vue
+++ b/src/views/system/userControl/edit.vue
@@ -10,6 +10,7 @@
 
 <script>
 import { putRoles } from '@/api/management/user';
+import { getCompanyList } from '@/api/company';
 
 export default {
     name: 'DictionaryEdit',
@@ -22,8 +23,10 @@ export default {
                 // nickname: '',
                 // mobile: '',
                 // email: '',
+                companyId: '',
                 roles: []
-            }
+            },
+            companyList: []
         };
     },
     computed: {
@@ -35,7 +38,8 @@ export default {
                     // { prop: 'nickname', label: '昵称', type: 'text' },
                     // { prop: 'mobile', label: '电话', type: 'number' },
                     // { prop: 'email', label: '邮箱', type: 'text' },
-                    { prop: 'roles', label: this.$t('system.permission'), type: 'select', required: true, options: this.$ConstSelect.roleList, multiple: true }
+                    { prop: 'roles', label: this.$t('system.permission'), type: 'select', required: true, options: this.$ConstSelect.roleList, multiple: true },
+                    { prop: 'companyId', label: '单位', type: 'select', options: this.companyList, clearable: true }
                 ]
             };
             return form;
@@ -60,6 +64,13 @@ export default {
             return crules;
         }
     },
+    mounted() {
+        getCompanyList().then(resp => {
+            resp.data.forEach(item => {
+                this.companyList.push({label: item.name, value: parseInt(item.id)});
+            });
+        });
+    },
     methods: {
         doShow(data) {
             this.dialogVisible = true;
@@ -70,6 +81,7 @@ export default {
                     // nickname: data.nickname,
                     // mobile: data.mobile,
                     // email: data.email,
+                    companyId: data.companyId,
                     roles: data.roles
                 };
             }
@@ -94,6 +106,7 @@ export default {
             this.formModel = {
                 id: '',
                 name: '',
+                companyId: '',
                 roles: []
             };
             this.$refs.dataform.resetForm();
diff --git a/src/views/system/userExam/edit.vue b/src/views/system/userExam/edit.vue
index 75cce7a85..429be815d 100644
--- a/src/views/system/userExam/edit.vue
+++ b/src/views/system/userExam/edit.vue
@@ -12,94 +12,94 @@
 import { updateExam } from '@/api/management/userexam';
 
 export default {
-	name: 'PublishExamEdit',
-	props: {
-		type: {
-			type: String,
-			required: true
-		}
-	},
-	data() {
-		return {
-			dialogVisible: false,
-			formModel: {
-				id: '',
-				userName: '',
-				score: '',
-				examName: '',
-				result: ''
-			}
-		};
-	},
-	computed: {
-		form() {
-			const form = {
-				labelWidth: '160px',
-				items: [
-					{ prop: 'userName', label: this.$t('system.userName'), type: 'text', required: false, disabled: true },
-					{ prop: 'examName', label: this.$t('system.examName'), type: 'text', required: true, disabled: true },
-					{ prop: 'score', label: this.$t('system.examScore'), type: 'text', required: true },
-					{ prop: 'result', label: this.$t('system.examResult'), type: 'select', required: true, options: this.$ConstSelect.examResultList }
-				]
-			};
-			return form;
-		},
-		rules() {
-			const crules = {
-				score: [
-					{ required: true, message: this.$t('rules.pleaseInputName'), trigger: 'blur' }
-				],
-				result: [
-					{ required: true, message: this.$t('rules.pleaseSelectStatus'), trigger: 'change' }
-				]
-			};
-			return crules;
-		},
-		title() {
-			return this.$t('system.editExamDetail');
-		}
-	},
-	methods: {
-		show(data) {
-			this.dialogVisible = true;
-			this.formModel = {
-				id: data.id,
-				userName: data.userName,
-				score: data.score,
-				examName: data.examName,
-				result: data.result
-			};
-		},
-		doSave() {
-			const self = this;
-			this.$refs.dataform.validateForm(() => {
-				self.update();
-			});
-		},
-		update() {
-			const self = this;
-			updateExam(this.formModel).then(response => {
-				self.$message.success(this.$t('system.updateSuccess'));
-				self.handleClose();
-				self.$emit('reloadTable');
-			}).catch(error => {
-				self.$message.error(`${this.$t('error.updateFailed')}: ${error.message}`);
-			});
-		},
-		handleClose(done) {
-			this.formModel = {
-				id: '',
-				userName: '',
-				score: '',
-				examName: '',
-				result: ''
-			};
-			if (done) {
-				done();
-			} else {
-				this.dialogVisible = false;
-			}
-		}
-	}
+    name: 'PublishExamEdit',
+    props: {
+        type: {
+            type: String,
+            required: true
+        }
+    },
+    data() {
+        return {
+            dialogVisible: false,
+            formModel: {
+                id: '',
+                userName: '',
+                score: '',
+                examName: '',
+                result: ''
+            }
+        };
+    },
+    computed: {
+        form() {
+            const form = {
+                labelWidth: '160px',
+                items: [
+                    { prop: 'userName', label: this.$t('system.userName'), type: 'text', required: false, disabled: true },
+                    { prop: 'examName', label: this.$t('system.examName'), type: 'text', required: true, disabled: true },
+                    { prop: 'score', label: this.$t('system.examScore'), type: 'text', required: true },
+                    { prop: 'result', label: this.$t('system.examResult'), type: 'select', required: true, options: this.$ConstSelect.examResultList }
+                ]
+            };
+            return form;
+        },
+        rules() {
+            const crules = {
+                score: [
+                    { required: true, message: this.$t('rules.pleaseInputName'), trigger: 'blur' }
+                ],
+                result: [
+                    { required: true, message: this.$t('rules.pleaseSelectStatus'), trigger: 'change' }
+                ]
+            };
+            return crules;
+        },
+        title() {
+            return this.$t('system.editExamDetail');
+        }
+    },
+    methods: {
+        show(data) {
+            this.dialogVisible = true;
+            this.formModel = {
+                id: data.id,
+                userName: data.userName,
+                score: data.score,
+                examName: data.examName,
+                result: data.result
+            };
+        },
+        doSave() {
+            const self = this;
+            this.$refs.dataform.validateForm(() => {
+                self.update();
+            });
+        },
+        update() {
+            const self = this;
+            updateExam(this.formModel).then(response => {
+                self.$message.success(this.$t('system.updateSuccess'));
+                self.handleClose();
+                self.$emit('reloadTable');
+            }).catch(error => {
+                self.$message.error(`${this.$t('error.updateFailed')}: ${error.message}`);
+            });
+        },
+        handleClose(done) {
+            this.formModel = {
+                id: '',
+                userName: '',
+                score: '',
+                examName: '',
+                result: ''
+            };
+            if (done) {
+                done();
+            } else {
+                this.dialogVisible = false;
+            }
+        }
+    }
 };
 </script>
diff --git a/src/views/system/userTraining/addTraining.vue b/src/views/system/userTraining/addTraining.vue
index 5b182dbe2..3f7ba583d 100644
--- a/src/views/system/userTraining/addTraining.vue
+++ b/src/views/system/userTraining/addTraining.vue
@@ -24,7 +24,6 @@
 </template>
 
 <script>
-// getPublishLessonDetail
 import { getPublishLessonTree } from '@/api/jmap/lesson';
 
 export default {
diff --git a/src/views/teach/detail/index.vue b/src/views/teach/detail/index.vue
index 9d7f2744a..f63dad156 100644
--- a/src/views/teach/detail/index.vue
+++ b/src/views/teach/detail/index.vue
@@ -51,7 +51,7 @@ import { PermissionType } from '@/scripts/ConstDic';
 import { UrlConfig } from '@/scripts/ConstDic';
 import LimitList from '@/views/components/limits/index';
 import { getSessionStorage, setSessionStorage } from '@/utils/auth';
-import { trainingNotify, trainingNotifyNew } from '@/api/simulation';
+import { trainingNotifyNew } from '@/api/simulation';
 import { getPublishMapInfo } from '@/api/jmap/map';
 import { launchFullscreen } from '@/utils/screen';
 import localStore from 'storejs';
@@ -79,7 +79,6 @@ export default {
             },
             lineCode: '', // 线路皮肤码
             expandList: [],
-            drawWay: false,
             loadingProjectList: ['login', 'design', 'xty', 'designxty', 'gzb', 'designxty', 'xadt', 'designxadt', 'drts', 'designdrts']
         };
     },
@@ -116,7 +115,6 @@ export default {
         initLoadPage() {
             getPublishMapInfo(this.$route.query.mapId).then(res => {
                 if (res.data) {
-                    this.drawWay = res.data.drawWay;
                     this.lineCode = res.data.lineCode;
                 }
             }).catch(() => {
@@ -151,36 +149,23 @@ export default {
             if (obj && obj.type === 'Training') {
                 if (obj.valid) {
                     this.disabled = true;
-                    if (this.drawWay) {
-                        trainingNotifyNew({ trainingId: obj.id }).then(resp => {
-                            const query = {
-                                group: resp.data, trainingId: obj.id, lessonId: this.$route.query.lessonId, mapId: this.courseModel.mapId, lineCode: this.lineCode, noPreLogout: this.$route.query.noPreLogout
-                            };
-                            if (this.loadingProjectList.includes(this.project)) {
-                                this.$store.dispatch('app/transitionAnimations');
-                            }
-                            if (this.$route.query.noPreLogout) {
-                                this.$router.replace({ path: `${UrlConfig.displayNew}/teach`, query: query });
-                            } else {
-                                this.$router.push({ path: `${UrlConfig.displayNew}/teach`, query: query });
-                            }
-                            launchFullscreen();
-                        }).catch(error => {
-                            this.$messageBox(`${this.$t('tip.createSimulationFaild')} : ${error.message}`);
-                            this.disabled = false;
-                        });
-                    } else {
-                        trainingNotify({ trainingId: obj.id }).then(resp => {
-                            const query = {
-                                group: resp.data, trainingId: obj.id, lessonId: this.$route.query.lessonId, mapId: this.courseModel.mapId
-                            };
-                            this.$router.push({ path: `${UrlConfig.display}/teach`, query: query });
-                            launchFullscreen();
-                        }).catch(error => {
-                            this.$messageBox(`${this.$t('tip.createSimulationFaild')} : ${error.message}`);
-                            this.disabled = false;
-                        });
-                    }
+                    trainingNotifyNew({ trainingId: obj.id }).then(resp => {
+                        const query = {
+                            group: resp.data, trainingId: obj.id, lessonId: this.$route.query.lessonId, mapId: this.courseModel.mapId, lineCode: this.lineCode, noPreLogout: this.$route.query.noPreLogout
+                        };
+                        if (this.loadingProjectList.includes(this.project)) {
+                            this.$store.dispatch('app/transitionAnimations');
+                        }
+                        if (this.$route.query.noPreLogout) {
+                            this.$router.replace({ path: `${UrlConfig.displayNew}/teach`, query: query });
+                        } else {
+                            this.$router.push({ path: `${UrlConfig.displayNew}/teach`, query: query });
+                        }
+                        launchFullscreen();
+                    }).catch(error => {
+                        this.$messageBox(`${this.$t('tip.createSimulationFaild')} : ${error.message}`);
+                        this.disabled = false;
+                    });
                 } else {
                     this.$confirm(this.$t('tip.accessCourseNo'), this.$t('tip.hint'), {
                         confirmButtonText: this.$t('tip.confirm'),
diff --git a/src/views/trainRoom/add-person.vue b/src/views/trainRoom/add-person.vue
deleted file mode 100644
index 69945f579..000000000
--- a/src/views/trainRoom/add-person.vue
+++ /dev/null
@@ -1,164 +0,0 @@
-<template>
-  <el-dialog v-dialogDrag class="person" :title="$t(titleI18n)" :visible.sync="show" width="20%" :z-index="2000" :modal="true" :before-close="cancel" :close-on-click-modal="false">
-    <el-input v-model="filterText" :placeholder="this.$t('global.enterNameToFilter')" clearable />
-    <ul class="person__container">
-      <li v-for="(item,index) in filterList" :key="index" class="person__container--li">
-        <input
-          v-model="item.select"
-          class="checkbox"
-          type="checkbox"
-        >
-        <span>{{ item.node.nickName }}</span>
-      </li>
-    </ul>
-    <span slot="footer" class="person__footer">
-      <el-button @click="cancel">{{ $t('global.cancel') }}</el-button>
-      <el-button type="primary" @click="commit">{{ $t('global.confirm') }}</el-button>
-    </span>
-  </el-dialog>
-</template>
-
-<script>
-export default {
-    props: {
-        audienceList: {
-            type: Array,
-            default() {
-                return [];
-            }
-        }
-    },
-    data() {
-        return {
-            visible: false,
-            roleType: '',
-            filterText: ''
-        };
-    },
-    computed: {
-        show() {
-            return this.visible;
-        },
-        props() {
-            return { label: 'name' };
-        },
-        personList() {
-            return this.audienceList.map(e => { return { select: false, node: e }; });
-        },
-        filterList() {
-            return this.personList.filter(e => e.node.nickName.includes(this.filterText));
-        },
-        titleI18n() {
-            return {
-                'Dispatcher': 'trainRoom.increaseDispatchers',
-                'Attendant': 'trainRoom.increaseStationAttendant',
-                'Instructor': 'trainRoom.increaseTeacher',
-                'Repair': 'trainRoom.increaseUniversalAccount',
-                'Driver': 'trainRoom.driver',
-                'IBP': 'trainRoom.increaseIbp',
-                'CI': 'trainRoom.interlock'
-            }[this.roleType];
-        }
-    },
-    methods: {
-        doShow(roleType) {
-            this.roleType = roleType;
-            this.visible = true;
-        },
-        doClose() {
-            this.visible = false;
-        },
-        commit() {
-            const userList = this.personList.filter(e => { return e.select; }).map(e=> { return e.node; });
-            this.$emit('dispatch', {roleType: this.roleType, userList});
-            this.visible = false;
-        },
-        cancel() {
-            this.doClose();
-        }
-    }
-};
-</script>
-
-<style scoped lang="scss">
-    ul,
-    li {
-        list-style: none;
-        padding: 0;
-        margin: 0;
-    }
-
-    ::-webkit-scrollbar {
-        width: 2px;
-    }
-
-    ::-webkit-scrollbar-thumb {
-        background-color: #c7c7c7;
-    }
-
-	/deep/ .el-dialog__body {
-		padding: 10px 20px;
-	}
-
-	.person {
-		&__container {
-			max-height: 270px;
-			overflow-y: scroll;
-			width: 100%;
-
-			&--li {
-				height: 30px;
-				line-height: 30px;
-
-				.checkbox {
-					margin-right: 5px;
-					cursor: pointer;
-					font-size: 14px;
-					width: 14px;
-					height: 14px;
-					position: relative;
-					display: block;
-					margin-top: 9px;
-					float: left;
-
-					&.disabled {
-						cursor: not-allowed;
-					}
-
-					&.disabled:after {
-						background-color: #edf2fc;
-						border-color: #dcdfe6;
-					}
-				}
-
-				.checkbox:after {
-					position: absolute;
-					width: 14px;
-					height: 14px;
-					top: 0;
-					content: " ";
-					background-color: #fff;
-					color: #fff;
-					display: inline-block;
-					visibility: visible;
-					padding: 0px 3px;
-					border: 1px solid #dcdfe6;
-					border-radius: 3px;
-				}
-
-				.checkbox:checked:after {
-					content: "✓";
-					font-size: 12px;
-					width: 14px;
-					height: 14px;
-					display: flex;
-					align-items: center;
-					justify-content: center;
-					background-color: #409EFF;
-					border: 1px solid #409EFF;
-				}
-			}
-		}
-	}
-
-</style>
diff --git a/src/views/trainRoom/content-menu.vue b/src/views/trainRoom/content-menu.vue
deleted file mode 100644
index 5a95c8c58..000000000
--- a/src/views/trainRoom/content-menu.vue
+++ /dev/null
@@ -1,92 +0,0 @@
-<template>
-  <div class="jointRoomMenu">
-    <pop-menu ref="popMenu" :menu="menu" />
-  </div>
-</template>
-
-<script>
-import PopMenu from '@/components/PopMenu';
-import { DeviceMenu } from '@/scripts/ConstDic';
-import { putJointTrainingUserkicked } from '@/api/chat';
-
-export default {
-    components: {
-        PopMenu
-    },
-    props: {
-        clickUserId: {
-            type: String,
-            default: ''
-        }
-    },
-    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;
-        },
-        drawWay() {
-            return this.$route.query.drawWay + '';
-        }
-    },
-    watch: {
-        '$store.state.menuOperation.menuCount': function (val) {
-            if (this.$store.getters['menuOperation/checkDialogIsOpen'](DeviceMenu.JointRoom)) {
-                this.doShow();
-            } else {
-                this.doClose();
-            }
-        }
-    },
-    mounted() {
-        this.closeEvent();
-    },
-    methods: {
-        closeEvent() {
-            const self = this;
-            window.onclick = function (e) {
-                self.doClose();
-            };
-        },
-        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 putJointTrainingUserkicked(this.clickUserId, this.$route.query.group);
-            } 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/trainRoom/e-chat.vue b/src/views/trainRoom/e-chat.vue
deleted file mode 100644
index 9e60dc2f6..000000000
--- a/src/views/trainRoom/e-chat.vue
+++ /dev/null
@@ -1,499 +0,0 @@
-<template>
-  <!-- 聊天窗口 -->
-  <div class="chat">
-    <div class="chat__head">
-      <div class="chat__head--title"> 会话窗口</div>
-    </div>
-    <div ref="content" class="chat__container" :style="{height: listHeight+'px'}">
-      <ul class="chat__container--list">
-        <div v-for="(nor, index) in textList" :key="index" style="margin-top: 5px;">
-          <li v-if="nor.self" style="position: relative">
-            <div class="userName" style="position: absolute; right: 4px; top: 4px; font-size: 14px;">
-              {{ covertTime(nor.chatTime) }} {{ nor.userName }}</div>
-            <div class="news">
-              <span>{{ nor.value }}</span>
-            </div>
-            <div v-if="nor.voice" class="yuyin" @click="playAudio(nor)">
-              <i class="el-icon-caret-right" />
-            </div>
-          </li>
-          <li v-if="nor.other" style="position: relative">
-            <div class="userName" style="position: absolute; left: 12px; top: 4px; font-size: 14px;">
-              {{ nor.userName }} {{ covertTime(nor.chatTime) }}</div>
-            <div class="answers">
-              <span>{{ nor.value }}</span>
-            </div>
-            <div v-if="nor.voice" class="yuyin1" @click="playAudio(nor)">
-              <i class="el-icon-caret-right" />
-            </div>
-          </li>
-          <li v-if="nor.join" class="roomTip">{{ nor.roomTip }}</li>
-        </div>
-      </ul>
-      <div v-if="recordSending" class="chat_record_tip">
-        <div id="record_progress_bar" :style="'width:'+100/60*seconds+'%'" />
-        <div class="record_icon" />
-        <div class="record_tip_text">正在录音...</div>
-        <div class="record_tip_confirm" @click="stopRecording()">确定</div>
-        <div class="record_tip_cancle" @click="cancleRecording()">取消</div>
-      </div>
-    </div>
-    <audio ref="audio" />
-    <div class="chat__footer">
-      <div class="chat_tool">
-        <div class="microphoneBtn" @click="startRecording()">
-          <span class="el-icon-microphone" />
-        </div>
-      </div>
-      <textarea id="dope" v-model="text" class="chat__footer--text" style="width: 99%;height: 47px; border: none;outline: none;" @keyup="handleSetInputState" @keyup.enter="handleSendText" />
-      <button class="chat__footer--send" :disabled="disabled" @click="handleSendText">{{ $t('trainRoom.sendText') }}</button>
-    </div>
-  </div>
-</template>
-
-<script>
-// import HZRecorder from '@/utils/HZRecorder';
-import RecordRTC from 'recordrtc';
-import { chatWithText, chatWithAudio, chatWithAudioNew } from '@/api/chat';
-import { chatWithTextNew } from '@/api/jointTraining';
-
-export default {
-    props: {
-        room: {
-            type: Object,
-            required: true
-        },
-        members: {
-            type: Array,
-            required: true
-        },
-        height: {
-            type: Number,
-            required: true
-        }
-    },
-    data() {
-        return {
-            textList: [],
-            recordSending:false,
-            text: '',
-            seconds:0,
-            inter:null,
-            recorders: null,
-            sending: false,
-            disabled:true,
-            microphone:null,
-            baseUrl:process.env.VUE_APP_VOICE_API
-        };
-    },
-    computed: {
-        listHeight() {
-            return this.height - 119;
-        },
-        group() {
-            return this.$route.query.group;
-        },
-        userId() {
-            return this.$store.state.user ? this.$store.state.user.id : '';
-        },
-        drawWay() {
-            const drawWay = this.$route.query.drawWay;
-            return drawWay && JSON.parse(drawWay);
-        }
-    },
-    watch: {
-        '$store.state.socket.chatContent': function (val) { // 房间内语音聊天
-            if (val.chatInfo) {
-                this.handelTextList(val);
-            }
-        }
-    },
-    methods: {
-        async handleSetInputState(keyCode) {
-            if (!this.text.trim()) {
-                this.disabled = true;
-            } else {
-                this.disabled = false;
-            }
-        },
-        covertTime(time) {
-            return time.slice(0, time.indexOf('.'));
-        },
-        async handleSendText() {
-            try {
-                if (this.text.trim()) {
-                    if (this.drawWay) {
-                        await chatWithTextNew(this.text, this.group);
-                    } else {
-                        await chatWithText(this.text, this.group);
-                    }
-                    this.text = '';
-                    this.disabled = true;
-                }
-            } catch (error) {
-                console.error(error);
-            }
-        },
-        async handelTextList(params) {
-            if (!params.inSimulation) {
-                this.textList.push(params);
-                this.textList.sort((a, b) => {
-                    return a.date - b.date;
-                });
-            }
-            this.sending = false;
-            this.$store.dispatch('socket/setChatContent', {});
-            this.$nextTick(() => {
-                if (this.$refs.content) {
-                    this.$refs.content.scrollTop = this.$refs.content.scrollHeight;
-                }
-            });
-        },
-        // 语音录制开始
-        startRecording() {
-            const that = this;
-            if (!this.recordSending && !this.recorders && !this.microphone) {
-                const StereoAudioRecorder = RecordRTC.StereoAudioRecorder;
-                navigator.getUserMedia(
-                    { audio: true } // 只启用音频
-                    , function (stream) {
-                        that.microphone = stream;
-                        that.recorders = new RecordRTC(that.microphone, {
-                            type: 'audio',
-                            recorderType: StereoAudioRecorder,
-                            numberOfAudioChannels: 1,
-                            bitsPerSecond:256000,
-                            desiredSampRate: 16000
-                        });
-                        that.recorders.startRecording();
-                        that.recordSending = true;
-                        that.inter = setInterval(() => {
-                            if (that.seconds < 60) {
-                                that.seconds++;
-                            } else {
-                                clearInterval(that.inter);
-                            }
-                        }, 1000);
-                    }, function (error) {
-                        switch (error.code || error.name) {
-                        case 'PERMISSION_DENIED':
-                        case 'PermissionDeniedError':
-                            that.$message({
-                                showClose: true,
-                                message: '用户拒绝提供信息',
-                                type: 'error'
-                            });
-                            break;
-                        case 'NOT_SUPPORTED_ERROR':
-                        case 'NotSupportedError':
-                            that.$message({
-                                showClose: true,
-                                message: '浏览器不支持硬件设备',
-                                type: 'error'
-                            });
-                            break;
-                        case 'MANDATORY_UNSATISFIED_ERROR':
-                        case 'MandatoryUnsatisfiedError':
-                            that.$message({
-                                showClose: true,
-                                message: '无法发现指定的硬件设备',
-                                type: 'error'
-                            });
-                            break;
-                        default:
-                            that.$message({
-                                showClose: true,
-                                message: '无法打开麦克风',
-                                type: 'error'
-                            });
-                            break;
-                        }
-                    }
-                );
-            }
-        },
-        // 停止录制
-        stopRecording() {
-            const that = this;
-            this.recorders.stopRecording(function(blobURL) {
-                clearInterval(that.inter);
-                that.seconds = 0;
-                const blob = that.recorders.getBlob();
-                const fd = new FormData();
-                fd.append('file', blob);
-                if (that.drawWay) {
-                    chatWithAudioNew(fd, that.group)
-                        .then((data) => {
-                        })
-                        .catch(error => {
-                            console.log(error);
-                        });
-                } else {
-                    chatWithAudio(fd, that.group)
-                        .then((data) => {
-                        })
-                        .catch(error => {
-                            console.log(error);
-                        });
-                }
-
-                if (that.microphone) {
-                    that.microphone.stop();
-                    that.microphone = null;
-                    that.recordSending = false;
-                    that.recorders = null;
-                }
-            });
-        },
-        cancleRecording() {
-            if (this.microphone) {
-                clearInterval(this.inter);
-                this.seconds = 0;
-                this.microphone.stop();
-                this.microphone = null;
-                this.recordSending = false;
-                this.recorders = null;
-            }
-        },
-        playAudio(nor) {
-            this.$refs.audio.src = this.baseUrl + nor.src;
-            this.$refs.audio.play();
-        }
-    }
-};
-</script>
-
-<style scoped lang="scss">
-    ul,
-    li {
-        list-style: none;
-        padding: 0;
-        margin: 0;
-    }
-
-    ::-webkit-scrollbar {
-        width: 0px;
-    }
-
-    ::-webkit-scrollbar-thumb {
-        background-color: #c7c7c7;
-    }
-
-    .chat {
-        border: 1px solid #ccc;
-        height: 100%;
-        background-color: #fff;
-        display: flex;
-        flex-direction: column;
-        justify-content: space-between;
-
-		&__head {
-			display: flex;
-			align-items: center;
-			background: #f0f0f0;
-			border-bottom: 1px solid #ccc;
-
-			&--title {
-				font-size: 16px;
-				font-weight: bold;
-                padding:10px 0px 10px 10px;
-			}
-		}
-
-        &__container {
-            -webkit-box-flex: 1;
-            overflow-y: scroll;
-            padding-right: 8px;
-            padding-left: 2px;
-            position: relative;
-			&--list {
-				list-style: none;
-				margin: 0;
-				padding: 10px 0;
-
-				li {
-					width: 100%;
-					overflow: hidden;
-					padding-top: 8px;
-                }
-
-                .yuyin {
-                    width: 20px;
-                    height: 20px;
-                    cursor: pointer;
-                    margin-top: 21px;
-                    margin-right: 3px;
-                    float: right;
-                    border: 1px solid #ccc;
-                    border-radius: 50%;
-                }
-
-                .yuyin1 {
-                    width: 20px;
-                    height: 20px;
-                    cursor: pointer;
-                    margin-top: 21px;
-                    margin-left: 3px;
-                    float: left;
-                    border: 1px solid #ccc;
-                    border-radius: 50%;
-                }
-
-				.news {
-					max-width: 55%;
-					width: auto;
-					height: auto;
-					background: #2683f5;
-					padding: 6px 10px;
-					margin-top: 15px;
-					line-height: 20px;
-					font-size: 14px;
-					border-radius: 4px;
-					position: relative;
-					float: right;
-					color: #fff;
-					text-align: left;
-				}
-
-				.answers {
-					max-width: 55%;
-					width: auto;
-					height: auto;
-					background: #eee;
-					padding: 5px 10px;
-					margin-top: 15px;
-					line-height: 22px;
-					font-size: 14px;
-					border-radius: 5px;
-					margin-left: 10px;
-					position: relative;
-					float: left;
-					text-align: left;
-                }
-
-                .roomTip{
-                    font-size: 12px;
-                    text-align: center;
-                }
-			}
-        }
-
-        #record_progress_bar{
-            height: 100%;
-            position: absolute;
-            background: #bbe5f5;
-        }
-
-        .chat_record_tip{
-            height: 28px;
-            display: inline-block;
-            background: #dfe6ee;
-            width: 100%;
-            font-size: 13px;
-            border-top: 1px #d8dce5 solid;
-            position: absolute;
-            bottom: 0;
-            right: 0;
-        }
-        .record_icon{
-            display: inline-block;
-            width: 8px;
-            height: 8px;
-            background: #25d825;
-            border-radius: 10px;
-            left: 7px;
-            margin-right: 0px;
-            box-shadow: -1px 0px 3px #6d6d6d;
-            border: 1px #28d228 solid;
-            position: absolute;
-            top: 10px;
-        }
-        .record_tip_text{
-            display: inline-block;
-            font-size: 12px;
-            margin-left: 3px;
-            // padding: 8px 0px 6px 0px;
-            position: absolute;
-            top: 8px;
-            left:20px
-        }
-        .record_tip_confirm{
-            position: absolute;
-            right: 63px;
-            padding: 3px 0px 2px 0px;
-            border: 1px #a2a5aa solid;
-            border-radius: 5px;
-            width: 45px;
-            text-align: center;
-            font-size: 12px;
-            top: 4px;
-            background: #eeeeee;
-            cursor: pointer;
-        }
-        .record_tip_cancle{
-            position: absolute;
-            right: 10px;
-            padding: 3px 0px 2px 0px;
-            border: 1px #a2a5aa solid;
-            border-radius: 5px;
-            width: 45px;
-            text-align: center;
-            font-size: 12px;
-            top: 4px;
-            background: #eeeeee;
-            cursor: pointer;
-        }
-
-        &__footer {
-            width: 100%;
-            height: 113px;
-            position: relative;
-
-            .chat_tool{
-                border-top: 1px solid #d8dce5;
-                width: 100%;
-                padding: 5px;
-            }
-            .microphoneBtn{
-                font-size: 18px;
-                padding: 2px;
-                width: 24px;
-                text-align: center;
-                &:hover{
-                    color:#0188fb;
-                    cursor: pointer;
-                }
-            }
-
-			&--text {
-				width: 99%;
-				height: 75px;
-				border: none;
-				outline: none;
-				resize: none;
-				font-size: 16px;
-                padding-left: 10px;
-                padding-top: 0px;
-			}
-
-            &--send {
-                width: 70px;
-                height: 25px;
-                background: #0188fb;
-                border: 0;
-                position: absolute;
-                bottom: 10px;
-                right: 10px;
-                color: #fff;
-                cursor: pointer;
-                font-size: 12px;
-                line-height: 25px;
-                text-align: center;
-                &:disabled{
-                    background: #6dbcff;
-                    cursor: no-drop;
-                }
-            }
-        }
-    }
-</style>
diff --git a/src/views/trainRoom/e-device.vue b/src/views/trainRoom/e-device.vue
deleted file mode 100644
index b296c1943..000000000
--- a/src/views/trainRoom/e-device.vue
+++ /dev/null
@@ -1,152 +0,0 @@
-<template>
-  <div class="device">
-    <div class="device__head">
-      <div class="device__head--title">
-        {{ $t(titleI18n) }}<span>-{{ hasPlc? $t('trainRoom.plcGatewayOnline') : $t('trainRoom.plcGatewayOffline') }}</span>
-      </div>
-      <div class="device__head--add">
-        <el-button v-if="userId == room.creatorId" icon="el-icon-plus" circle plain @click="handleAddDevice()" />
-      </div>
-    </div>
-    <div class="device__container">
-      <ul class="device__container--list">
-        <li v-for="(node, index) in options" :key="index">
-          <span>{{ realDeviceType[node.deviceType] }}</span>
-          <i v-if="userId == room.creatorId" class="el-icon-close delete" @click="handleDelDevice(node, index)" />
-          <div style="float: right; margin-right: 15px;">
-            <el-select
-              v-model="node.deviceCode"
-              :placeholder="$t('global.choose')"
-              size="mini"
-              :disabled="userId != room.creatorId"
-              @change="handleUpdDevice(node, index)"
-            >
-              <el-option
-                v-for="item in deviceList"
-                :key="item.code"
-                :label="item.name"
-                :value="item.code"
-                :disabled="item.disabled"
-                style="margin-left: 10px"
-              />
-            </el-select>
-          </div>
-        </li>
-      </ul>
-    </div>
-  </div>
-</template>
-
-<script>
-import { RealDeviceType } from '@/scripts/ConstDic';
-
-export default {
-    props: {
-        titleI18n: {
-            type: String,
-            required: true
-        },
-        room: {
-            type:Object,
-            required: true
-        },
-        options: {
-            type: Array,
-            required: true
-        },
-        deviceType: {
-            type: String,
-            default: ''
-        },
-        deviceList: {
-            type: Array,
-            default() {
-                return [];
-            }
-        },
-        hasPlc: {
-            type: Boolean,
-            default: false
-        }
-    },
-    data() {
-        return {
-            realDeviceType: RealDeviceType
-        };
-    },
-    computed: {
-        userId() {
-            return this.$store.state.user ? this.$store.state.user.id : '';
-        }
-    },
-    methods: {
-        handleAddDevice() {
-            this.$emit('addDevice', { deviceType: this.deviceType });
-        },
-        handleUpdDevice(node, index) {
-            this.$emit('changeDevice', { deviceType: this.deviceType, device: node, deviceList: this.deviceList });
-        },
-        handleDelDevice(node, index) {
-            this.$emit('delDevice', { deviceType: this.deviceType, device: node, deviceList: this.deviceList });
-        }
-    }
-};
-</script>
-
-<style scoped lang="scss">
-    ul,
-    li {
-        list-style: none;
-        padding: 0;
-        margin: 0;
-    }
-
-	.device {
-		border: 1px solid #ccc;
-		height: 200px;
-		display: flex;
-		flex-direction: column;
-		justify-content: space-between;
-		position: relative;
-
-		&__head {
-			border-bottom: 1px solid #ccc;
-			background: #f0f0f0;
-			display: flex;
-			justify-content: space-between;
-			align-items: center;
-			padding: 3px;
-			&--title {
-				font-size: 14px;
-				font-weight: bold;
-        margin-left:10px;
-			}
-
-			&--add {
-        margin-right:2px;
-				/deep/ .el-button.is-circle {
-					padding: 5px;
-				}
-			}
-		}
-
-		&__container {
-			flex-grow: 1;
-			&--list {
-				li {
-					height: 30px;
-					line-height: 30px;
-					padding-left: 10px;
-					display: flow-root;
-				}
-
-				.delete {
-					float: right;
-					margin-right: 10px;
-					margin-top: 7px;
-					cursor: pointer;
-				}
-			}
-		}
-	}
-</style>
diff --git a/src/views/trainRoom/e-members.vue b/src/views/trainRoom/e-members.vue
deleted file mode 100644
index 9bcc9dd0a..000000000
--- a/src/views/trainRoom/e-members.vue
+++ /dev/null
@@ -1,134 +0,0 @@
-<template>
-  <div class="member">
-    <div class="member__head">
-      <div class="member__head--title"> 成员列表</div>
-      <div class="member__head--notes"> {{ members.length }}/{{ room.totalNum }}</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: treeHeight+'px'}">
-        <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.inRoom" style="color: green;">{{ data.nickName }}</span>
-            <span v-else style="color: #ccc;">{{ data.nickName }}</span>
-          </span>
-        </el-tree>
-      </el-scrollbar>
-    </div>
-    <content-menu ref="menu" :click-user-id="clickUserId" />
-  </div>
-</template>
-
-<script>
-import { DeviceMenu } from '@/scripts/ConstDic';
-import ContentMenu from './content-menu';
-
-export default {
-    components: {
-        ContentMenu
-    },
-    props: {
-        room: {
-            type: Object,
-            required: true
-        },
-        members: {
-            type: Array,
-            required: true
-        },
-        height: {
-            type: Number,
-            required: true
-        }
-    },
-    data() {
-        return {
-            filterText: '',
-            clickUserId: ''
-        };
-    },
-    computed: {
-        defaultProps() {
-            return { label: 'nickName' };
-        },
-        treeHeight() {
-            return this.height - 64;
-        },
-        filterMembers() {
-            return this.members.filter(e =>{ return e.nickName.includes(this.filterText); });
-        },
-        userId() {
-            return this.$store.state.user ? this.$store.state.user.id : '';
-        }
-    },
-    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.userId == this.room.creatorId) {
-                this.clickUserId = `${obj.id || ''}`;
-                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;
-			&--list {
-				background: #fff;
-				height: auto;
-				min-height: calc(100% - 40px);
-				max-height: calc(100% - 40px);
-                border-bottom: 1px #ccc solid;
-
-				&::-webkit-scrollbar {
-					display: none;
-				}
-			}
-		}
-	}
-</style>
diff --git a/src/views/trainRoom/e-role.vue b/src/views/trainRoom/e-role.vue
deleted file mode 100644
index eb3045431..000000000
--- a/src/views/trainRoom/e-role.vue
+++ /dev/null
@@ -1,179 +0,0 @@
-<template>
-  <div class="role">
-    <div class="role__head">
-      <div class="role__head--title">
-        {{ $t(titleI18n) }}
-      </div>
-      <div class="role__head--add">
-        <el-button v-if="userId == room.creatorId && !projectDevice" :disabled="addRoleDis" icon="el-icon-plus" circle plain @click="handleAddUser()" />
-      </div>
-    </div>
-    <div class="role__container">
-      <ul class="role__container--list">
-        <li v-for="(node, index) in options" :key="index">
-          <span>{{ node.nickName }}</span>
-          <i v-if="userId == room.creatorId" class="el-icon-close delete" @click="handleDelUser(node, index)" />
-          <div v-if="hasDevice" style="float: right; margin-right: 15px;">
-            <el-cascader
-              v-if="roleType == 'IBP'"
-              v-model="node.deviceCode"
-              size="mini"
-              :placeholder="$t('global.choose')"
-              :disabled="isDisable || starting"
-              :options="deviceList"
-              @change="handleUpdUser(node, index)"
-            />
-            <el-select
-              v-if="roleType.toUpperCase() == 'ATTENDANT' || roleType.toUpperCase() === 'STATION_SUPERVISOR'"
-              v-model="node.deviceCode"
-              :placeholder="$t('global.choose')"
-              size="mini"
-              :disabled="isDisable || starting"
-              @change="handleUpdUser(node, index)"
-            >
-              <el-option
-                v-for="(item,deviceIndex) in deviceList"
-                :key="deviceIndex"
-                :label="item.name"
-                :value="item.code"
-                :disabled="item.disabled"
-                style="margin-left: 10px"
-              />
-            </el-select>
-          </div>
-        </li>
-      </ul>
-    </div>
-  </div>
-</template>
-
-<script>
-
-export default {
-    props: {
-        titleI18n: {
-            type: String,
-            required: true
-        },
-        room: {
-            type:Object,
-            required: true
-        },
-        options: {
-            type: Array,
-            required: true
-        },
-        roleType: {
-            type: String,
-            default: ''
-        },
-        deviceList: {
-            type: Array,
-            default() {
-                return [];
-            }
-        }
-    },
-    data() {
-        return {
-        };
-    },
-    computed: {
-        hasDevice() {
-            return ['ATTENDANT', 'IBP', 'STATION_SUPERVISOR'].includes(this.roleType.toUpperCase());
-        },
-        isDisable() {
-            return this.userId != this.room.creatorId;
-        },
-        userId() {
-            return this.$store.state.user ? this.$store.state.user.id : '';
-        },
-        projectDevice() {
-            return this.$store.state.user.projectDevice;
-        },
-        addRoleDis() {
-            if (this.roleType === 'CI' && this.options.length > 0) {
-                return true;
-            } else {
-                return false;
-            }
-        },
-        starting() {
-            return this.$route.query.drawWay + '' === 'true' && this.room.state == '02';
-        }
-    },
-    methods: {
-        handleAddUser() {
-            this.$emit('addUser', { roleType: this.roleType });
-        },
-        handleUpdUser(node, index) {
-            this.$emit('changeUser', { roleType: this.roleType, user: node, deviceList: this.deviceList });
-        },
-        handleDelUser(node, index) {
-            this.$emit('delUser', { roleType: this.roleType, user: node, deviceList: this.deviceList });
-        }
-    }
-};
-</script>
-
-<style scoped lang="scss">
-    ul,
-    li {
-        list-style: none;
-        padding: 0;
-        margin: 0;
-    }
-	.role {
-		border: 1px solid #ccc;
-		height: 200px;
-		display: flex;
-		flex-direction: column;
-		justify-content: space-between;
-		position: relative;
-
-		&__head {
-			border-bottom: 1px solid #ccc;
-			background: #f0f0f0;
-			display: flex;
-			height: 33px;
-			justify-content: space-between;
-			align-items: center;
-			padding: 3px;
-			&--title {
-				font-size: 14px;
-				font-weight: bold;
-        margin-left:10px;
-			}
-
-			&--add {
-        margin-right:2px;
-				/deep/ .el-button.is-circle {
-					padding: 5px;
-				}
-			}
-		}
-
-		&__container {
-			flex-grow: 1;
-			&--list {
-				li {
-					height: 30px;
-					line-height: 30px;
-					padding-left: 10px;
-					display: flow-root;
-
-					&:hover {
-						background: #D6E0F2;
-					}
-				}
-
-				.delete {
-					float: right;
-					margin-right: 10px;
-					margin-top: 7px;
-					cursor: pointer;
-				}
-			}
-		}
-	}
-</style>
diff --git a/src/views/trainRoom/e-roles.vue b/src/views/trainRoom/e-roles.vue
deleted file mode 100644
index 799ef6a65..000000000
--- a/src/views/trainRoom/e-roles.vue
+++ /dev/null
@@ -1,582 +0,0 @@
-<template>
-  <div class="roles">
-    <div class="roles__head">
-      <div class="roles__head--title">
-        <div class="label">人员分配</div>
-        <div class="notes">{{ room.permissionRest }} / {{ room.permissionNum - 1 }}</div>
-      </div>
-      <div class="roles__head--reset">
-        <!--<el-button size="mini" round>重置</el-button>-->
-      </div>
-    </div>
-    <div class="roles__container">
-      <el-scrollbar wrap-class="scrollbar-wrapper" :style="{height: rolesHeight+'px', width: '100%'}">
-        <div class="roles">
-          <e-role
-            class="role"
-            title-i18n="trainRoom.dispatcher"
-            role-type="Dispatcher"
-            :room="room"
-            :options="dispatcherList"
-            @addUser="handleAddUser"
-            @changeUser="handleUpdUser"
-            @delUser="handleDelUser"
-          />
-          <e-role
-            class="role"
-            title-i18n="trainRoom.stationAttendant"
-            role-type="Attendant"
-            :room="room"
-            :options="attendantList"
-            :device-list="stationListForAttendant"
-            @addUser="handleAddUser"
-            @changeUser="handleUpdUser"
-            @delUser="handleDelUser"
-          />
-          <e-role
-            v-if="drawWay != 'true'"
-            class="role"
-            title-i18n="trainRoom.teacher"
-            role-type="Instructor"
-            :room="room"
-            :options="instructorList"
-            @addUser="handleAddUser"
-            @changeUser="handleUpdUser"
-            @delUser="handleDelUser"
-          />
-          <e-role
-            class="role"
-            title-i18n="trainRoom.universalAccount"
-            role-type="Repair"
-            :room="room"
-            :options="repairList"
-            @addUser="handleAddUser"
-            @changeUser="handleUpdUser"
-            @delUser="handleDelUser"
-          />
-          <e-role
-            class="role"
-            title-i18n="trainRoom.driver"
-            role-type="Driver"
-            :room="room"
-            :options="driverList"
-            @addUser="handleAddUser"
-            @changeUser="handleUpdUser"
-            @delUser="handleDelUser"
-          />
-          <e-role
-            v-if="drawWay != 'true'"
-            class="role"
-            title-i18n="trainRoom.ibp"
-            role-type="IBP"
-            :room="room"
-            :options="ibpList"
-            :device-list="stationListForIBP"
-            @addUser="handleAddUser"
-            @changeUser="handleUpdUser"
-            @delUser="handleDelUser"
-          />
-          <e-role
-            v-if="isGzbProject"
-            class="role"
-            title-i18n="trainRoom.interlock"
-            role-type="CI"
-            :room="room"
-            :options="ciList"
-            @addUser="handleAddUser"
-            @changeUser="handleUpdUser"
-            @delUser="handleDelUser"
-          />
-          <e-device
-            v-if="isXtyProject"
-            class="role"
-            title-i18n="trainRoom.realDevice"
-            device-type="StationStand"
-            :room="room"
-            :options="standList"
-            :device-list="doorList"
-            :has-plc="hasPlc"
-            @addDevice="handleAddDevice"
-            @changeDevice="handleUpdDevice"
-            @delDevice="handleDelDevice"
-          />
-        </div>
-      </el-scrollbar>
-    </div>
-    <div class="roles__footer">
-      <el-button v-if="userId == room.creatorId" style="margin-left: 10px" type="danger" :disabled="disabled" @click="handleExit">{{ $t('trainRoom.destroyRoom') }}</el-button>
-      <el-button v-if="userId == room.creatorId && !isLocal" style="margin-left: 10px" type="success" :disabled="disabled" @click="handlePostQrcode">{{ $t('trainRoom.generatingQRCode') }}</el-button>
-      <el-button v-if="userId == room.creatorId && isLocal" style="margin-left: 10px" type="success" :disabled="disabled" @click="handleGetGroup">{{ $t('trainRoom.getGroupId') }}</el-button>
-      <template v-if="!starting">
-        <el-button v-if="userId == room.creatorId" style="margin-left: 10px" type="primary" :disabled="disabled" @click="handleStart"> {{ $t('trainRoom.startSimulation') }}</el-button>
-      </template>
-      <template v-else>
-        <el-button type="primary" style="margin-left: 10px" :disabled="disabled" @click="handleJoin"> {{ $t('trainRoom.enterSimulation') }}</el-button>
-        <el-button v-if="userId == room.creatorId" style="margin-left: 10px" type="warning" :disabled="disabled" @click="handleStop"> {{ $t('trainRoom.endSimulation') }}</el-button>
-      </template>
-      <el-button v-if="!projectDevice" type="" :disabled="disabled" @click="handleBack">{{ $t('global.back') }}</el-button>
-    </div>
-    <add-person ref="addPerson" :audience-list="audienceList" @dispatch="handleDispatchUser" />
-    <qr-code ref="qrCode" />
-  </div>
-</template>
-
-<script>
-import eRole from './e-role';
-import eDevice from './e-device';
-import AddPerson from './add-person';
-import QrCode from '@/components/QrCode';
-import { getJoinTrainCode, startJointTraining, deljointTrainRoom, putJointTrainingExit, putJointTrainingSimulation, putUserRoles, setRealDevice, delRealDevice } from '@/api/chat';
-import { getJoinTrainCodeNew, startJointTrainingNew, deljointTrainRoomNew, putUserRolesNew, putJointTrainingExitNew, putJointTrainingSimulationNew, setRealDeviceNew, delRealDeviceNew } from '@/api/jointTraining';
-import { getPlcGateway } from '@/api/simulation';
-import { getSessionStorage } from '@/utils/auth';
-
-export default {
-    components : {
-        eRole,
-        eDevice,
-        AddPerson,
-        QrCode
-    },
-    props: {
-        room: {
-            type: Object,
-            required: true
-        },
-        members: {
-            type: Array,
-            required: true
-        },
-        height: {
-            type: Number,
-            required: true
-        },
-        stationList: {
-            type: Array,
-            default() {
-                return [];
-            }
-        },
-        availableStationList:{
-            type: Array,
-            default() {
-                return [];
-            }
-        },
-        standList: {
-            type: Array,
-            default() {
-                return [];
-            }
-        },
-        doorList: {
-            type: Array,
-            default() {
-                return [];
-            }
-        }
-    },
-    data() {
-        return {
-            disabled: false,
-            hasPlc: false
-        };
-    },
-    computed: {
-        rolesHeight() {
-            return this.height - 100;
-        },
-        projectDevice() {
-            return this.$store.state.user.projectDevice;
-        },
-        isXtyProject() {
-            return getSessionStorage('project').endsWith('xty');
-        },
-        isGzbProject() {
-            return getSessionStorage('project').endsWith('gzb');
-        },
-        isLocal() {
-            return 	process.env.VUE_APP_PRO === 'local';
-        },
-        group() {
-            return this.$route.query.group;
-        },
-        drawWay() {
-            return this.$route.query.drawWay + '';
-        },
-        userId() {
-            return this.$store.state.user ? this.$store.state.user.id : '';
-        },
-        starting() {
-            return this.room.state == '02';
-        },
-        stationListForAttendant() {
-            if (this.drawWay === 'true') {
-                return this.availableStationList;
-            } else {
-                return this.stationList.filter(elem => { return elem.centralized; }).map(item => {
-                    const elem = { code: item.code, name: item.name, disabled: false };
-                    this.attendantList.forEach(nor => {
-                        if (elem.code == nor.deviceCode) {
-                            elem.disabled = true;
-                        }
-                    });
-                    return elem;
-                });
-            }
-
-        },
-        stationListForIBP() {
-            return this.stationList.map(item => {
-                const elem = { value: item.code, label: item.name, children: [{value: 'left', label: this.$t('trainRoom.left')}, {value: 'right', label: this.$t('trainRoom.right')}] };
-                return elem;
-            });
-        },
-        dispatcherList() {
-            return this.members.filter(elem => { return [elem.userRole.toUpperCase()].includes('DISPATCHER'); });
-        },
-        attendantList() {
-            return this.members.filter(elem => { return [elem.userRole.toUpperCase()].includes('ATTENDANT') || [elem.userRole.toUpperCase()].includes('STATION_SUPERVISOR'); });
-        },
-        instructorList() {
-            return this.members.filter(elem => { return [elem.userRole.toUpperCase()].includes('INSTRUCTOR'); });
-        },
-        repairList() {
-            return this.members.filter(elem => { return [elem.userRole.toUpperCase()].includes('REPAIR') || [elem.userRole.toUpperCase()].includes('MAINTAINER'); });
-        },
-        driverList() {
-            return this.members.filter(elem => { return [elem.userRole.toUpperCase()].includes('DRIVER'); });
-        },
-        ibpList() {
-            return this.members.filter(elem => { return [elem.userRole.toUpperCase()].includes('IBP'); });
-        },
-        audienceList() {
-            return this.members.filter(elem => { return [elem.userRole.toUpperCase()].includes('AUDIENCE'); });
-        },
-        ciList() {
-            return this.members.filter(elem => { return [elem.userRole.toUpperCase()].includes('CI'); });
-        }
-    },
-    async mounted() {
-        await this.checkPlcGateway();
-    },
-    methods: {
-        async checkPlcGateway() {
-            try {
-                const resp = await getPlcGateway(this.group);
-                this.hasPlc = !!resp.data;
-            } catch (e) {
-                this.hasPlc = false;
-                this.$messageBox(this.$t('error.inquiryPLCDeviceFailed'));
-            }
-        },
-        async handleAddDevice({deviceType}) {
-            const roomDeviceVo = {id: '', deviceType: 'ScreenDoor', deviceCode: ''};
-            if (this.standList.findIndex(elem => { return elem.deviceType == roomDeviceVo.deviceType; }) > -1) {
-                this.$message.info(this.$t('error.theDeviceTypeAlreadyExists'));
-                return;
-            }
-            if (this.drawWay === 'true') {
-                await setRealDeviceNew(this.group, roomDeviceVo);
-            } else {
-                await setRealDevice(this.group, roomDeviceVo);
-            }
-        },
-        async handleUpdDevice({deviceType, device}) {
-            try {
-                if (this.drawWay === 'true') {
-                    await setRealDeviceNew(this.group, device);
-                } else {
-                    await setRealDevice(this.group, device);
-                }
-            } catch (e) {
-                this.$messageBox(this.$t('error.connectToRealDeviceFailed'));
-            }
-        },
-        async handleDelDevice({deviceType, device}) {
-            try {
-                if (this.drawWay === 'true') {
-                    await delRealDeviceNew(device.id, this.group);
-                } else {
-                    await delRealDevice(device.id, this.group);
-                }
-            } catch (e) {
-                this.$messageBox(this.$t('error.deleteRealDeviceFailed'));
-            }
-        },
-        async handleAddUser({roleType}) {
-            this.$refs.addPerson.doShow(roleType);
-        },
-        async handleDelUser({roleType, user}) {
-            const params = [{
-                id: user.id,
-                nickName: user.nickName,
-                userRole: 'Audience',
-                deviceCode: ''
-            }];
-            if (this.drawWay === 'true') {
-                params[0].userRole = 'AUDIENCE';
-                try {
-                    await putUserRolesNew(params, this.group);
-                } catch (error) {
-                    this.$message(error.message);
-                }
-            } else {
-                await putUserRoles(params, this.group);
-            }
-        },
-        async handleUpdUser({roleType, user, deviceList}) {
-            let deviceCode = '';
-            if (roleType === 'IBP') {
-                user.ibpPart = user.deviceCode[1];
-                deviceCode = user.deviceCode[0];
-            } else {
-                user.ibpPart = '';
-                deviceCode = user.deviceCode;
-            }
-
-            const params = [{
-                id: user.id,
-                nickName: user.nickName,
-                userRole: roleType,
-                deviceCode: deviceCode,
-                ibpPart: user.ibpPart
-            }];
-            if (this.drawWay === 'true') {
-                params[0].userRole = roleType.toUpperCase();
-                if (roleType === 'Attendant') {
-                    params[0].userRole = 'STATION_SUPERVISOR';
-                } else if (roleType === 'Repair') {
-                    params[0].userRole = 'MAINTAINER';
-                }
-                try {
-                    await putUserRolesNew(params, this.group);
-                } catch (error) {
-                    this.$message(error.message);
-                }
-
-            } else {
-                await putUserRoles(params, this.group);
-            }
-
-            this.stationList.forEach(item => {
-                item.disabled = false;
-                deviceList.forEach(nor => {
-                    if (item.code === nor.deviceCode) {
-                        item.disabled = true;
-                    }
-                });
-            });
-        },
-        async handleDispatchUser({roleType, userList}) {
-            if (userList.length) {
-                try {
-                    let list = [];
-                    if (this.drawWay === 'true') {
-                        if (roleType === 'Attendant') {
-                            list = userList.map(elem => { return { id: elem.id, nickName: elem.nickName, userRole: 'STATION_SUPERVISOR' }; });
-                        } else if (roleType === 'Repair') {
-                            list = userList.map(elem => { return { id: elem.id, nickName: elem.nickName, userRole: 'MAINTAINER'}; });
-                        } else {
-                            list = userList.map(elem => { return { id: elem.id, nickName: elem.nickName, userRole: roleType.toUpperCase() }; });
-                        }
-                        try {
-                            await putUserRolesNew(list, this.group);
-                        } catch (error) {
-                            this.$message(error.message);
-                        }
-
-                    } else {
-                        list = userList.map(elem => { return { id: elem.id, nickName: elem.nickName, userRole: roleType }; });
-                        await putUserRoles(list, this.group);
-                    }
-                    list.forEach(item => {
-                        this.treeData.forEach(nor => {
-                            if (item.id == nor.id) {
-                                nor.userRole = item.userRole;
-                            }
-                        });
-                    });
-                } catch (error) {
-                    if (error.code == 500009) {
-                        this.messageInfo({error:'error', message: this.$t('error.exceededTheTotalNumberOfAssignableRoles')} );
-                    }
-                }
-            }
-        },
-        async handlePostQrcode() {
-            this.disabled = true;
-            let res = '';
-            if (this.drawWay === 'true') {
-                res = await getJoinTrainCodeNew({}, this.group);
-            } else {
-                res = await getJoinTrainCode({}, this.group);
-            }
-            if (res.code == '200') {
-                const param = {
-                    url: res.data,
-                    title: this.$t('trainRoom.distributeTheRoomQRCode'),
-                    group: this.group
-                };
-                if (this.$refs) {
-                    this.$refs.qrCode.doShow(param);
-                }
-            }
-            this.disabled = false;
-        },
-        async handleJoin() {
-            try {
-                this.disabled = true;
-                this.$emit('joinTraining');
-            } catch (e) {
-                console.error(e);
-            }
-        },
-        async handleStart() {
-            this.disabled = true;
-            if (this.attendantList.findIndex(item => { return !item.deviceCode; }) < 0) {
-                try {
-                    if (this.drawWay === 'true') {
-                        await startJointTrainingNew(this.group);
-                    } else {
-                        await startJointTraining(this.group);
-                    }
-                } catch (error) {
-                    this.$emit('message', {type:'error', message: this.$t('error.startedComprehensiveDrillFailure')});
-                    this.disabled = false;
-                }
-            } else {
-                this.$emit('message', {type:'error', message: this.$t('error.stationAttendantStationCannotBeEmpty')});
-                this.disabled = false;
-            }
-        },
-        async handleStop() {
-            try {
-                this.disabled = true;
-                let res = '';
-                if (this.drawWay === 'true') {
-                    res = await putJointTrainingSimulationNew(this.group);
-                } else {
-                    res = await putJointTrainingSimulation(this.group);
-                }
-                this.mapId = res.data.mapId;
-            } catch (e) {
-                console.error(e);
-            } finally {
-                this.disabled = false;
-            }
-        },
-        async handleExit() {
-            this.disabled = true;
-            this.$confirm( this.$t('tip.destroyRoomHint'), this.$t('tip.hint'), {
-                confirmButtonText: this.$t('global.confirm'),
-                cancelButtonText: this.$t('global.cancel'),
-                type: 'warning'
-            }).then(async () => {
-                try {
-                    if (this.drawWay === 'true') {
-                        await deljointTrainRoomNew(this.group);
-                    } else {
-                        await deljointTrainRoom(this.group);
-                    }
-                } catch (error) {
-                    this.$emit('message', {type:'error', message: this.$t('error.destroyedRoomFailed')});
-                } finally {
-                    this.disabled = false;
-                }
-            }).catch(() => {
-                this.disabled = false;
-            });
-        },
-        handleGetGroup() {
-            this.$messageBox(this.group, this.$t('trainRoom.groupId'), 'success');
-        },
-        async handleBack() {
-            try {
-                this.disabled = true;
-                if (this.drawWay === 'true') {
-                    await putJointTrainingExitNew(this.group);
-                } else {
-                    await putJointTrainingExit(this.group);
-                }
-                this.$emit('clearSubscribe');
-                this.$router.go(-1);
-            } catch (error) {
-                this.disabled = false;
-                this.$emit('message', {type:'error', message: this.$t('error.operationFailure')});
-            }
-        }
-    }
-};
-</script>
-
-<style scoped lang="scss">
-	.roles {
-		display: flex;
-		flex-direction: column;
-		background: #fff;
-
-		&__head {
-			display: flex;
-			justify-content: space-between;
-			align-items: center;
-			padding: 0 30px;
-			border-top: 1px solid #ccc;
-			box-shadow: 0 3px 3px #ccc;
-			background: #F0F0F0;
-
-			&--title {
-				display: flex;
-				align-items: flex-end;
-                padding: 10px 0px;
-
-				.label {
-					font-size: 16px;
-					font-weight: bold;
-					border-left: 5px solid #CF2727;
-					padding: 0 5px
-				}
-
-				.notes {
-					font-size: 12px;
-					padding: 0 5px
-				}
-			}
-
-			&--reset {
-				.el-button {
-					background: #CF2727;
-					color: #fff;
-				}
-			}
-		}
-
-		&__container {
-			display: flex;
-			flex-grow: 1;
-			padding: 5px 10px;
-			.roles {
-				display: flex;
-				justify-content: flex-start;
-				flex-flow: row wrap;
-				flex-grow: 1;
-
-				.role {
-					display: flex;
-					flex-basis: 340px;
-					margin-top: 20px;
-                    margin-left: 40px;
-				}
-			}
-		}
-
-		&__footer {
-			height: 60px;
-			display: flex;
-			padding: 0 30px;
-			align-items: center;
-			border-top: 1px solid #ccc;
-			border-bottom: 1px solid #ccc;
-		}
-	}
-</style>
diff --git a/src/views/trainRoom/index.vue b/src/views/trainRoom/index.vue
deleted file mode 100644
index fcd86a7b2..000000000
--- a/src/views/trainRoom/index.vue
+++ /dev/null
@@ -1,435 +0,0 @@
-<template>
-  <div class="room">
-    <div class="room__head">
-      <div class="room__head--title">
-        {{ $t('trainRoom.comprehensiveDrillRoom') }}
-      </div>
-      <div class="room__head--notes">
-        {{ $t('trainRoom.comprehensiveTrainingManager') + room.creator.nickName }}
-      </div>
-      <div v-if="projectDevice" class="room__head--info">
-        <el-dropdown class="avatar-container" trigger="hover" :show-timeout="100" style="height:20px; cursor: pointer;">
-          <div class="avatar-wrapper">
-            <span style="color: white;font-size: 16px;">
-              {{ 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>
-              <span style="display:block;" @click="logout">{{ $t('global.exit') }}</span>
-            </el-dropdown-item>
-          </el-dropdown-menu>
-          <user-info ref="userInfo" />
-        </el-dropdown>
-      </div>
-    </div>
-    <div class="room__container">
-      <e-members
-        class="room__container--members"
-        :room="room"
-        :members="members"
-        :height="height"
-        @message="messageInfo"
-      />
-      <e-roles
-        class="room__container--roles"
-        :room="room"
-        :members="members"
-        :height="height"
-        :station-list="stationList"
-        :available-station-list="availableStationList"
-        :stand-list="standList"
-        :door-list="doorList"
-        @message="messageInfo"
-        @joinTraining="jumpInSimulation"
-        @clearSubscribe="clearSubscribe"
-      />
-      <e-chat
-        class="room__container--chat"
-        :room="room"
-        :members="members"
-        :height="height"
-        @message="messageInfo"
-      />
-    </div>
-    <div class="room__footer" />
-    <user-info ref="userInfo" />
-  </div>
-</template>
-
-<script>
-import { getToken } from '@/utils/auth';
-import { creatSubscribe, clearSubscribe, roomTopic} from '@/utils/stomp';
-import eMembers from './e-members';
-import eChat from './e-chat';
-import eRoles from './e-roles';
-import { postRoomDetail, getJointTrainRoomUserList, getRealDevices, putJointTrainingSimulationEntrance, getjointTraining } from '@/api/chat';
-import { postRoomDetailNew, getJointTrainRoomUserListNew, putJointTrainingSimulationEntranceNew, getjointTrainingNew, getRealDevicesNew, getAvailableStaionList} from '@/api/jointTraining';
-import { getPublishMapInfo, hasDoorStationList } from '@/api/jmap/map';
-import { launchFullscreen } from '@/utils/screen';
-import { getStationList } from '@/api/runplan';
-import { checkLoginLine } from '@/api/login';
-import userInfo from '@/layout/components/userInfo';
-
-export default {
-    components: {
-        eMembers,
-        eChat,
-        eRoles,
-        userInfo
-    },
-    data() {
-        return {
-            room: {
-                totalNum: 0,
-                group: '',
-                mapId: '',
-                creatorId: '',
-                creator: {
-                    nickName: ''
-                },
-                permissionRest: 0,
-                permissionNum: 0,
-                state: ''
-            },
-            userMap: [],
-            members: [],
-            stationList: [],
-            availableStationList:[],
-            standList: [],
-            doorList: [],
-            timer: null
-        };
-    },
-    computed: {
-        height() {
-            return this.$store.state.app.height - 100;
-        },
-        group() {
-            return this.$route.query.group;
-        },
-        drawWay() {
-            return this.$route.query.drawWay + '';
-        },
-        userId() {
-            return this.$store.state.user ? this.$store.state.user.id : '';
-        },
-        username() {
-            return this.$store.state.user.nickname;
-        },
-        projectDevice() {
-            return this.$store.state.user.projectDevice;
-        }
-    },
-    watch: {
-        members: {
-            deep: true,
-            handler() {
-                this.room.permissionRest = this.members.filter(elem => ['AUDIENCE'].includes(elem.userRole.toUpperCase())).length;
-            }
-        },
-        // 用户信息
-        '$store.state.socket.roleList': async function (val) {
-            if (val.length) {
-                await this.dispatchUsers(val);
-            }
-        },
-        // 房间消息
-        '$store.state.socket.jointRoomInfo': async function (val) {
-            if (val.creatorId) {
-                await this.dispatchRoomInfo(val);
-            }
-        },
-        // 设备信息
-        '$store.state.socket.realDeviceInfo': async function (val) {
-            await this.getStandList();
-        },
-        // 路由切换
-        '$route': async function() {
-            await this.loadInit();
-        }
-    },
-    async created() {
-        await this.loadInit();
-    },
-    methods: {
-        async loadInit() {
-            await this.subscribe();
-            if (!this.$store.state.socket.setInRoom && this.drawWay !== 'true') {
-                await getjointTraining(this.group);
-            } else if (!this.$store.state.socket.setInRoom && this.drawWay === 'true') {
-                await getjointTrainingNew(this.group);
-            }
-            await this.getRoomInfo();
-            await this.getUserList();
-            await this.getStandList();
-            await this.getStaionList(this.room.mapId);
-            if (this.drawWay === 'true') {
-                await this.getAvailableStaionList(this.room.mapId);
-            }
-            await this.getDoorList(this.room.mapId, this.stationList);
-            if (this.timer) { clearInterval(this.timer); }
-            this.timer = setInterval(() => {
-                checkLoginLine();
-            }, 5000 * 60);
-        },
-        async getRoomInfo() {
-            let resp = '';
-            if (this.drawWay === 'true') {
-                resp = await postRoomDetailNew(this.group);
-            } else {
-                resp = await postRoomDetail(this.group);
-            }
-            this.room = {
-                permissionRest: 0,
-                totalNum: Number(resp.data.permissionNum) + Number(resp.data.audiencePermissionNum),
-                ...resp.data || {}
-            };
-        },
-        async getStandList() {
-            let resp = '';
-            if (this.drawWay === 'true') {
-                resp = await getRealDevicesNew(this.group);
-            } else {
-                resp = await getRealDevices(this.group);
-            }
-            this.standList = resp.data || [];
-        },
-        async getStaionList(mapId) {
-            const resp = await getStationList(mapId);
-            this.stationList = resp.data || [];
-        },
-        async getAvailableStaionList(mapId) {
-            const resp = await getAvailableStaionList(mapId);
-            this.availableStationList = resp.data || [];
-        },
-        async getDoorList(mapId, stationList) {
-            const doorList = [];
-            hasDoorStationList(mapId).then(res =>{
-                stationList.forEach(item => {
-                    res.data.forEach(it =>{
-                        if (item.code === it.stationCode) {
-                            const direction = parseInt(it.doorLocationType) % 2 === 0 ? this.$t('trainRoom.uplinkPlatform') : this.$t('trainRoom.downlinkPlatform');
-                            doorList.push({code: it.code, name: item.name + direction});
-                        }
-                    });
-                });
-                this.doorList = doorList;
-            }).catch(() => {
-                this.$messageBox(this.$t('error.getScreenDoorsListFailed'));
-            });
-        },
-        async getUserList() {
-            let res = '';
-            if (this.drawWay === 'true') {
-                res = await getJointTrainRoomUserListNew(this.group);
-            } else {
-                res = await getJointTrainRoomUserList(this.group);
-            }
-            this.members = (res.data || []).map(elem => { return this.transformUser(elem); });
-        },
-        async dispatchUsers(users) {
-            users.forEach(user => {
-                const index = this.members.findIndex(elem => { return user.id == elem.id; });
-                if (user.userRole) {
-                    if (index >= 0) {
-                        this.checkUserState(user, this.members[index]);
-                        this.members.splice(index, 1, this.transformUser(user));
-                    } else {
-                        this.checkUserState(user, null);
-                        this.members.push(this.transformUser(user));
-                    }
-                } else {
-                    if (this.members[index]) {
-                        this.checkUserState(user, this.members[index]);
-                        this.members.splice(index, 1);
-                    }
-                }
-            });
-        },
-        async dispatchRoomInfo(room) {
-            Object.assign(this.room, room);
-            switch (room.state) {
-            case '03': // 房间销毁
-            { this.clearSubscribe();
-                this.$router.go(-1);
-                break; }
-            case '02': // 开始仿真
-            {
-                // this.clearSubscribe();
-                await this.jumpInSimulation();
-                break; }
-            }
-
-            // 清空房间信息
-            this.$store.dispatch('socket/setJointRoomInfo');
-        },
-        async checkUserState(user, old) {
-            const message = {
-                join: true,
-                id: user.id,
-                userName: user.nickName,
-                userRole: user.userRole,
-                name: user.name,
-                roomTip: '',
-                chatInfo: true,
-                inSimulation: user.inSimulation,
-                inRoom: user.inRoom,
-                session: 'session',
-                oneself: user.id === this.$store.state.user.id
-            };
-            if (old) {
-                if (!user.userRole) {
-                    this.$store.dispatch('socket/setChatContent', {...message, roomTip: `${user.nickName}被提出房间`});
-                    if (this.userId == user.id) {
-                        await this.jumpOutRoom();
-                    }
-                } else if (old.userRole) {
-                    if (old.inRoom && !user.inRoom) {
-                        this.$store.dispatch('socket/setChatContent', {...message, roomTip: `${user.nickName}离线`});
-                        if (this.userId == user.id) {
-                            await this.jumpOutRoom();
-                        }
-                    }
-
-                    if (!old.inRoom && user.inRoom) {
-                        this.$store.dispatch('socket/setChatContent', {...message, roomTip: `${user.nickName}在线`});
-                    }
-
-                    if (!old.inSimulation && user.inSimulation) {
-                        this.$store.dispatch('socket/setChatContent', {...message, roomTip: `${user.nickName}进入仿真`});
-                        if (this.userId == user.id && user.userRole.toUpperCase() !== 'ADMIN') {
-                            await this.jumpInSimulation();
-                        }
-                    }
-                }
-            } else {
-                this.$store.dispatch('socket/setChatContent', {...message, roomTip: `${user.nickName}进入房间`});
-            }
-        },
-        async jumpInSimulation() {
-            const room = this.room;
-            if (this.drawWay === 'true') {
-                await putJointTrainingSimulationEntranceNew(room.group);
-            } else {
-                await putJointTrainingSimulationEntrance(room.group);
-            }
-            const rest = await getPublishMapInfo(room.mapId);
-            const query = { lineCode: rest.data.lineCode, mapId: room.mapId, group: room.group, roomId: room.id };
-            if (this.drawWay === 'true') {
-                query.drawWay = this.drawWay;
-                this.$router.replace({ path: `/jointTrainingNew`, query: query});
-            } else {
-                this.$router.replace({ path: `/jointTraining`, query: query });
-            }
-            // 清空房间信息
-            this.$store.dispatch('socket/setJointRoomInfo');
-            launchFullscreen();
-        },
-        async jumpOutRoom() {
-            this.$router.go(-1);
-            this.messageInfo({error: 'warning', message: this.$t('tip.beKickedOut')});
-        },
-        transformUser(user) {
-            // 根据用户角色专用数据数据
-            switch (user.userRole) {
-            case 'IBP':
-                user.deviceCode = [user.deviceCode || '', user.ibpPart || ''];
-                break;
-            }
-
-            return user;
-        },
-        messageInfo(info) {
-            this.$message({ showClose: true, ...info });
-        },
-        async subscribe() {
-            if (!this.$store.state.socket.roomIsSubscribe) {
-                this.clearSubscribe();
-                const header = { group: this.group || '', 'X-Token': getToken() };
-                creatSubscribe(`${roomTopic}\/${this.group}`, header);
-                await this.$store.dispatch('socket/setRoomSubscribe', true);
-            }
-        },
-        async clearSubscribe() {
-            clearSubscribe(`${roomTopic}\/${this.group}`);
-            await this.$store.dispatch('socket/setRoomSubscribe', false);
-        },
-        logout() {
-            this.$store.dispatch('LogOut').then(() => {
-                location.reload(); // 为了重新实例化vue-router对象 避免bug
-            });
-        },
-        handleDetail() {
-            this.$refs.userInfo.doShow();
-        }
-    }
-};
-</script>
-
-<style scoped lang="scss">
-	.room {
-		width: 100%;
-		height: 100%;
-		display: flex;
-		flex-direction: column;
-		box-sizing: border-box;
-		background: #f0f0f0;
-
-		&__head {
-			display: flex;
-			flex-direction: column;
-			justify-content: center;
-			align-items: center;
-			background: #000;
-			color: #fff;
-			padding: 10px;
-			position: relative;
-
-			&--title {
-				font-size: 22px;
-				font-weight: bold;
-			}
-
-			&--notes {
-				position: absolute;
-				left: 10px;
-				bottom: 5px;
-			}
-			&--info {
-				position: absolute;
-				right: 10px;
-				bottom: 5px;
-			}
-		}
-
-		&__container {
-			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;
-		}
-
-	}
-</style>
diff --git a/static/model/2020-07-02/1-29889.FBX b/static/MODEL/2020-07-02/1-29889.FBX
similarity index 100%
rename from static/model/2020-07-02/1-29889.FBX
rename to static/MODEL/2020-07-02/1-29889.FBX
diff --git a/static/model/2020-07-02/2-24518.FBX b/static/MODEL/2020-07-02/2-24518.FBX
similarity index 100%
rename from static/model/2020-07-02/2-24518.FBX
rename to static/MODEL/2020-07-02/2-24518.FBX
diff --git a/static/model/2020-07-10/16-73439.FBX b/static/MODEL/2020-07-10/16-73439.FBX
similarity index 100%
rename from static/model/2020-07-10/16-73439.FBX
rename to static/MODEL/2020-07-10/16-73439.FBX
diff --git a/static/model/2020-07-10/17-43789.FBX b/static/MODEL/2020-07-10/17-43789.FBX
similarity index 100%
rename from static/model/2020-07-10/17-43789.FBX
rename to static/MODEL/2020-07-10/17-43789.FBX
diff --git a/static/model/2020-07-16/1-9933.FBX b/static/MODEL/2020-07-16/1-9933.FBX
similarity index 100%
rename from static/model/2020-07-16/1-9933.FBX
rename to static/MODEL/2020-07-16/1-9933.FBX
diff --git a/static/model/2020-07-16/23-63435.FBX b/static/MODEL/2020-07-16/23-63435.FBX
similarity index 100%
rename from static/model/2020-07-16/23-63435.FBX
rename to static/MODEL/2020-07-16/23-63435.FBX
diff --git a/static/model/2020-07-16/25-44466.FBX b/static/MODEL/2020-07-16/25-44466.FBX
similarity index 100%
rename from static/model/2020-07-16/25-44466.FBX
rename to static/MODEL/2020-07-16/25-44466.FBX
diff --git a/static/model/2020-07-16/28-97842.FBX b/static/MODEL/2020-07-16/28-97842.FBX
similarity index 100%
rename from static/model/2020-07-16/28-97842.FBX
rename to static/MODEL/2020-07-16/28-97842.FBX
diff --git a/static/model/2020-07-16/3-7001.FBX b/static/MODEL/2020-07-16/3-7001.FBX
similarity index 100%
rename from static/model/2020-07-16/3-7001.FBX
rename to static/MODEL/2020-07-16/3-7001.FBX
diff --git a/static/model/2020-07-17/6-57173.FBX b/static/MODEL/2020-07-17/6-57173.FBX
similarity index 100%
rename from static/model/2020-07-17/6-57173.FBX
rename to static/MODEL/2020-07-17/6-57173.FBX
diff --git a/static/model/2020-07-20/40-13561.FBX b/static/MODEL/2020-07-20/40-13561.FBX
similarity index 100%
rename from static/model/2020-07-20/40-13561.FBX
rename to static/MODEL/2020-07-20/40-13561.FBX
diff --git a/static/model/2020-07-20/41-53542.FBX b/static/MODEL/2020-07-20/41-53542.FBX
similarity index 100%
rename from static/model/2020-07-20/41-53542.FBX
rename to static/MODEL/2020-07-20/41-53542.FBX
diff --git a/static/model/2020-07-20/43-8227.FBX b/static/MODEL/2020-07-20/43-8227.FBX
similarity index 100%
rename from static/model/2020-07-20/43-8227.FBX
rename to static/MODEL/2020-07-20/43-8227.FBX
diff --git a/static/model/auto/autoswitch.FBX b/static/MODEL/auto/autoswitch.FBX
similarity index 100%
rename from static/model/auto/autoswitch.FBX
rename to static/MODEL/auto/autoswitch.FBX
diff --git a/static/model/auto/rail.FBX b/static/MODEL/auto/rail.FBX
similarity index 100%
rename from static/model/auto/rail.FBX
rename to static/MODEL/auto/rail.FBX
diff --git a/static/model/auto/railold.FBX b/static/MODEL/auto/railold.FBX
similarity index 100%
rename from static/model/auto/railold.FBX
rename to static/MODEL/auto/railold.FBX
diff --git a/static/model/auto/suidao.FBX b/static/MODEL/auto/suidao.FBX
similarity index 100%
rename from static/model/auto/suidao.FBX
rename to static/MODEL/auto/suidao.FBX
diff --git a/static/model/auto/switch2.FBX b/static/MODEL/auto/switch2.FBX
similarity index 100%
rename from static/model/auto/switch2.FBX
rename to static/MODEL/auto/switch2.FBX
diff --git a/static/model/daocha/012.jpg b/static/MODEL/daocha/012.jpg
similarity index 100%
rename from static/model/daocha/012.jpg
rename to static/MODEL/daocha/012.jpg
diff --git a/static/model/daocha/013.jpg b/static/MODEL/daocha/013.jpg
similarity index 100%
rename from static/model/daocha/013.jpg
rename to static/MODEL/daocha/013.jpg
diff --git a/static/model/daocha/014.jpg b/static/MODEL/daocha/014.jpg
similarity index 100%
rename from static/model/daocha/014.jpg
rename to static/MODEL/daocha/014.jpg
diff --git a/static/model/daocha/015.jpg b/static/MODEL/daocha/015.jpg
similarity index 100%
rename from static/model/daocha/015.jpg
rename to static/MODEL/daocha/015.jpg
diff --git a/static/model/daocha/016.jpg b/static/MODEL/daocha/016.jpg
similarity index 100%
rename from static/model/daocha/016.jpg
rename to static/MODEL/daocha/016.jpg
diff --git a/static/model/daocha/020.jpg b/static/MODEL/daocha/020.jpg
similarity index 100%
rename from static/model/daocha/020.jpg
rename to static/MODEL/daocha/020.jpg
diff --git a/static/model/daocha/022.jpg b/static/MODEL/daocha/022.jpg
similarity index 100%
rename from static/model/daocha/022.jpg
rename to static/MODEL/daocha/022.jpg
diff --git a/static/model/daocha/024.jpg b/static/MODEL/daocha/024.jpg
similarity index 100%
rename from static/model/daocha/024.jpg
rename to static/MODEL/daocha/024.jpg
diff --git a/static/model/device/room/room.FBX b/static/MODEL/device/room/room.FBX
similarity index 100%
rename from static/model/device/room/room.FBX
rename to static/MODEL/device/room/room.FBX
diff --git a/static/model/device/signal/20200717d3d.FBX b/static/MODEL/device/signal/20200717d3d.FBX
similarity index 100%
rename from static/model/device/signal/20200717d3d.FBX
rename to static/MODEL/device/signal/20200717d3d.FBX
diff --git a/static/model/device/signal/3.jpg b/static/MODEL/device/signal/3.jpg
similarity index 100%
rename from static/model/device/signal/3.jpg
rename to static/MODEL/device/signal/3.jpg
diff --git a/static/model/device/signal/signal.FBX b/static/MODEL/device/signal/signal.FBX
similarity index 100%
rename from static/model/device/signal/signal.FBX
rename to static/MODEL/device/signal/signal.FBX
diff --git a/static/model/device/stationstand/stationstand1.FBX b/static/MODEL/device/stationstand/stationstand1.FBX
similarity index 100%
rename from static/model/device/stationstand/stationstand1.FBX
rename to static/MODEL/device/stationstand/stationstand1.FBX
diff --git a/static/model/device/stationstand/stationstandnormal.FBX b/static/MODEL/device/stationstand/stationstandnormal.FBX
similarity index 100%
rename from static/model/device/stationstand/stationstandnormal.FBX
rename to static/MODEL/device/stationstand/stationstandnormal.FBX
diff --git a/static/model/device/stationstand/zt008.png b/static/MODEL/device/stationstand/zt008.png
similarity index 100%
rename from static/model/device/stationstand/zt008.png
rename to static/MODEL/device/stationstand/zt008.png
diff --git a/static/model/device/switch/013.jpg b/static/MODEL/device/switch/013.jpg
similarity index 100%
rename from static/model/device/switch/013.jpg
rename to static/MODEL/device/switch/013.jpg
diff --git a/static/model/device/switch/014.jpg b/static/MODEL/device/switch/014.jpg
similarity index 100%
rename from static/model/device/switch/014.jpg
rename to static/MODEL/device/switch/014.jpg
diff --git a/static/model/device/switch/017.jpg b/static/MODEL/device/switch/017.jpg
similarity index 100%
rename from static/model/device/switch/017.jpg
rename to static/MODEL/device/switch/017.jpg
diff --git a/static/model/device/switch/020.jpg b/static/MODEL/device/switch/020.jpg
similarity index 100%
rename from static/model/device/switch/020.jpg
rename to static/MODEL/device/switch/020.jpg
diff --git a/static/model/device/switch/021.jpg b/static/MODEL/device/switch/021.jpg
similarity index 100%
rename from static/model/device/switch/021.jpg
rename to static/MODEL/device/switch/021.jpg
diff --git a/static/model/device/switch/ZD6D.FBX b/static/MODEL/device/switch/ZD6D.FBX
similarity index 100%
rename from static/model/device/switch/ZD6D.FBX
rename to static/MODEL/device/switch/ZD6D.FBX
diff --git a/static/model/device/switch/switch.FBX b/static/MODEL/device/switch/switch.FBX
similarity index 100%
rename from static/model/device/switch/switch.FBX
rename to static/MODEL/device/switch/switch.FBX
diff --git a/static/model/device/switch/switch.bak.FBX b/static/MODEL/device/switch/switch.bak.FBX
similarity index 100%
rename from static/model/device/switch/switch.bak.FBX
rename to static/MODEL/device/switch/switch.bak.FBX
diff --git a/static/model/driver/driver.FBX b/static/MODEL/driver/driver.FBX
similarity index 100%
rename from static/model/driver/driver.FBX
rename to static/MODEL/driver/driver.FBX
diff --git a/static/MODEL/jdq/jdq1000.FBX b/static/MODEL/jdq/jdq1000.FBX
deleted file mode 100644
index 5b4d80f5c..000000000
Binary files a/static/MODEL/jdq/jdq1000.FBX and /dev/null differ
diff --git a/static/MODEL/jdq/jdq135.FBX b/static/MODEL/jdq/jdq135.FBX
deleted file mode 100644
index 603e96ba5..000000000
Binary files a/static/MODEL/jdq/jdq135.FBX and /dev/null differ
diff --git a/static/MODEL/jdq/jdq480.FBX b/static/MODEL/jdq/jdq480.FBX
deleted file mode 100644
index d096f7a51..000000000
Binary files a/static/MODEL/jdq/jdq480.FBX and /dev/null differ
diff --git a/static/MODEL/jdq/jdqH125.FBX b/static/MODEL/jdq/jdqH125.FBX
deleted file mode 100644
index 52bfb7812..000000000
Binary files a/static/MODEL/jdq/jdqH125.FBX and /dev/null differ
diff --git a/static/MODEL/jdq/jdqg.FBX b/static/MODEL/jdq/jdqg.FBX
deleted file mode 100644
index 1db4f543d..000000000
Binary files a/static/MODEL/jdq/jdqg.FBX and /dev/null differ
diff --git a/static/MODEL/jdq/jdqh18.FBX b/static/MODEL/jdq/jdqh18.FBX
deleted file mode 100644
index c5bba70a1..000000000
Binary files a/static/MODEL/jdq/jdqh18.FBX and /dev/null differ
diff --git a/static/model/passflow/monitor.FBX b/static/MODEL/passflow/monitor.FBX
similarity index 100%
rename from static/model/passflow/monitor.FBX
rename to static/MODEL/passflow/monitor.FBX
diff --git a/static/model/passflow/section.FBX b/static/MODEL/passflow/section.FBX
similarity index 100%
rename from static/model/passflow/section.FBX
rename to static/MODEL/passflow/section.FBX
diff --git a/static/model/passflow/stationold.FBX b/static/MODEL/passflow/stationold.FBX
similarity index 100%
rename from static/model/passflow/stationold.FBX
rename to static/MODEL/passflow/stationold.FBX
diff --git a/static/model/passflow/zhajiout.FBX b/static/MODEL/passflow/zhajiout.FBX
similarity index 100%
rename from static/model/passflow/zhajiout.FBX
rename to static/MODEL/passflow/zhajiout.FBX
diff --git a/static/model/path/path.obj b/static/MODEL/path/path.obj
similarity index 100%
rename from static/model/path/path.obj
rename to static/MODEL/path/path.obj
diff --git a/static/model/signal/d3d.FBX b/static/MODEL/signal/d3d.FBX
similarity index 100%
rename from static/model/signal/d3d.FBX
rename to static/MODEL/signal/d3d.FBX
diff --git a/static/model/station/station3.FBX b/static/MODEL/station/station3.FBX
similarity index 100%
rename from static/model/station/station3.FBX
rename to static/MODEL/station/station3.FBX
diff --git a/static/model/station/waicestation.FBX b/static/MODEL/station/waicestation.FBX
similarity index 100%
rename from static/model/station/waicestation.FBX
rename to static/MODEL/station/waicestation.FBX
diff --git a/static/model/suidao/0820.png b/static/MODEL/suidao/0820.png
similarity index 100%
rename from static/model/suidao/0820.png
rename to static/MODEL/suidao/0820.png
diff --git a/static/MODEL/suidao/0820xinhaoding.png b/static/MODEL/suidao/0820xinhaoding.png
deleted file mode 100644
index a635cbeaf..000000000
Binary files a/static/MODEL/suidao/0820xinhaoding.png and /dev/null differ
diff --git a/static/model/suidao/background.FBX b/static/MODEL/suidao/background.FBX
similarity index 100%
rename from static/model/suidao/background.FBX
rename to static/MODEL/suidao/background.FBX
diff --git a/static/model/suidao/chuanganqi820.png b/static/MODEL/suidao/chuanganqi820.png
similarity index 100%
rename from static/model/suidao/chuanganqi820.png
rename to static/MODEL/suidao/chuanganqi820.png
diff --git a/static/MODEL/suidao/fengkou.png b/static/MODEL/suidao/fengkou.png
deleted file mode 100644
index e8f162c59..000000000
Binary files a/static/MODEL/suidao/fengkou.png and /dev/null differ
diff --git a/static/MODEL/suidao/guanggaopai820.png b/static/MODEL/suidao/guanggaopai820.png
deleted file mode 100644
index e278c2625..000000000
Binary files a/static/MODEL/suidao/guanggaopai820.png and /dev/null differ
diff --git a/static/MODEL/suidao/hebsuidao.FBX b/static/MODEL/suidao/hebsuidao.FBX
deleted file mode 100644
index 97e9798a7..000000000
Binary files a/static/MODEL/suidao/hebsuidao.FBX and /dev/null differ
diff --git a/static/model/suidao/nbsuidao.FBX b/static/MODEL/suidao/nbsuidao.FBX
similarity index 100%
rename from static/model/suidao/nbsuidao.FBX
rename to static/MODEL/suidao/nbsuidao.FBX
diff --git a/static/MODEL/suidao/suidao.FBX b/static/MODEL/suidao/suidao.FBX
deleted file mode 100644
index 665e67b82..000000000
Binary files a/static/MODEL/suidao/suidao.FBX and /dev/null differ
diff --git a/static/model/suidao/suidaodimian1111.jpg b/static/MODEL/suidao/suidaodimian1111.jpg
similarity index 100%
rename from static/model/suidao/suidaodimian1111.jpg
rename to static/MODEL/suidao/suidaodimian1111.jpg
diff --git a/static/model/suidao/suidaodimian11111.jpg b/static/MODEL/suidao/suidaodimian11111.jpg
similarity index 100%
rename from static/model/suidao/suidaodimian11111.jpg
rename to static/MODEL/suidao/suidaodimian11111.jpg
diff --git a/static/model/suidao/suidaotietu821.png b/static/MODEL/suidao/suidaotietu821.png
similarity index 100%
rename from static/model/suidao/suidaotietu821.png
rename to static/MODEL/suidao/suidaotietu821.png
diff --git a/static/model/suidao/suidaotietu8212.png b/static/MODEL/suidao/suidaotietu8212.png
similarity index 100%
rename from static/model/suidao/suidaotietu8212.png
rename to static/MODEL/suidao/suidaotietu8212.png
diff --git a/static/model/suidao/xiansuidao.FBX b/static/MODEL/suidao/xiansuidao.FBX
similarity index 100%
rename from static/model/suidao/xiansuidao.FBX
rename to static/MODEL/suidao/xiansuidao.FBX
diff --git a/static/model/train/liechehuo.png b/static/MODEL/train/liechehuo.png
similarity index 100%
rename from static/model/train/liechehuo.png
rename to static/MODEL/train/liechehuo.png
diff --git a/static/model/jdq/jdq1700.FBX b/static/model/jdq/jdq1700.FBX
deleted file mode 100644
index 866178ea3..000000000
Binary files a/static/model/jdq/jdq1700.FBX and /dev/null differ
diff --git a/static/texture/heb/Station11094.jpg b/static/texture/heb/Station11094.jpg
deleted file mode 100644
index a153b8959..000000000
Binary files a/static/texture/heb/Station11094.jpg and /dev/null differ
diff --git a/static/texture/heb/Station11136.jpg b/static/texture/heb/Station11136.jpg
deleted file mode 100644
index f9171fbf5..000000000
Binary files a/static/texture/heb/Station11136.jpg and /dev/null differ
diff --git a/static/texture/heb/Station17293.jpg b/static/texture/heb/Station17293.jpg
deleted file mode 100644
index e95024ce1..000000000
Binary files a/static/texture/heb/Station17293.jpg and /dev/null differ
diff --git a/static/texture/heb/Station18398.jpg b/static/texture/heb/Station18398.jpg
deleted file mode 100644
index 01281241e..000000000
Binary files a/static/texture/heb/Station18398.jpg and /dev/null differ
diff --git a/static/texture/heb/Station22163.jpg b/static/texture/heb/Station22163.jpg
deleted file mode 100644
index a2e170622..000000000
Binary files a/static/texture/heb/Station22163.jpg and /dev/null differ
diff --git a/static/texture/heb/Station25464.jpg b/static/texture/heb/Station25464.jpg
deleted file mode 100644
index 912503a6a..000000000
Binary files a/static/texture/heb/Station25464.jpg and /dev/null differ
diff --git a/static/texture/heb/Station28090.jpg b/static/texture/heb/Station28090.jpg
deleted file mode 100644
index b6b517cc5..000000000
Binary files a/static/texture/heb/Station28090.jpg and /dev/null differ
diff --git a/static/texture/heb/Station41999.jpg b/static/texture/heb/Station41999.jpg
deleted file mode 100644
index 98d353b8e..000000000
Binary files a/static/texture/heb/Station41999.jpg and /dev/null differ
diff --git a/static/texture/heb/Station44338.jpg b/static/texture/heb/Station44338.jpg
deleted file mode 100644
index 0d30b550c..000000000
Binary files a/static/texture/heb/Station44338.jpg and /dev/null differ
diff --git a/static/texture/heb/Station46464.jpg b/static/texture/heb/Station46464.jpg
deleted file mode 100644
index 61440d4a1..000000000
Binary files a/static/texture/heb/Station46464.jpg and /dev/null differ
diff --git a/static/texture/heb/Station50565.jpg b/static/texture/heb/Station50565.jpg
deleted file mode 100644
index cff1fc865..000000000
Binary files a/static/texture/heb/Station50565.jpg and /dev/null differ
diff --git a/static/texture/heb/Station5361.jpg b/static/texture/heb/Station5361.jpg
deleted file mode 100644
index 059cae0b3..000000000
Binary files a/static/texture/heb/Station5361.jpg and /dev/null differ
diff --git a/static/texture/heb/Station60068.jpg b/static/texture/heb/Station60068.jpg
deleted file mode 100644
index 74cdbafcc..000000000
Binary files a/static/texture/heb/Station60068.jpg and /dev/null differ
diff --git a/static/texture/heb/Station62429.jpg b/static/texture/heb/Station62429.jpg
deleted file mode 100644
index a2398c7ba..000000000
Binary files a/static/texture/heb/Station62429.jpg and /dev/null differ
diff --git a/static/texture/heb/Station64444.jpg b/static/texture/heb/Station64444.jpg
deleted file mode 100644
index ce7e12f6c..000000000
Binary files a/static/texture/heb/Station64444.jpg and /dev/null differ
diff --git a/static/texture/heb/Station71700.jpg b/static/texture/heb/Station71700.jpg
deleted file mode 100644
index 6771f3e67..000000000
Binary files a/static/texture/heb/Station71700.jpg and /dev/null differ
diff --git a/static/texture/heb/Station72132.jpg b/static/texture/heb/Station72132.jpg
deleted file mode 100644
index fd35c8552..000000000
Binary files a/static/texture/heb/Station72132.jpg and /dev/null differ
diff --git a/static/texture/heb/Station78164.jpg b/static/texture/heb/Station78164.jpg
deleted file mode 100644
index 91f07f8d9..000000000
Binary files a/static/texture/heb/Station78164.jpg and /dev/null differ
diff --git a/static/texture/heb/Station79537.jpg b/static/texture/heb/Station79537.jpg
deleted file mode 100644
index 163a36183..000000000
Binary files a/static/texture/heb/Station79537.jpg and /dev/null differ
diff --git a/static/texture/heb/Station82618.jpg b/static/texture/heb/Station82618.jpg
deleted file mode 100644
index 3e11ddebe..000000000
Binary files a/static/texture/heb/Station82618.jpg and /dev/null differ
diff --git a/static/texture/heb/Station85520.jpg b/static/texture/heb/Station85520.jpg
deleted file mode 100644
index 04e0b0e4b..000000000
Binary files a/static/texture/heb/Station85520.jpg and /dev/null differ
diff --git a/static/texture/heb/Station89483.jpg b/static/texture/heb/Station89483.jpg
deleted file mode 100644
index c67b4c94f..000000000
Binary files a/static/texture/heb/Station89483.jpg and /dev/null differ
diff --git a/static/texture/heb/Station96090.jpg b/static/texture/heb/Station96090.jpg
deleted file mode 100644
index eba8f84a3..000000000
Binary files a/static/texture/heb/Station96090.jpg and /dev/null differ
diff --git a/static/texture/heb/devicelist.jpg b/static/texture/heb/devicelist.jpg
deleted file mode 100644
index f39912fa9..000000000
Binary files a/static/texture/heb/devicelist.jpg and /dev/null differ
diff --git a/static/texture/heb/haerbinlist.jpg b/static/texture/heb/haerbinlist.jpg
deleted file mode 100644
index d6a468721..000000000
Binary files a/static/texture/heb/haerbinlist.jpg and /dev/null differ
diff --git a/static/texture/heb/haerbinlistold.jpg b/static/texture/heb/haerbinlistold.jpg
deleted file mode 100644
index a0f4d965d..000000000
Binary files a/static/texture/heb/haerbinlistold.jpg and /dev/null differ
diff --git a/static/texture/heb/kongbai.jpg b/static/texture/heb/kongbai.jpg
deleted file mode 100644
index 2713c81db..000000000
Binary files a/static/texture/heb/kongbai.jpg and /dev/null differ
diff --git a/static/texture/heb/pingbimen.png b/static/texture/heb/pingbimen.png
deleted file mode 100644
index c059bcba7..000000000
Binary files a/static/texture/heb/pingbimen.png and /dev/null differ
diff --git a/static/texture/nb1/Station11231.jpg b/static/texture/nb1/Station11231.jpg
deleted file mode 100644
index a0d813bd1..000000000
Binary files a/static/texture/nb1/Station11231.jpg and /dev/null differ
diff --git a/static/texture/nb1/Station12421.jpg b/static/texture/nb1/Station12421.jpg
deleted file mode 100644
index 4a1e8358a..000000000
Binary files a/static/texture/nb1/Station12421.jpg and /dev/null differ
diff --git a/static/texture/nb1/Station1533.jpg b/static/texture/nb1/Station1533.jpg
deleted file mode 100644
index 6e7653038..000000000
Binary files a/static/texture/nb1/Station1533.jpg and /dev/null differ
diff --git a/static/texture/nb1/Station16356.jpg b/static/texture/nb1/Station16356.jpg
deleted file mode 100644
index afc0c2d7a..000000000
Binary files a/static/texture/nb1/Station16356.jpg and /dev/null differ
diff --git a/static/texture/nb1/Station18678.jpg b/static/texture/nb1/Station18678.jpg
deleted file mode 100644
index 8c822ec9d..000000000
Binary files a/static/texture/nb1/Station18678.jpg and /dev/null differ
diff --git a/static/texture/nb1/Station19817.jpg b/static/texture/nb1/Station19817.jpg
deleted file mode 100644
index 27dbdac71..000000000
Binary files a/static/texture/nb1/Station19817.jpg and /dev/null differ
diff --git a/static/texture/nb1/Station23567.jpg b/static/texture/nb1/Station23567.jpg
deleted file mode 100644
index 91cb44621..000000000
Binary files a/static/texture/nb1/Station23567.jpg and /dev/null differ
diff --git a/static/texture/nb1/Station24903.jpg b/static/texture/nb1/Station24903.jpg
deleted file mode 100644
index 07b82a170..000000000
Binary files a/static/texture/nb1/Station24903.jpg and /dev/null differ
diff --git a/static/texture/nb1/Station26416.jpg b/static/texture/nb1/Station26416.jpg
deleted file mode 100644
index 6fecb3331..000000000
Binary files a/static/texture/nb1/Station26416.jpg and /dev/null differ
diff --git a/static/texture/nb1/Station27207.jpg b/static/texture/nb1/Station27207.jpg
deleted file mode 100644
index f2ca22796..000000000
Binary files a/static/texture/nb1/Station27207.jpg and /dev/null differ
diff --git a/static/texture/nb1/Station28032.jpg b/static/texture/nb1/Station28032.jpg
deleted file mode 100644
index 3bc6ef91a..000000000
Binary files a/static/texture/nb1/Station28032.jpg and /dev/null differ
diff --git a/static/texture/nb1/Station28958.jpg b/static/texture/nb1/Station28958.jpg
deleted file mode 100644
index dfcd0a6f3..000000000
Binary files a/static/texture/nb1/Station28958.jpg and /dev/null differ
diff --git a/static/texture/nb1/Station30520.jpg b/static/texture/nb1/Station30520.jpg
deleted file mode 100644
index d254b1f0a..000000000
Binary files a/static/texture/nb1/Station30520.jpg and /dev/null differ
diff --git a/static/texture/nb1/Station32955.jpg b/static/texture/nb1/Station32955.jpg
deleted file mode 100644
index 88d659ced..000000000
Binary files a/static/texture/nb1/Station32955.jpg and /dev/null differ
diff --git a/static/texture/nb1/Station38286.jpg b/static/texture/nb1/Station38286.jpg
deleted file mode 100644
index 4fca253a2..000000000
Binary files a/static/texture/nb1/Station38286.jpg and /dev/null differ
diff --git a/static/texture/nb1/Station38674.jpg b/static/texture/nb1/Station38674.jpg
deleted file mode 100644
index 57e06da7a..000000000
Binary files a/static/texture/nb1/Station38674.jpg and /dev/null differ
diff --git a/static/texture/nb1/Station44173.jpg b/static/texture/nb1/Station44173.jpg
deleted file mode 100644
index 298f3788d..000000000
Binary files a/static/texture/nb1/Station44173.jpg and /dev/null differ
diff --git a/static/texture/nb1/Station63100.jpg b/static/texture/nb1/Station63100.jpg
deleted file mode 100644
index 5ad5043ec..000000000
Binary files a/static/texture/nb1/Station63100.jpg and /dev/null differ
diff --git a/static/texture/nb1/Station69378.jpg b/static/texture/nb1/Station69378.jpg
deleted file mode 100644
index 0bb07f545..000000000
Binary files a/static/texture/nb1/Station69378.jpg and /dev/null differ
diff --git a/static/texture/nb1/Station72310.jpg b/static/texture/nb1/Station72310.jpg
deleted file mode 100644
index 6037427ed..000000000
Binary files a/static/texture/nb1/Station72310.jpg and /dev/null differ
diff --git a/static/texture/nb1/Station72764.jpg b/static/texture/nb1/Station72764.jpg
deleted file mode 100644
index ff6e2fc4c..000000000
Binary files a/static/texture/nb1/Station72764.jpg and /dev/null differ
diff --git a/static/texture/nb1/Station75414.jpg b/static/texture/nb1/Station75414.jpg
deleted file mode 100644
index bb54f6ea9..000000000
Binary files a/static/texture/nb1/Station75414.jpg and /dev/null differ
diff --git a/static/texture/nb1/Station75494.jpg b/static/texture/nb1/Station75494.jpg
deleted file mode 100644
index 11002d948..000000000
Binary files a/static/texture/nb1/Station75494.jpg and /dev/null differ
diff --git a/static/texture/nb1/Station75703.jpg b/static/texture/nb1/Station75703.jpg
deleted file mode 100644
index 019359b10..000000000
Binary files a/static/texture/nb1/Station75703.jpg and /dev/null differ
diff --git a/static/texture/nb1/Station78392.jpg b/static/texture/nb1/Station78392.jpg
deleted file mode 100644
index 319573ca1..000000000
Binary files a/static/texture/nb1/Station78392.jpg and /dev/null differ
diff --git a/static/texture/nb1/Station81700.jpg b/static/texture/nb1/Station81700.jpg
deleted file mode 100644
index f14321a29..000000000
Binary files a/static/texture/nb1/Station81700.jpg and /dev/null differ
diff --git a/static/texture/nb1/Station84098.jpg b/static/texture/nb1/Station84098.jpg
deleted file mode 100644
index 5d694525a..000000000
Binary files a/static/texture/nb1/Station84098.jpg and /dev/null differ
diff --git a/static/texture/nb1/Station86112.jpg b/static/texture/nb1/Station86112.jpg
deleted file mode 100644
index 483ed9f7d..000000000
Binary files a/static/texture/nb1/Station86112.jpg and /dev/null differ
diff --git a/static/texture/nb1/Station99584.jpg b/static/texture/nb1/Station99584.jpg
deleted file mode 100644
index c7c1c849a..000000000
Binary files a/static/texture/nb1/Station99584.jpg and /dev/null differ
diff --git a/static/texture/nb1/devicelist.jpg b/static/texture/nb1/devicelist.jpg
deleted file mode 100644
index 027ca487b..000000000
Binary files a/static/texture/nb1/devicelist.jpg and /dev/null differ
diff --git a/static/texture/nb1/nb1list.jpg b/static/texture/nb1/nb1list.jpg
deleted file mode 100644
index aa30db6a8..000000000
Binary files a/static/texture/nb1/nb1list.jpg and /dev/null differ
diff --git a/static/texture/nb1/pingbimen.png b/static/texture/nb1/pingbimen.png
deleted file mode 100644
index 30880b6d1..000000000
Binary files a/static/texture/nb1/pingbimen.png and /dev/null differ
diff --git a/static/texture/xian3/Station17596.jpg b/static/texture/xian3/Station17596.jpg
deleted file mode 100644
index 71bcab933..000000000
Binary files a/static/texture/xian3/Station17596.jpg and /dev/null differ
diff --git a/static/texture/xian3/Station18000.jpg b/static/texture/xian3/Station18000.jpg
deleted file mode 100644
index 21ed7de35..000000000
Binary files a/static/texture/xian3/Station18000.jpg and /dev/null differ
diff --git a/static/texture/xian3/Station19253.jpg b/static/texture/xian3/Station19253.jpg
deleted file mode 100644
index fd521f78d..000000000
Binary files a/static/texture/xian3/Station19253.jpg and /dev/null differ
diff --git a/static/texture/xian3/Station21203.jpg b/static/texture/xian3/Station21203.jpg
deleted file mode 100644
index f0f094a3a..000000000
Binary files a/static/texture/xian3/Station21203.jpg and /dev/null differ
diff --git a/static/texture/xian3/Station34499.jpg b/static/texture/xian3/Station34499.jpg
deleted file mode 100644
index d5b486730..000000000
Binary files a/static/texture/xian3/Station34499.jpg and /dev/null differ
diff --git a/static/texture/xian3/Station37821.jpg b/static/texture/xian3/Station37821.jpg
deleted file mode 100644
index 8f6a04742..000000000
Binary files a/static/texture/xian3/Station37821.jpg and /dev/null differ
diff --git a/static/texture/xian3/Station41790.jpg b/static/texture/xian3/Station41790.jpg
deleted file mode 100644
index c12ce3096..000000000
Binary files a/static/texture/xian3/Station41790.jpg and /dev/null differ
diff --git a/static/texture/xian3/Station4324.jpg b/static/texture/xian3/Station4324.jpg
deleted file mode 100644
index 26e8d1b78..000000000
Binary files a/static/texture/xian3/Station4324.jpg and /dev/null differ
diff --git a/static/texture/xian3/Station43447.jpg b/static/texture/xian3/Station43447.jpg
deleted file mode 100644
index b36159e75..000000000
Binary files a/static/texture/xian3/Station43447.jpg and /dev/null differ
diff --git a/static/texture/xian3/Station47557.jpg b/static/texture/xian3/Station47557.jpg
deleted file mode 100644
index e42572212..000000000
Binary files a/static/texture/xian3/Station47557.jpg and /dev/null differ
diff --git a/static/texture/xian3/Station53597.jpg b/static/texture/xian3/Station53597.jpg
deleted file mode 100644
index 73e3e0cbd..000000000
Binary files a/static/texture/xian3/Station53597.jpg and /dev/null differ
diff --git a/static/texture/xian3/Station54200.jpg b/static/texture/xian3/Station54200.jpg
deleted file mode 100644
index 9f9b4a79b..000000000
Binary files a/static/texture/xian3/Station54200.jpg and /dev/null differ
diff --git a/static/texture/xian3/Station55755.jpg b/static/texture/xian3/Station55755.jpg
deleted file mode 100644
index 41ae244c7..000000000
Binary files a/static/texture/xian3/Station55755.jpg and /dev/null differ
diff --git a/static/texture/xian3/Station571.jpg b/static/texture/xian3/Station571.jpg
deleted file mode 100644
index 7bfb19cb8..000000000
Binary files a/static/texture/xian3/Station571.jpg and /dev/null differ
diff --git a/static/texture/xian3/Station60649.jpg b/static/texture/xian3/Station60649.jpg
deleted file mode 100644
index 32059bef3..000000000
Binary files a/static/texture/xian3/Station60649.jpg and /dev/null differ
diff --git a/static/texture/xian3/Station61238.jpg b/static/texture/xian3/Station61238.jpg
deleted file mode 100644
index 6fbda9a3d..000000000
Binary files a/static/texture/xian3/Station61238.jpg and /dev/null differ
diff --git a/static/texture/xian3/Station64474.jpg b/static/texture/xian3/Station64474.jpg
deleted file mode 100644
index ec8720605..000000000
Binary files a/static/texture/xian3/Station64474.jpg and /dev/null differ
diff --git a/static/texture/xian3/Station66742.jpg b/static/texture/xian3/Station66742.jpg
deleted file mode 100644
index bf1e3d889..000000000
Binary files a/static/texture/xian3/Station66742.jpg and /dev/null differ
diff --git a/static/texture/xian3/Station67917.jpg b/static/texture/xian3/Station67917.jpg
deleted file mode 100644
index 5c13f1c9a..000000000
Binary files a/static/texture/xian3/Station67917.jpg and /dev/null differ
diff --git a/static/texture/xian3/Station67945.jpg b/static/texture/xian3/Station67945.jpg
deleted file mode 100644
index 6817f38da..000000000
Binary files a/static/texture/xian3/Station67945.jpg and /dev/null differ
diff --git a/static/texture/xian3/Station68029.jpg b/static/texture/xian3/Station68029.jpg
deleted file mode 100644
index e06022c18..000000000
Binary files a/static/texture/xian3/Station68029.jpg and /dev/null differ
diff --git a/static/texture/xian3/Station78551.jpg b/static/texture/xian3/Station78551.jpg
deleted file mode 100644
index 38c7dce21..000000000
Binary files a/static/texture/xian3/Station78551.jpg and /dev/null differ
diff --git a/static/texture/xian3/Station85598.jpg b/static/texture/xian3/Station85598.jpg
deleted file mode 100644
index 7076afa53..000000000
Binary files a/static/texture/xian3/Station85598.jpg and /dev/null differ
diff --git a/static/texture/xian3/Station90652.jpg b/static/texture/xian3/Station90652.jpg
deleted file mode 100644
index 574648cd6..000000000
Binary files a/static/texture/xian3/Station90652.jpg and /dev/null differ
diff --git a/static/texture/xian3/Station90701.jpg b/static/texture/xian3/Station90701.jpg
deleted file mode 100644
index 7a23c0854..000000000
Binary files a/static/texture/xian3/Station90701.jpg and /dev/null differ
diff --git a/static/texture/xian3/Station99903.jpg b/static/texture/xian3/Station99903.jpg
deleted file mode 100644
index ab4196ab8..000000000
Binary files a/static/texture/xian3/Station99903.jpg and /dev/null differ
diff --git a/static/texture/xian3/devicelist.jpg b/static/texture/xian3/devicelist.jpg
deleted file mode 100644
index 3b41ca721..000000000
Binary files a/static/texture/xian3/devicelist.jpg and /dev/null differ
diff --git a/static/texture/xian3/pingbimen.png b/static/texture/xian3/pingbimen.png
deleted file mode 100644
index 63b42ef22..000000000
Binary files a/static/texture/xian3/pingbimen.png and /dev/null differ
diff --git a/static/texture/xian3/xian3list.jpg b/static/texture/xian3/xian3list.jpg
deleted file mode 100644
index 9abd0688c..000000000
Binary files a/static/texture/xian3/xian3list.jpg and /dev/null differ
diff --git a/static/texture/xian3/xian3listold.jpg b/static/texture/xian3/xian3listold.jpg
deleted file mode 100644
index 3b41ca721..000000000
Binary files a/static/texture/xian3/xian3listold.jpg and /dev/null differ
diff --git a/vue.config.js b/vue.config.js
index 69f00e241..2c3e8b76f 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -171,13 +171,6 @@ module.exports = {
                                     priority: 10, // 缓存组优先级 数字越⼤大，优先级越⾼高
                                     reuseExistingChunk: true // 如果当前代码块包含的模块已经有了，就不在产生一个新的代码块
                                 },
-                                jlmap: {
-                                    name: 'split-jlmap',
-                                    test: path.resolve(__dirname, './src/jmap'),
-                                    priority: 8,
-                                    minChunks: 1,
-                                    reuseExistingChunk: true
-                                },
                                 jmapNew: {
                                     name: 'split-jmapNew',
                                     test: path.resolve(__dirname, './src/jmapNew'),