diff --git a/src/api/designPlatform.js b/src/api/designPlatform.js
new file mode 100644
index 000000000..ac86826f4
--- /dev/null
+++ b/src/api/designPlatform.js
@@ -0,0 +1,188 @@
+import request from '@/utils/request';
+
+export function getDraftLesson(params, mapId) {
+	/** 根据mapId获取草稿课程 */
+	return request({
+		url: `/api/mapSystem/findDraftLessonBy/${mapId}`,
+		method: 'get',
+		params
+	});
+}
+/** 获取用户地图树 */
+export function getUserMapTree(cityCode) {
+	return request({
+		url: `/api/mapSystem/findDraftMapByCityCode?cityCode=${cityCode}`,
+		method: 'get'
+	});
+}
+
+/** 运行图*/
+export function getRpListByUserMapId(mapId) {
+	return request({
+		url: `/api/draftMap/runPlan/findByDraftMapId/${mapId}`,
+		method: 'get'
+	});
+}
+export function getMapList(cityCode) {
+	/** 根据cityCode获取地图列表 */
+	return request({
+		url: `/api/mapSystem/queryMapByCityCode/${cityCode}`,
+		method: 'get'
+	});
+}
+
+/** 获取用户自己的运行图详情*/
+export function getRpDetailByUserMapId(planId) {
+	return request({
+		url: `/api/draftMap/runPlan/selectDiagramData/${planId}`,
+		method: 'get'
+	});
+}
+
+/** 获取用户自己创建的草稿地图详情*/
+export function getUserMapDetailByMapId(mapId) {
+	return request({
+		url: `/api/mapBuild/findById/${mapId}`,
+		method: 'get'
+	});
+}
+
+/** 用户自己的运行图仿真测试*/
+export function runUserPlanNotify({ planId }) {
+	return request({
+		url: `/api/draftMap/runPlan/simulationCheck/${planId}`,
+		method: 'get'
+	});
+}
+
+/** 管理员获取需审核的课程列表 */
+export function reviewLessonList(params) {
+	return request({
+		url: `/api/review/query/lesson`,
+		method: 'get',
+		params
+	});
+}
+
+/** 管理员发布课程接口 */
+export function adminPublishLesson(data, id) {
+	return request({
+		url: `/api/review/${id}/publishLesson`,
+		method: 'post',
+		data: data
+	});
+}
+
+/** 管理员驳回课程发布申请 */
+export function rejectedLessonRelease(data, id) {
+	return request({
+		url: `/api/review/lesson/${id}`,
+		method: 'post',
+		data: data
+	});
+}
+
+/** 普通用户申请课程发布和撤销申请 */
+export function releaseOrCancel(id, status) {
+	return request({
+		url: `/api/review/lesson/releaseOrCancel/${id}/${status}`,
+		method: 'get'
+	});
+}
+
+/** 管理员获取需审核的剧本列表 ok */
+export function reviewScriptList(params) {
+	return request({
+		url: `/api/review/query/script`,
+		method: 'get',
+		params
+	});
+}
+/** 管理员发布剧本 ok */
+export function publishScript(id) {
+	return request({
+		url: `/api/review/${id}/publishScript`,
+		method: 'post'
+	});
+}
+/** 管理员剧本申请驳回 ok */
+export function rejectScript(id, data) {
+	return request({
+		url: `/api/review/script/${id}`,
+		method: 'post',
+		data: data
+	});
+}
+
+/** 管理员获取需审核的运行图列表 */
+export function reviewRunPlanList(params) {
+	return request({
+		url: `/api/review/query/runPlan`,
+		method: 'get',
+		params
+	});
+}
+
+/** 管理员发布运行图 */
+export function publishRunPlan(planId, data) {
+	return request({
+		url: `/api/review/${planId}/publishRunPlan`,
+		method: 'post',
+		data: data
+	});
+}
+/** 普通用户申请或撤销运行图发布 */
+export function releaseOrCancelRunPlan(planId, status) {
+	return request({
+		url: `/api/review/runPlan/releaseOrCancel/${planId}/${status}`,
+		method: 'get'
+	});
+}
+/** 管理员运行图申请驳回 */
+export function rejectRunPlan(id, data) {
+	return request({
+		url: `/api/review/runPlan/${id}`,
+		method: 'post',
+		data: data
+	});
+}
+
+/** 用户申请发布剧本或者撤销剧本申请 */
+export function releaseScript(id, status) {
+	return request({
+		url: `/api/review/script/releaseOrCancel/${id}/${status}`,
+		method: 'get'
+	});
+}
+
+/** 查看课程详情 */
+export function reviewLessonDetail(id) {
+	return request({
+		url: `/api/review/previewLesson/${id}`,
+		method: 'get'
+	});
+}
+/** 管理员预览草稿运行图*/
+export function previewRunPlan(planId) {
+	return request({
+		url: `/api/review/previewRunPlan/${planId}`,
+		method: 'get'
+	});
+}
+
+/** 加载剧本 */
+export function loadDraftScript(scriptId, memberId, group) {
+	return request({
+		url: `api/simulation/${group}/scriptDraft/${scriptId}?memberId=${memberId}`,
+		method: 'post'
+	});
+}
+
+/** 获取已发布的有地图的城市列表*/
+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 fbb3187b4..dcb7a1f23 100644
--- a/src/api/jmap/lesson.js
+++ b/src/api/jmap/lesson.js
@@ -8,11 +8,10 @@ export function getPublishLessonList() {
 	});
 }
 /** 获取发布列表树*/
-export function getPublishLessonTree(params) {
+export function getPublishLessonTree(id) {
 	return request({
-		url: '/api/lesson/tree',
-		method: 'get',
-		params: params || {}
+		url: `/api/lesson/${id}/tree`,
+		method: 'get'
 	});
 }
 
diff --git a/src/api/jmap/lessondraft.js b/src/api/jmap/lessondraft.js
index 0c7a177c8..23b7c3322 100644
--- a/src/api/jmap/lessondraft.js
+++ b/src/api/jmap/lessondraft.js
@@ -1,11 +1,10 @@
 import request from '@/utils/request';
 
 /** 获取课程树*/
-export function getLessonTree(params) {
+export function getLessonTree(skinCode) {
 	return request({
-		url: '/api/lessonDraft/tree',
-		method: 'get',
-		params: params
+		url: `/api/lessonDraft/${skinCode}/tree`,
+		method: 'get'
 	});
 }
 
@@ -103,3 +102,11 @@ export function getLessonNameByMapIdAndLessonId(model) {
 		method: 'get'
 	});
 }
+
+export function getLessonDrftList(params) {
+	return request({
+		url: `/api/lessonDraft`,
+		method: 'get',
+		params: params
+	});
+}
diff --git a/src/api/jmap/map.js b/src/api/jmap/map.js
index c409c18dd..9a4e94926 100644
--- a/src/api/jmap/map.js
+++ b/src/api/jmap/map.js
@@ -58,10 +58,11 @@ export function getPublishTrainList(skinCode) {
 }
 
 /** 获取发布地图列表*/
-export function listPublishMap() {
+export function listPublishMap(params) {
 	return request({
-		url: '/api/map/list',
-		method: 'get'
+		url: `/api/map/list`,
+		method: 'get',
+		params
 	});
 }
 
diff --git a/src/api/jmap/mapdraft.js b/src/api/jmap/mapdraft.js
index ccd219bb9..538d77fb5 100644
--- a/src/api/jmap/mapdraft.js
+++ b/src/api/jmap/mapdraft.js
@@ -264,3 +264,10 @@ export function putAutoSignal(data) {
 	});
 }
 
+export function getListByCityCode(cityCode) {
+	return request({
+		url: `/api/mapBuild/${cityCode}/list`,
+		method: 'get'
+	});
+}
+
diff --git a/src/api/management/exam.js b/src/api/management/exam.js
index 93f5a801b..b22839e9d 100644
--- a/src/api/management/exam.js
+++ b/src/api/management/exam.js
@@ -1,14 +1,5 @@
 import request from '@/utils/request';
 
-/** 获取考试列表树*/
-export function getCourseLessonTree(params) {
-	return request({
-		url: '/api/exam/tree',
-		method: 'get',
-		params: params
-	});
-}
-
 /** 创建对应课程考题 */
 export function setCourseList(data) {
 	return request({
diff --git a/src/api/quest.js b/src/api/quest.js
index 7baa7b116..ab38bf805 100644
--- a/src/api/quest.js
+++ b/src/api/quest.js
@@ -1,16 +1,17 @@
 import request from '@/utils/request';
 
-/** 查找个人录制的仿真任务*/
-export function getQuestPageList(mapId) {
+/** 分页查找个人录制的仿真任务*/
+export function getQuestPageList(mapId, params) {
 	return request({
-		url: `/api/script/${mapId}/list`,
-		method: 'get'
+		url: `/api/script/draft/${mapId}/list`,
+		method: 'get',
+		params: params
 	});
 }
 /** 创建任务 */
 export function createQuest(data) {
 	return request({
-		url: `/api/script`,
+		url: `/api/script/draft`,
 		method: 'post',
 		data
 	});
@@ -18,28 +19,28 @@ export function createQuest(data) {
 /** 根据任务id删除任务 */
 export function deleteQuest(id) {
 	return request({
-		url: `/api/script/${id}`,
+		url: `/api/script/draft/${id}`,
 		method: 'delete'
 	});
 }
 /** 根据id查询任务基础信息 */
 export function getQuestById(id) {
 	return request({
-		url: `/api/script/${id}/basic`,
+		url: `/api/script/draft/${id}`,
 		method: 'get'
 	});
 }
-/** 根据id查询任务基础信息 */
+/** 根据id查询任务详情信息 */
 export function getQuestByIdList(id) {
 	return request({
-		url: `/api/quest/${id}/detail`,
+		url: `/api/script/draft/${id}/detail`,
 		method: 'get'
 	});
 }
 /** 更新任务基本信息 */
 export function updateQuest(id, data) {
 	return request({
-		url: `/api/script/${id}`,
+		url: `/api/script/draft/${id}`,
 		method: 'put',
 		data
 	});
@@ -53,3 +54,21 @@ export function getQuestPageListOnline(params) {
 		params: params
 	});
 }
+
+/** 剧本发布 */
+export function publishQuest(id, data) {
+	return request({
+		url: `/api/script/draft/${id}/publish`,
+		method: 'put',
+		data
+	});
+}
+
+/** 剧本撤销发布 */
+export function retractQuest(id, data) {
+	return request({
+		url: `/api/script/draft/${id}/retract`,
+		method: 'put'
+	});
+}
+
diff --git a/src/api/script.js b/src/api/script.js
index 2e58fe548..b4cc5e639 100644
--- a/src/api/script.js
+++ b/src/api/script.js
@@ -4,6 +4,7 @@ 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
 	});
@@ -17,10 +18,17 @@ export function getScriptByIdList(id) {
 	});
 }
 
-/** 通过ID查询剧本的基础信息 */
+/** 通过ID查询发布的剧本的详细信息 */
 export function getScriptById(id) {
 	return request({
 		url: `/api/script/${id}/detail`,
 		method: 'get'
 	});
 }
+/** 通过ID查询未发布剧本的详细信息 */
+export function getDraftScriptById(id) {
+	return request({
+		url: `/api/script/draft/${id}/detail`,
+		method: 'get'
+	});
+}
diff --git a/src/api/trainingPlatform.js b/src/api/trainingPlatform.js
new file mode 100644
index 000000000..1dd8282b3
--- /dev/null
+++ b/src/api/trainingPlatform.js
@@ -0,0 +1,87 @@
+import request from '@/utils/request';
+
+export function getTrainingSystemList(cityCode, params) {
+	/** 根据cityCode后去对应地图及其子系统 */
+	return request({
+		url: `/api/mapSystem/city/${cityCode}`,
+		method: 'get',
+		params
+	});
+}
+
+export function querySystemByTypeAndPrdCode(params, prodCode) {
+	/** 根据系统类型和地图产品code查询系统的内容（课程、章节、考试）*/
+	return request({
+		url: `/api/mapSystem/queryByTypeAndPrdCode/${prodCode}`,
+		method: 'get',
+		params
+	});
+}
+
+export function getTrainingSystemListByMapId(mapId) {
+	/** 根据mapId去获取其子系统 */
+	return request({
+		url: `/api/mapSystem/${mapId}`,
+		method: 'get'
+	});
+}
+
+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'
+	});
+}
+
diff --git a/src/assets/erCode.jpg b/src/assets/erCode.jpg
new file mode 100644
index 000000000..645f77b66
Binary files /dev/null and b/src/assets/erCode.jpg differ
diff --git a/src/assets/logo_changan.png b/src/assets/logo_changan.png
new file mode 100644
index 000000000..79b86d820
Binary files /dev/null and b/src/assets/logo_changan.png differ
diff --git a/src/components/QueryListPage/QueryForm.vue b/src/components/QueryListPage/QueryForm.vue
index 49ee1bbf1..338a89472 100644
--- a/src/components/QueryListPage/QueryForm.vue
+++ b/src/components/QueryListPage/QueryForm.vue
@@ -127,7 +127,7 @@
               </el-row>
             </template>
           </el-col>
-          <el-col :span="6" :offset="0">
+          <el-col :span="5" :offset="1">
             <el-button type="primary" size="small" :disabled="!canQuery" @click="query">{{ $t('global.query') }}</el-button>
             <el-button v-if="queryForm.reset" type="primary" size="small" :disabled="!canQuery" @click="doClean">{{ $t('global.reset') }}</el-button>
             <el-button v-if="exportFlag" type="primary" size="small" :disabled="!canQuery" @click="doExport">{{ $t('global.export') }}</el-button>
@@ -139,6 +139,7 @@
                 size="small"
                 :style="button.style"
                 @click="button.handler"
+                class="button_style"
               >{{ button.text }}</el-button>
             </template>
           </el-col>
@@ -480,4 +481,7 @@ export default {
         max-width: 240px;
         min-width: 100px;
     }
+    .button_style {
+        margin-bottom: 10px;
+    }
 </style>
diff --git a/src/components/QueryListPage/QueryListPage.vue b/src/components/QueryListPage/QueryListPage.vue
index 1faf56ee3..74dcf9d36 100644
--- a/src/components/QueryListPage/QueryListPage.vue
+++ b/src/components/QueryListPage/QueryListPage.vue
@@ -453,7 +453,10 @@ export default {
 		currentChoose() {
 			return this.choose;
 		},
-		refresh() {
+		refresh(flag) {
+			if (flag) {
+				this.commitQuery();
+			}
 			this.queryList.data = [...this.queryList.data];
 		}
 	}
diff --git a/src/directive/dialogDrag/dialogDrag.js b/src/directive/dialogDrag/dialogDrag.js
new file mode 100644
index 000000000..8e271e253
--- /dev/null
+++ b/src/directive/dialogDrag/dialogDrag.js
@@ -0,0 +1,54 @@
+import store from '@/store';
+
+export default {
+	bind(el) {
+		const dialogHeaderEl = el.querySelector('.el-dialog__header');
+		const dragDom = el.querySelector('.el-dialog');
+		dialogHeaderEl.style.cursor = 'move';
+
+		/** 获取原有属性 ie dom元素.currentStyle 火狐谷歌 window.getComputedStyle(dom元素, null);*/
+		const sty = dragDom.currentStyle || window.getComputedStyle(dragDom, null);
+
+		dialogHeaderEl.onmousedown = (e) => {
+			/**  鼠标按下，计算当前元素距离可视区的距离*/
+			const disX = e.clientX - dialogHeaderEl.offsetLeft;
+			const disY = e.clientY - dialogHeaderEl.offsetTop;
+
+			/**  获取到的值带px 正则匹配替换*/
+			let styL, styT;
+
+			/**  注意在ie中 第一次获取到的值为组件自带50% 移动之后赋值为px*/
+			if (sty.left.includes('%')) {
+				// eslint-disable-next-line no-useless-escape
+				styL = +document.body.clientWidth * (+sty.left.replace(/\%/g, '') / 100);
+				styT = +document.body.clientHeight * (+sty.top.replace(/\%/g, '') / 100);
+			} else {
+				// eslint-disable-next-line no-useless-escape
+				styL = +sty.left.replace(/\px/g, '');
+				// eslint-disable-next-line no-useless-escape
+				styT = +sty.top.replace(/\px/g, '');
+			}
+
+			document.onmousemove = function (e) {
+				/** 通过事件委托，计算移动的距离*/
+				const l = e.clientX - disX;
+				const t = e.clientY - disY;
+
+				/** 移动当前元素*/
+				dragDom.style.left = `${l + styL}px`;
+				dragDom.style.top = `${t + styT}px`;
+
+				/** 刷新提示标签位置*/
+				store.dispatch('training/emitTipFresh');
+
+				/** 将此时的位置传出去*/
+				// binding.value({ x: e.pageX, y: e.pageY });
+			};
+
+			document.onmouseup = function () {
+				document.onmousemove = null;
+				document.onmouseup = null;
+			};
+		};
+	}
+};
diff --git a/src/directive/dialogDrag/index.js b/src/directive/dialogDrag/index.js
new file mode 100644
index 000000000..537450254
--- /dev/null
+++ b/src/directive/dialogDrag/index.js
@@ -0,0 +1,8 @@
+import Vue from 'vue';
+import install from './dialogDrag';
+
+const dialogDrag = function(Vue) {
+	Vue.directive('dialogDrag', install);
+};
+
+Vue.use(dialogDrag);
diff --git a/src/directive/dialogDragWidth/dialogDragWidth.js b/src/directive/dialogDragWidth/dialogDragWidth.js
new file mode 100644
index 000000000..7d032cb77
--- /dev/null
+++ b/src/directive/dialogDragWidth/dialogDragWidth.js
@@ -0,0 +1,25 @@
+export default {
+	bind(el, binding) {
+		const dragDom = binding.value.$el.querySelector('.el-dialog');
+
+		el.onmousedown = (e) => {
+
+			/**  鼠标按下，计算当前元素距离可视区的距离*/
+			const disX = e.clientX - el.offsetLeft;
+
+			document.onmousemove = function (e) {
+				/** 移动时禁用默认事件*/
+				e.preventDefault();
+
+				/** 通过事件委托，计算移动的距离*/
+				const l = e.clientX - disX;
+				dragDom.style.width = `${l}px`;
+			};
+
+			document.onmouseup = function () {
+				document.onmousemove = null;
+				document.onmouseup = null;
+			};
+		};
+	}
+};
diff --git a/src/directive/dialogDragWidth/index.js b/src/directive/dialogDragWidth/index.js
new file mode 100644
index 000000000..3ee2ad0fa
--- /dev/null
+++ b/src/directive/dialogDragWidth/index.js
@@ -0,0 +1,8 @@
+import Vue from 'vue';
+import install from './dialogDragWidth';
+
+const dialogDragWidth = function(Vue) {
+	Vue.directive('dialogDragWidth', install);
+};
+
+Vue.use(dialogDragWidth);
diff --git a/src/directive/drag/drag.js b/src/directive/drag/drag.js
new file mode 100644
index 000000000..69979448d
--- /dev/null
+++ b/src/directive/drag/drag.js
@@ -0,0 +1,106 @@
+export default {
+	bind(el) {
+		const dragDom = el.querySelector('.reminder-box');
+		const dragRight = el.querySelector('.drag-right');
+		const dragLeft = el.querySelector('.drag-left');
+		const dragBottom = el.querySelector('.drag-bottom');
+		const dragTop = el.querySelector('.drag-top');
+		const dragBody = el.querySelector('.tip-body');
+		const body = el.querySelector('.tip-body-box');
+
+		dragRight.onmousedown = (e) => {
+			document.onselectstart = function () {
+				return false;
+			};
+			// 宽度拖拽
+			var iEvent = e || event;
+			var disX = iEvent.clientX;
+			var disW = dragDom.offsetWidth;
+			document.onmousemove = function (e) {
+
+				var iEvent = e || event;
+				if (disW + (iEvent.clientX - disX) > 350) {
+					dragDom.style.width = disW + (iEvent.clientX - disX) + 'px';
+				}
+			};
+
+			document.onmouseup = function () {
+				document.onmousemove = null;
+				document.onmouseup = null;
+				document.onselectstart = null;
+			};
+		};
+		dragLeft.onmousedown = (e) => {
+			document.onselectstart = function () {
+				return false;
+			};
+			// 宽度拖拽
+			var iEvent = e || event;
+			var disX = iEvent.clientX;
+			var disW = dragDom.offsetWidth;
+			var OFFLeft = dragDom.offsetLeft;
+			document.onmousemove = function (e) {
+				const iEvent = e || event;
+				const width = disW - (iEvent.clientX - disX);
+				if (width > 350) {
+					dragDom.style.width = disW - (iEvent.clientX - disX) + 'px';
+					dragDom.style.left = OFFLeft + (iEvent.clientX - disX) + 'px';
+				}
+			};
+
+			document.onmouseup = function () {
+				document.onmousemove = null;
+				document.onmouseup = null;
+				document.onselectstart = null;
+			};
+		};
+		dragBottom.onmousedown = (e) => {
+			document.onselectstart = function () {
+				return false;
+			};
+			// 宽度拖拽
+			var iEvent = e || event;
+			var disY = iEvent.clientY;
+			var disH = dragDom.offsetHeight;
+			document.onmousemove = function (e) {
+				var iEvent = e || event;
+				if (disH + (iEvent.clientY - disY) > 200) {
+					dragDom.style.height = disH + (iEvent.clientY - disY) + 'px';
+					body.style.height = disH + (iEvent.clientY - disY) - 40 + 'px';
+					dragBody.style.height = disH + (iEvent.clientY - disY) - 100 + 'px';
+				}
+			};
+
+			document.onmouseup = function () {
+				document.onmousemove = null;
+				document.onmouseup = null;
+				document.onselectstart = null;
+			};
+		};
+		dragTop.onmousedown = (e) => {
+			document.onselectstart = function () {
+				return false;
+			};
+			// 宽度拖拽
+			var iEvent = e || event;
+			var disY = iEvent.clientY;
+			var disH = dragDom.offsetHeight;
+			var OOFTop = dragDom.offsetTop;
+			document.onmousemove = function (e) {
+				var iEvent = e || event;
+				if (disH - (iEvent.clientY - disY) > 200) {
+					dragDom.style.height = disH - (iEvent.clientY - disY) + 'px';
+					body.style.height = disH - (iEvent.clientY - disY) - 40 + 'px';
+					dragBody.style.height = disH - (iEvent.clientY - disY) - 100 + 'px';
+					dragDom.style.top = OOFTop + (iEvent.clientY - disY) + 'px';
+				}
+			};
+
+			document.onmouseup = function () {
+				document.onmousemove = null;
+				document.onmouseup = null;
+				document.onselectstart = null;
+			};
+		};
+	}
+};
diff --git a/src/directive/drag/index.js b/src/directive/drag/index.js
new file mode 100644
index 000000000..7bba5ebce
--- /dev/null
+++ b/src/directive/drag/index.js
@@ -0,0 +1,8 @@
+import Vue from 'vue';
+import install from './drag';
+
+const drag = function(Vue) {
+	Vue.directive('drag', install);
+};
+
+Vue.use(drag);
diff --git a/src/directive/focus/focus.js b/src/directive/focus/focus.js
new file mode 100644
index 000000000..7c3b68b65
--- /dev/null
+++ b/src/directive/focus/focus.js
@@ -0,0 +1,18 @@
+export default {
+	// 当被绑定的元素插入到 DOM 中时
+	inserted: function (el, obj) {
+		// 这是需要页面刚加载就能进行聚焦操作使用的钩子函数,可以省略的，视具体需求而定
+		// 对值进行判断
+		if (obj.value) {
+			// 聚焦元素
+			el.focus();
+		}
+	},
+	// 当指令所在组件的 VNode 及其子 VNode 全部更新后调用
+	// 这是每当绑定的值发生改变时触发的钩子函数
+	componentUpdated: function (el, obj) {
+		if (obj.value) {
+			el.focus();
+		}
+	}
+};
diff --git a/src/directive/focus/index.js b/src/directive/focus/index.js
new file mode 100644
index 000000000..f9d4f2332
--- /dev/null
+++ b/src/directive/focus/index.js
@@ -0,0 +1,8 @@
+import Vue from 'vue';
+import install from './focus';
+
+const focus = function(Vue) {
+	Vue.directive('focus', install);
+};
+
+Vue.use(focus);
diff --git a/src/directive/quickMenuDrag/index.js b/src/directive/quickMenuDrag/index.js
new file mode 100644
index 000000000..5a176f844
--- /dev/null
+++ b/src/directive/quickMenuDrag/index.js
@@ -0,0 +1,8 @@
+import Vue from 'vue';
+import install from './quickMenuDrag';
+
+const quickMenuDrag = function(Vue) {
+	Vue.directive('quickMenuDrag', install);
+};
+
+Vue.use(quickMenuDrag);
diff --git a/src/directive/quickMenuDrag/quickMenuDrag.js b/src/directive/quickMenuDrag/quickMenuDrag.js
new file mode 100644
index 000000000..000031662
--- /dev/null
+++ b/src/directive/quickMenuDrag/quickMenuDrag.js
@@ -0,0 +1,45 @@
+export default {
+	bind(el) {
+		const dragDom = el;
+		dragDom.style.cursor = 'move';
+
+		/** 获取原有属性 ie dom元素.currentStyle 火狐谷歌 window.getComputedStyle(dom元素, null);*/
+		const sty = dragDom.currentStyle || window.getComputedStyle(dragDom, null);
+
+		dragDom.onmousedown = (e) => {
+			/**  鼠标按下，计算当前元素距离可视区的距离*/
+			const disX = e.clientX;
+			const disY = e.clientY;
+
+			/**  获取到的值带px 正则匹配替换*/
+			let styL, styT;
+
+			/**  注意在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);
+			} else {
+				styL = +sty.left.replace(/\px/g, '');
+				styT = +sty.top.replace(/\px/g, '');
+			}
+
+			document.onmousemove = function (e) {
+				/** 通过事件委托，计算移动的距离*/
+				const l = e.clientX - disX;
+				const t = e.clientY - disY;
+
+				/** 移动当前元素*/
+				dragDom.style.left = `${l + styL}px`;
+				dragDom.style.top = `${t + styT}px`;
+
+				/** 将此时的位置传出去*/
+				// binding.value({ x: e.pageX, y: e.pageY });
+			};
+
+			document.onmouseup = function () {
+				document.onmousemove = null;
+				document.onmouseup = null;
+			};
+		};
+	}
+};
diff --git a/src/directive/waves/index.js b/src/directive/waves/index.js
new file mode 100644
index 000000000..44264f6f0
--- /dev/null
+++ b/src/directive/waves/index.js
@@ -0,0 +1,8 @@
+import Vue from 'vue';
+import install from './waves';
+
+const waves = function(Vue) {
+	Vue.directive('waves', install);
+};
+
+Vue.use(waves);
diff --git a/src/directive/waves/waves.css b/src/directive/waves/waves.css
new file mode 100644
index 000000000..af7a7efd9
--- /dev/null
+++ b/src/directive/waves/waves.css
@@ -0,0 +1,26 @@
+.waves-ripple {
+    position: absolute;
+    border-radius: 100%;
+    background-color: rgba(0, 0, 0, 0.15);
+    background-clip: padding-box;
+    pointer-events: none;
+    -webkit-user-select: none;
+    -moz-user-select: none;
+    -ms-user-select: none;
+    user-select: none;
+    -webkit-transform: scale(0);
+    -ms-transform: scale(0);
+    transform: scale(0);
+    opacity: 1;
+}
+
+.waves-ripple.z-active {
+    opacity: 0;
+    -webkit-transform: scale(2);
+    -ms-transform: scale(2);
+    transform: scale(2);
+    -webkit-transition: opacity 1.2s ease-out, -webkit-transform 0.6s ease-out;
+    transition: opacity 1.2s ease-out, -webkit-transform 0.6s ease-out;
+    transition: opacity 1.2s ease-out, transform 0.6s ease-out;
+    transition: opacity 1.2s ease-out, transform 0.6s ease-out, -webkit-transform 0.6s ease-out;
+}
\ No newline at end of file
diff --git a/src/directive/waves/waves.js b/src/directive/waves/waves.js
new file mode 100644
index 000000000..eb2fa2cb6
--- /dev/null
+++ b/src/directive/waves/waves.js
@@ -0,0 +1,72 @@
+import './waves.css';
+
+const context = '@@wavesContext';
+
+function handleClick(el, binding) {
+	function handle(e) {
+		const customOpts = Object.assign({}, binding.value);
+		const opts = Object.assign({
+			ele: el, // 波纹作用元素
+			type: 'hit', // hit 点击位置扩散 center中心点扩展
+			color: 'rgba(0, 0, 0, 0.15)' // 波纹颜色
+		},
+		customOpts
+		);
+		const target = opts.ele;
+		if (target) {
+			target.style.position = 'relative';
+			target.style.overflow = 'hidden';
+			const rect = target.getBoundingClientRect();
+			let ripple = target.querySelector('.waves-ripple');
+			if (!ripple) {
+				ripple = document.createElement('span');
+				ripple.className = 'waves-ripple';
+				ripple.style.height = ripple.style.width = Math.max(rect.width, rect.height) + 'px';
+				target.appendChild(ripple);
+			} else {
+				ripple.className = 'waves-ripple';
+			}
+			switch (opts.type) {
+			case 'center':
+				ripple.style.top = rect.height / 2 - ripple.offsetHeight / 2 + 'px';
+				ripple.style.left = rect.width / 2 - ripple.offsetWidth / 2 + 'px';
+				break;
+			default:
+				ripple.style.top =
+            (e.pageY - rect.top - ripple.offsetHeight / 2 - document.documentElement.scrollTop ||
+              document.body.scrollTop) + 'px';
+				ripple.style.left =
+            (e.pageX - rect.left - ripple.offsetWidth / 2 - document.documentElement.scrollLeft ||
+              document.body.scrollLeft) + 'px';
+			}
+			ripple.style.backgroundColor = opts.color;
+			ripple.className = 'waves-ripple z-active';
+			return false;
+		}
+	}
+
+	if (!el[context]) {
+		el[context] = {
+			removeHandle: handle
+		};
+	} else {
+		el[context].removeHandle = handle;
+	}
+
+	return handle;
+}
+
+export default {
+	bind(el, binding) {
+		el.addEventListener('click', handleClick(el, binding), false);
+	},
+	update(el, binding) {
+		el.removeEventListener('click', el[context].removeHandle, false);
+		el.addEventListener('click', handleClick(el, binding), false);
+	},
+	unbind(el) {
+		el.removeEventListener('click', el[context].removeHandle, false);
+		el[context] = null;
+		delete el[context];
+	}
+};
diff --git a/src/directives.js b/src/directives.js
deleted file mode 100644
index dba79ca51..000000000
--- a/src/directives.js
+++ /dev/null
@@ -1,283 +0,0 @@
-/* eslint-disable no-useless-escape */
-import Vue from 'vue';
-import store from '@/store';
-
-/**
- *元素获取焦点：v-dialogDrag
- * @param {*} el
- * @param {*} binding
- */
-Vue.directive('focus', {
-	// 当被绑定的元素插入到 DOM 中时
-	inserted: function (el, obj) {
-		// 这是需要页面刚加载就能进行聚焦操作使用的钩子函数,可以省略的，视具体需求而定
-		// 对值进行判断
-		if (obj.value) {
-			// 聚焦元素
-			el.focus();
-		}
-	},
-	// 当指令所在组件的 VNode 及其子 VNode 全部更新后调用
-	// 这是每当绑定的值发生改变时触发的钩子函数
-	componentUpdated: function (el, obj) {
-		if (obj.value) {
-			el.focus();
-		}
-	}
-});
-
-/**
- *弹窗拖拽：v-dialogDrag
- * @param {*} el
- * @param {*} binding
- * @param {*} vnode
- * @param {*} oldvNode
- */
-Vue.directive('dialogDrag', {
-	bind(el) {
-		const dialogHeaderEl = el.querySelector('.el-dialog__header');
-		const dragDom = el.querySelector('.el-dialog');
-		dialogHeaderEl.style.cursor = 'move';
-
-		/** 获取原有属性 ie dom元素.currentStyle 火狐谷歌 window.getComputedStyle(dom元素, null);*/
-		const sty = dragDom.currentStyle || window.getComputedStyle(dragDom, null);
-
-		dialogHeaderEl.onmousedown = (e) => {
-			/**  鼠标按下，计算当前元素距离可视区的距离*/
-			const disX = e.clientX - dialogHeaderEl.offsetLeft;
-			const disY = e.clientY - dialogHeaderEl.offsetTop;
-
-			/**  获取到的值带px 正则匹配替换*/
-			let styL, styT;
-
-			/**  注意在ie中 第一次获取到的值为组件自带50% 移动之后赋值为px*/
-			if (sty.left.includes('%')) {
-				// eslint-disable-next-line no-useless-escape
-				styL = +document.body.clientWidth * (+sty.left.replace(/\%/g, '') / 100);
-				styT = +document.body.clientHeight * (+sty.top.replace(/\%/g, '') / 100);
-			} else {
-				// eslint-disable-next-line no-useless-escape
-				styL = +sty.left.replace(/\px/g, '');
-				// eslint-disable-next-line no-useless-escape
-				styT = +sty.top.replace(/\px/g, '');
-			}
-
-			document.onmousemove = function (e) {
-				/** 通过事件委托，计算移动的距离*/
-				const l = e.clientX - disX;
-				const t = e.clientY - disY;
-
-				/** 移动当前元素*/
-				dragDom.style.left = `${l + styL}px`;
-				dragDom.style.top = `${t + styT}px`;
-
-				/** 刷新提示标签位置*/
-				store.dispatch('training/emitTipFresh');
-
-				/** 将此时的位置传出去*/
-				// binding.value({ x: e.pageX, y: e.pageY });
-			};
-
-			document.onmouseup = function () {
-				document.onmousemove = null;
-				document.onmouseup = null;
-			};
-		};
-	}
-});
-
-/**
- *弹窗宽度拖大,拖小：dialogDragWidth
- * @param {*} el
- * @param {*} binding
- * @param {*} vnode
- * @param {*} oldvNode
- */
-Vue.directive('dialogDragWidth', {
-	bind(el, binding) {
-		const dragDom = binding.value.$el.querySelector('.el-dialog');
-
-		el.onmousedown = (e) => {
-
-			/**  鼠标按下，计算当前元素距离可视区的距离*/
-			const disX = e.clientX - el.offsetLeft;
-
-			document.onmousemove = function (e) {
-				/** 移动时禁用默认事件*/
-				e.preventDefault();
-
-				/** 通过事件委托，计算移动的距离*/
-				const l = e.clientX - disX;
-				dragDom.style.width = `${l}px`;
-			};
-
-			document.onmouseup = function () {
-				document.onmousemove = null;
-				document.onmouseup = null;
-			};
-		};
-	}
-});
-
-/**
- * 弹窗拖拽：v-quickEntryDrag
- * @param {*} el
- * @param {*} binding
- * @param {*} vnode
- * @param {*} oldvNode
- */
-Vue.directive('quickMenuDrag', {
-	bind(el) {
-		const dragDom = el;
-		dragDom.style.cursor = 'move';
-
-		/** 获取原有属性 ie dom元素.currentStyle 火狐谷歌 window.getComputedStyle(dom元素, null);*/
-		const sty = dragDom.currentStyle || window.getComputedStyle(dragDom, null);
-
-		dragDom.onmousedown = (e) => {
-			/**  鼠标按下，计算当前元素距离可视区的距离*/
-			const disX = e.clientX;
-			const disY = e.clientY;
-
-			/**  获取到的值带px 正则匹配替换*/
-			let styL, styT;
-
-			/**  注意在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);
-			} else {
-				styL = +sty.left.replace(/\px/g, '');
-				styT = +sty.top.replace(/\px/g, '');
-			}
-
-			document.onmousemove = function (e) {
-				/** 通过事件委托，计算移动的距离*/
-				const l = e.clientX - disX;
-				const t = e.clientY - disY;
-
-				/** 移动当前元素*/
-				dragDom.style.left = `${l + styL}px`;
-				dragDom.style.top = `${t + styT}px`;
-
-				/** 将此时的位置传出去*/
-				// binding.value({ x: e.pageX, y: e.pageY });
-			};
-
-			document.onmouseup = function () {
-				document.onmousemove = null;
-				document.onmouseup = null;
-			};
-		};
-	}
-});
-
-/**
- *vue-自定义指令-拖拽 v-drag
- */
-Vue.directive('drag', {
-	bind(el) {
-		const dragDom = el.querySelector('.reminder-box');
-		const dragRight = el.querySelector('.drag-right');
-		const dragLeft = el.querySelector('.drag-left');
-		const dragBottom = el.querySelector('.drag-bottom');
-		const dragTop = el.querySelector('.drag-top');
-		const dragBody = el.querySelector('.tip-body');
-		const body = el.querySelector('.tip-body-box');
-
-		dragRight.onmousedown = (e) => {
-			document.onselectstart = function () {
-				return false;
-			};
-			// 宽度拖拽
-			var iEvent = e || event;
-			var disX = iEvent.clientX;
-			var disW = dragDom.offsetWidth;
-			document.onmousemove = function (e) {
-
-				var iEvent = e || event;
-				if (disW + (iEvent.clientX - disX) > 350) {
-					dragDom.style.width = disW + (iEvent.clientX - disX) + 'px';
-				}
-			};
-
-			document.onmouseup = function () {
-				document.onmousemove = null;
-				document.onmouseup = null;
-				document.onselectstart = null;
-			};
-		};
-		dragLeft.onmousedown = (e) => {
-			document.onselectstart = function () {
-				return false;
-			};
-			// 宽度拖拽
-			var iEvent = e || event;
-			var disX = iEvent.clientX;
-			var disW = dragDom.offsetWidth;
-			var OFFLeft = dragDom.offsetLeft;
-			document.onmousemove = function (e) {
-				const iEvent = e || event;
-				const width = disW - (iEvent.clientX - disX);
-				if (width > 350) {
-					dragDom.style.width = disW - (iEvent.clientX - disX) + 'px';
-					dragDom.style.left = OFFLeft + (iEvent.clientX - disX) + 'px';
-				}
-			};
-
-			document.onmouseup = function () {
-				document.onmousemove = null;
-				document.onmouseup = null;
-				document.onselectstart = null;
-			};
-		};
-		dragBottom.onmousedown = (e) => {
-			document.onselectstart = function () {
-				return false;
-			};
-			// 宽度拖拽
-			var iEvent = e || event;
-			var disY = iEvent.clientY;
-			var disH = dragDom.offsetHeight;
-			document.onmousemove = function (e) {
-				var iEvent = e || event;
-				if (disH + (iEvent.clientY - disY) > 200) {
-					dragDom.style.height = disH + (iEvent.clientY - disY) + 'px';
-					body.style.height = disH + (iEvent.clientY - disY) - 40 + 'px';
-					dragBody.style.height = disH + (iEvent.clientY - disY) - 100 + 'px';
-				}
-			};
-
-			document.onmouseup = function () {
-				document.onmousemove = null;
-				document.onmouseup = null;
-				document.onselectstart = null;
-			};
-		};
-		dragTop.onmousedown = (e) => {
-			document.onselectstart = function () {
-				return false;
-			};
-			// 宽度拖拽
-			var iEvent = e || event;
-			var disY = iEvent.clientY;
-			var disH = dragDom.offsetHeight;
-			var OOFTop = dragDom.offsetTop;
-			document.onmousemove = function (e) {
-				var iEvent = e || event;
-				if (disH - (iEvent.clientY - disY) > 200) {
-					dragDom.style.height = disH - (iEvent.clientY - disY) + 'px';
-					body.style.height = disH - (iEvent.clientY - disY) - 40 + 'px';
-					dragBody.style.height = disH - (iEvent.clientY - disY) - 100 + 'px';
-					dragDom.style.top = OOFTop + (iEvent.clientY - disY) + 'px';
-				}
-			};
-
-			document.onmouseup = function () {
-				document.onmousemove = null;
-				document.onmouseup = null;
-				document.onselectstart = null;
-			};
-		};
-	}
-});
diff --git a/src/i18n/langs/en/approval.js b/src/i18n/langs/en/approval.js
new file mode 100644
index 000000000..0625695be
--- /dev/null
+++ b/src/i18n/langs/en/approval.js
@@ -0,0 +1,36 @@
+export default {
+	applicant: 'Applicant',
+	map: 'Map',
+	status: 'Status',
+	unpublished: 'Unpublished',
+	pendingReview: 'PendingReview',
+	releaseSuccess: 'ReleaseSuccess',
+	overrule: 'Overrule',
+	scriptName: 'Script Name',
+	scriptDescription: 'Script Description',
+	applyTime: 'Apply Time',
+	applyPassed: 'Apply Passed',
+	applyReject: 'Apply Reject',
+	scriptPreview: 'Script Preview',
+	passedScript: 'Passed Script',
+	rejectScript: 'Reject Script',
+	explanation: 'Explanation',
+	inputScriptName: 'Please input script name',
+	inputRejectExplanation: 'Please input reject explanation',
+	passedScriptSuccess: 'Passed script success',
+	passedScriptFailed: 'Passed script failed',
+	rejectScriptSuccess: 'Reject script success',
+	rejectScriptFailed: 'Reject script failed',
+	runPlanName: 'Run Plan Name',
+	passedRunPlan: 'Passed Run Plan',
+	rejectRunPlan: 'Reject Run Plan',
+	runPlanPreview: 'RunPlan Preview',
+	inputRunPlanName: 'Please input run plan name',
+	courseDescription: 'Course description',
+	lookOver: 'Look over',
+	courseDetails: 'Course details',
+	instructions: 'Instructions',
+	chapterTrainingName: 'Chapter/training name',
+	revokeScriptSuccess: 'Revoke script success',
+	revokeScriptFailed: 'Revoke script failed'
+};
diff --git a/src/i18n/langs/en/demonstration.js b/src/i18n/langs/en/demonstration.js
index fb0ed6166..eed33a3c8 100644
--- a/src/i18n/langs/en/demonstration.js
+++ b/src/i18n/langs/en/demonstration.js
@@ -1,7 +1,7 @@
 export default {
 	simulationSystem: 'Urban rail transit simulation system',
 	simulationSystemDescription: 'Based on the subway signal system, the urban rail transit simulation system is reformed for the training part, aiming to build a set of professional simulation system for driving demonstration. The system has high flexibility for future expansion and upgrading. Meanwhile, the simulation system has two modes of normal operation and fault operation. Besides normal functional operation, it can also conduct fault simulation of equipment.',
-	simulationName: 'Simulation name:',
+	simulationName: 'Simulation module:',
 	noSimulationProducts: 'No simulation products',
 	productDescription: 'Product description:',
 	startSimulation: 'Start the simulation',
diff --git a/src/i18n/langs/en/display.js b/src/i18n/langs/en/display.js
index 05f482613..04e387d11 100644
--- a/src/i18n/langs/en/display.js
+++ b/src/i18n/langs/en/display.js
@@ -79,6 +79,7 @@ export default {
 	schema: {
 		selectProduct: 'Please select product type',
 		loadScript: 'Load Script',
+		selectRoles: 'Select Roles',
 		previewRunDiagram: 'Preview Run Diagram',
 		loadRunDiagram: 'Load Run Diagram',
 		faultSetting: 'Fault Setting',
@@ -123,6 +124,7 @@ export default {
 		dispatcher: 'Dispatcher',
 		attendant: 'Station',
 		audience: 'Audience',
+		repair: 'Repair',
 		driver: 'Train',
 		none: 'None'
 	},
diff --git a/src/i18n/langs/en/error.js b/src/i18n/langs/en/error.js
index bdbc822f5..a991c67b1 100644
--- a/src/i18n/langs/en/error.js
+++ b/src/i18n/langs/en/error.js
@@ -91,5 +91,8 @@ export default {
 	getRunGraphDataFailed: 'Failed to get run graph data',
 	getStationListFail: 'Failed to get station list',
 	obtainTrainGroupNumberFailed: 'Failed to obtain train group number',
-	getTrainListFailed: 'Failed to get train list'
+	getTrainListFailed: 'Failed to get train list',
+	getDraftCourseDataFailed: 'Failed to get draft course data!',
+	failedToGetCourseData: 'Failed to get course data!',
+	failedToGetSystemData: 'Failed to get system data!'
 };
diff --git a/src/i18n/langs/en/exam.js b/src/i18n/langs/en/exam.js
index 3c42742b3..97fc53ffc 100644
--- a/src/i18n/langs/en/exam.js
+++ b/src/i18n/langs/en/exam.js
@@ -15,20 +15,21 @@ export default {
 	returnToExamList: 'Return to the exam list',
 	totalScore: 'Total score',
 	itemList: 'Item list',
-	courseName: 'Course name',
-	permissionsDetails: 'Permissions for details',
+	courseName: 'Examination subject',
+	permissionsDetails: 'Permission details',
 	buy: 'buy',
 	distributePermission: 'Permission distribution (examination)',
 	viewCoursePapers: 'View course papers',
-	examStartTime: 'Exam start time',
-	theExamIsReadyAnyTime: 'The exam is ready any time',
-	testExplanation: 'Test Explanation',
-	examTimeAvailable: 'Exam time available',
-	fullMarksInTheExam: 'Full marks in the exam',
-	passMarkTheExam: 'Pass mark the exam',
-	examinationRules: 'Examination rules',
+	examStartTime: 'Start time',
+	theExamIsReadyAnyTime: 'Anytime you are available',
+	minutes: 'min',
+	testExplanation: 'Notes',
+	examTimeAvailable: 'Duration',
+	fullMarksInTheExam: 'Full marks',
+	passMarkTheExam: 'Passing score',
+	examinationRules: 'Rules',
 	trainingType: 'Training type',
-	numberOfQuestions: 'Number of questions',
+	numberOfQuestions: 'Quantity',
 	score: 'Score',
 	startTheExam: 'Start the exam',
 	examinationTiming: 'Examination timing',
diff --git a/src/i18n/langs/en/global.js b/src/i18n/langs/en/global.js
index 8713028b8..14dc8c063 100644
--- a/src/i18n/langs/en/global.js
+++ b/src/i18n/langs/en/global.js
@@ -40,7 +40,7 @@ export default {
 	mobile: 'mobile',
 	name: 'Name',
 	code: 'Code',
-	status: 'Status',
+	status: 'State',
 	remarks: 'Remarks',
 	selectionTime: 'Selection of time',
 	permissionNumber: 'Number of permissions',
@@ -56,11 +56,11 @@ export default {
 	transferScreenPermission: 'Large screen rights transfer',
 	today: 'Today',
 	total: 'Total',
-	index: 'Indexes',
-	startTime: 'Start time',
-	endTime: 'End time',
-	isForever: 'Forever',
-	remains: 'Remainder',
+	index: 'Index',
+	startTime: 'Start',
+	endTime: 'End',
+	isForever: 'Timelimit',
+	remains: 'Remaining',
 	hasPermissionTip: 'Public permission is {0}, private permission is {1}',
 	create: 'Create',
 	update: 'Update',
@@ -158,5 +158,6 @@ export default {
 	processFailure: 'Process failure',
 	enterLastStep: 'Please enter a hint and click next',
 	pleaseOpearte: 'Please proceed',
-	help: 'help'
+	help: 'help',
+	city: 'City'
 };
diff --git a/src/i18n/langs/en/index.js b/src/i18n/langs/en/index.js
index 15a13f953..6a41b8f3e 100644
--- a/src/i18n/langs/en/index.js
+++ b/src/i18n/langs/en/index.js
@@ -24,6 +24,8 @@ import joinTraining from './joinTraining';
 import trainRoom from './trainRoom';
 import menu from './menu';
 import ibp from './ibp';
+import approval from './approval';
+import systemGenerate from './systemGenerate';
 
 export default {
 	...enLocale,
@@ -51,5 +53,7 @@ export default {
 	joinTraining,
 	trainRoom,
 	menu,
-	ibp
+	ibp,
+	approval,
+	systemGenerate
 };
diff --git a/src/i18n/langs/en/lesson.js b/src/i18n/langs/en/lesson.js
index 36b0bda49..76a476b97 100644
--- a/src/i18n/langs/en/lesson.js
+++ b/src/i18n/langs/en/lesson.js
@@ -102,5 +102,19 @@ export default {
 	train: 'Train',
 	station: 'Station',
 	trainWindow: 'Train window',
-	editStepInfo: 'Edit step information'
+	editStepInfo: 'Edit step information',
+	trainingRecord: 'Training recording',
+	lesson: 'Lesson',
+	taskManage: 'Task manage',
+	trainingRule: 'Training rule',
+	trainingManage: 'Training manage',
+	newConstruction: 'New',
+	applicationForRelease: 'Application for release',
+	rejectReason: 'Reason for rejection',
+	withdraw: 'Withdraw',
+	notRelease: 'Not release',
+	pendingReview: 'Pending review',
+	published: 'Published',
+	rejected: 'Rejected',
+	review: 'Review'
 };
diff --git a/src/i18n/langs/en/map.js b/src/i18n/langs/en/map.js
index a2ea05ea2..0e09fc04c 100644
--- a/src/i18n/langs/en/map.js
+++ b/src/i18n/langs/en/map.js
@@ -11,6 +11,7 @@ export default {
 	saveMapAs: 'Save the map as',
 	create: 'establish',
 	dataVerification: 'data verification',
+	edit3d: '3D editor',
 	logicalView: 'logical view',
 	physicalView: 'Physical view',
 	mixedView: 'The mixed view',
diff --git a/src/i18n/langs/en/menu.js b/src/i18n/langs/en/menu.js
index 8026f15ff..fab47a954 100644
--- a/src/i18n/langs/en/menu.js
+++ b/src/i18n/langs/en/menu.js
@@ -491,5 +491,6 @@ export default {
 	settingTrain: 'Setting train',
 	sourceTrainWindow: 'Source train window',
 	trainWindow: 'Train window',
-	targetTrainWindow: 'Target train window'
+	targetTrainWindow: 'Target train window',
+	category: 'category'
 };
diff --git a/src/i18n/langs/en/planMonitor.js b/src/i18n/langs/en/planMonitor.js
index 9c71b2747..a6753ffdb 100644
--- a/src/i18n/langs/en/planMonitor.js
+++ b/src/i18n/langs/en/planMonitor.js
@@ -1,16 +1,16 @@
 export default {
 	updateStation: {
-		level1: 'level one: ',
-		level2: 'level two: ',
-		level3: 'level three: ',
-		level4: 'level four: ',
-		level5: 'level five: ',
+		level1: 'level1: ',
+		level2: 'level2: ',
+		level3: 'level3: ',
+		level4: 'level4: ',
+		level5: 'level5: ',
 		updateData: 'Update data',
-		pleaseInputLevel1: 'Please input level one',
-		pleaseInputLevel2: 'Please input level two',
-		pleaseInputLevel3: 'Please input level three',
-		pleaseInputLevel4: 'Please input level four',
-		pleaseInputLevel5: 'Please input level five',
+		pleaseInputLevel1: 'Please input level1',
+		pleaseInputLevel2: 'Please input level2',
+		pleaseInputLevel3: 'Please input level3',
+		pleaseInputLevel4: 'Please input level4',
+		pleaseInputLevel5: 'Please input level5',
 		systemOutPut: 'System output',
 		selectPrintArea: 'Selec print area',
 		selectDeleteRoute: 'Select delete route',
@@ -229,5 +229,9 @@ export default {
 	editPlanningTrain: 'Edit planning train',
 	runGraphName: 'Run graph name',
 	tipOperationTime: '请先设置区段站间运行时间, 【文件】-> 【修改站间运行时间】',
-	serverTrainNum: '表号车次号'
+	serverTrainNum: '表号车次号',
+	explanation: 'Explanation',
+	creationDate: 'Creation date',
+	load: 'Load',
+	modifyName: 'Modify name'
 };
diff --git a/src/i18n/langs/en/router.js b/src/i18n/langs/en/router.js
index daff10210..18e6cba42 100644
--- a/src/i18n/langs/en/router.js
+++ b/src/i18n/langs/en/router.js
@@ -7,6 +7,9 @@ export default {
 	runPlanManage: 'Run plan',
 	productEdit: 'Product editor',
 
+	designhomePage: 'Public map',
+	designUserPage: 'Personal map',
+
 	lessaonManage: 'Lesson',
 	lessonEdit: 'Lesson editor',
 	trainingRecord: 'Trainning recording',
@@ -58,5 +61,11 @@ export default {
 	userExamManage: 'User examination management',
 	userSimulationManage: 'User simulation management',
 	existingSimulation: 'Existence simulation management',
-	ibpDraw: 'ibp Draw'
+	ibpDraw: 'Ibp Draw',
+	trainingPlatform: 'trainingPlatform',
+	releaseApplication: 'Release application',
+	courseApplication: 'Course release application',
+	scriptReleaseApplication: 'Script release application',
+	runGraphReleaseApplication: 'Run graph release application',
+	subsystemGeneration: 'Subsystem generation'
 };
diff --git a/src/i18n/langs/en/rules.js b/src/i18n/langs/en/rules.js
index bc5b682c8..fc4e61559 100644
--- a/src/i18n/langs/en/rules.js
+++ b/src/i18n/langs/en/rules.js
@@ -239,9 +239,9 @@ export default {
 	selectOneTrainingType: 'Only one training type can be selected',
 	enterProductType: 'Please enter product type',
 	selectAssociatedStation: 'Please select the associated station',
-	pleaseSelectTrainDir: '请选择列车所在方向',
-	pleaseEnterSplit: '请输入拆分数量',
-	pleaseEnterSplitNumber: '请输入合理的拆分数量',
+	pleaseSelectTrainDir: 'Please select the direction of the train',
+	pleaseEnterSplit: 'Please enter the split number',
+	pleaseEnterSplitNumber: 'Please enter a reasonable number of split',
 	enterScale: 'Please enter the zoom ratio',
 	enterXOffset: 'Please enter X offset',
 	enterYOffset: 'Please enter Y offset',
@@ -276,7 +276,7 @@ export default {
 	accessNumber: 'Please input the number of permissions',
 	courseNameEmpty: 'Course name cannot be empty',
 	purchaseMonth: 'Please input the number of months to buy',
-	pleaseEnterGoodPrice: '请输入商品价格',
+	pleaseEnterGoodPrice: 'Please enter the price of the goods',
 	enterTheNameOfTheRunGraph: 'Please enter the name of the run graph',
 	chooseToPublishTheRunGraph: 'Please choose to publish the run chart',
 	enterTheAlarmCode: 'Please enter the alarm code',
@@ -306,5 +306,6 @@ export default {
 	enterTheKeyWidth: 'Please enter the key width',
 	enterTheKeyDirection: 'Please select the key direction',
 	enterTheUpperText: 'Please enter the upper text',
-	enterTheLowerText: 'Please enter the lower text'
+	enterTheLowerText: 'Please enter the lower text',
+	enterRejectReason: 'Please enter reject reason'
 };
diff --git a/src/i18n/langs/en/scriptRecord.js b/src/i18n/langs/en/scriptRecord.js
index 9727c3b75..165e3dd22 100644
--- a/src/i18n/langs/en/scriptRecord.js
+++ b/src/i18n/langs/en/scriptRecord.js
@@ -4,6 +4,7 @@ export default {
 	saveData: 'Save Data',
 	mapList: 'Map List',
 	createScript: 'Create Script',
+	modifyScript: 'Modify Script',
 	scriptName: 'Script Name',
 	addScript: 'Add Script',
 	map: 'Map',
@@ -15,6 +16,7 @@ export default {
 	createScriptFail: 'Create script failure',
 	scriptDetail: 'Script Detail',
 	scriptRecord: 'Edit',
+	scriptCreate: 'Create',
 	scriptModify: 'Modify',
 	scriptDelete: 'Delete',
 	getScriptFail: 'Get script information failure',
@@ -81,7 +83,25 @@ export default {
 	scriptBack: 'Back',
 	speakTo: 'to',
 	executeCommandTips: 'execute command: ',
+	operate: 'Operate',
+	scriptList: 'Script List',
+	applyPublish: 'Apply for release',
+	preview: 'Preview',
+	status: 'Status',
+	applyRevoke: 'Revoke',
+	publish: 'Publish',
+	revokeReason: 'Revoke explanation',
 	language: 'language',
 	chinese: 'Chinese Simplified',
-	english: 'English'
+	english: 'English',
+	publishScript: 'Publish Script',
+	releaseScriptSuccess: 'release script success',
+	releaseScriptFailed: 'release script failed',
+	publishScriptSuccess: 'Publish Script Success',
+	publishScriptFailed: 'Publish Script Failed',
+	releaseScriptTip: 'This action will apply to release script, whether to continue?',
+	revokeScriptTip: 'This action will undo release script, whether to continue?',
+	inputScriptName: 'Please input script name',
+	selectMap: 'Please select map',
+	inputScriptDescription: 'Please input script description'
 };
diff --git a/src/i18n/langs/en/systemGenerate.js b/src/i18n/langs/en/systemGenerate.js
new file mode 100644
index 000000000..c47b10e42
--- /dev/null
+++ b/src/i18n/langs/en/systemGenerate.js
@@ -0,0 +1,30 @@
+export default {
+	map: 'Map',
+	mapName: 'Map Name',
+	prdName: 'Product Name',
+	name: 'Name',
+	type: 'Type',
+	updateData: 'Modify',
+	generate: 'Generate',
+	selectMap: 'Please select map',
+	generateSuccess: 'The subsystem under the map is generated successfully!',
+	generateFail: 'The subsystem under the map failed to generate!',
+	inputName: 'Please input  subsystem name',
+	selectType: 'Please select type',
+	selectPrdName: 'Please select product name',
+	createSubSystem: 'Commission SubSystem',
+	modifySubSystem: 'Modify SubSystem',
+	commission: 'Commission',
+	customized: 'Project',
+	selectProject: 'Please select project',
+	createMapSystemSuccess: 'Create map system success',
+	createMapSystemFail: 'Create map system failed',
+	getSubSystemInfoFail: 'Get subsystem infomation failed',
+	updateMapSystemSuccess: 'Update map system success',
+	updateMapSystemFail: 'Update map system failed',
+	generation: 'One-click Generation',
+	deleteData: 'Delete',
+	deleteMapSystemSuccess: 'Delete map system success',
+	deleteMapSystemFail: 'Delete map system fail',
+	deleteMapSystemTip: 'This action will apply to delete map system, whether to continue?'
+};
diff --git a/src/i18n/langs/en/tip.js b/src/i18n/langs/en/tip.js
index bededf99e..0906d6b29 100644
--- a/src/i18n/langs/en/tip.js
+++ b/src/i18n/langs/en/tip.js
@@ -198,5 +198,12 @@ export default {
 	runGraphNameModifiedSuccessfully: 'Run graph name modified successfully!',
 	modifyRunGraphNameFailed: 'Modify run graph name failed!',
 	planCreationSuccessful: 'Plan creation successful!',
-	createPlanFailed: 'Failed to create plan!'
+	createPlanFailed: 'Failed to create plan!',
+	cancelCoursePublicationHint: 'This action will cancel the course publication application, is it OK?',
+	cancelTheSuccessfulApplicationOfTheCourseRelease: 'Cancel the successful application of the course release!',
+	cancellationOfCoursePublicationApplicationFailed: 'Cancellation of course publication application failed!',
+	publishTheCourseHint: 'This operation will publish the course. Are you sure?',
+	rejectedCourseReleaseApplicationSuccessful: 'Rejected course release application successful!',
+	rejectedCourseReleaseApplicationFailed: 'Rejected course release application failed!',
+	duplicatePlanFailedTips: 'The interval needs to be more than 30 seconds or the times is more than 1'
 };
diff --git a/src/i18n/langs/zh/approval.js b/src/i18n/langs/zh/approval.js
new file mode 100644
index 000000000..db8c4db95
--- /dev/null
+++ b/src/i18n/langs/zh/approval.js
@@ -0,0 +1,37 @@
+export default {
+	applicant: '申请人',
+	map: '地图',
+	status: '状态',
+	unpublished: '未发布',
+	pendingReview: '待审核',
+	releaseSuccess: '发布成功',
+	overrule: '驳回',
+	scriptName: '剧本名称',
+	scriptDescription: '剧本简介',
+	applyTime: '申请时间',
+	applyPassed: '通过',
+	applyReject: '驳回',
+	scriptPreview: '预览',
+	passedScript: '通过剧本',
+	rejectScript: '驳回剧本',
+	explanation: '驳回说明',
+	inputScriptName: '请输入剧本名称',
+	inputRejectExplanation: '请输入驳回说明',
+	passedScriptSuccess: '通过剧本成功',
+	passedScriptFailed: '通过剧本失败',
+	rejectScriptSuccess: '驳回剧本成功',
+	rejectScriptFailed: '驳回剧本失败',
+	runPlanName: '运行图名称',
+	passedRunPlan: '通过运行图',
+	rejectRunPlan: '驳回运行图',
+	runPlanPreview: '预览',
+	inputRunPlanName: '请输入运行图名称',
+	courseDescription: '课程说明',
+	lookOver: '查看',
+	courseDetails: '课程详情',
+	instructions: '说明',
+	chapterTrainingName: '章节/课程名称',
+	revokeScriptSuccess: '撤回成功',
+	revokeScriptFailed: '撤回失败'
+
+};
diff --git a/src/i18n/langs/zh/display.js b/src/i18n/langs/zh/display.js
index d60dc39e6..219c09bd7 100644
--- a/src/i18n/langs/zh/display.js
+++ b/src/i18n/langs/zh/display.js
@@ -79,6 +79,7 @@ export default {
 	schema: {
 		selectProduct: '请选择产品类型',
 		loadScript: '加载剧本',
+		selectRoles: '选择角色',
 		previewRunDiagram: '运行图预览',
 		loadRunDiagram: '运行图加载',
 		faultSetting: '故障设置',
@@ -123,6 +124,7 @@ export default {
 		dispatcher: '行调',
 		attendant: '车站',
 		audience: '观众',
+		repair: '通号',
 		driver: '列车',
 		none: '无'
 	},
diff --git a/src/i18n/langs/zh/error.js b/src/i18n/langs/zh/error.js
index 2c53da998..cd065c76d 100644
--- a/src/i18n/langs/zh/error.js
+++ b/src/i18n/langs/zh/error.js
@@ -91,5 +91,8 @@ export default {
 	getRunGraphDataFailed: '获取运行图数据失败',
 	getStationListFail: '获取车站列表失败',
 	obtainTrainGroupNumberFailed: '获取列车车组号失败',
-	getTrainListFailed: '获取列车列表失败'
+	getTrainListFailed: '获取列车列表失败',
+	getDraftCourseDataFailed: '获取草稿课程数据失败！',
+	failedToGetCourseData: '获取课程数据失败！',
+	failedToGetSystemData: '获取系统数据失败！'
 };
diff --git a/src/i18n/langs/zh/exam.js b/src/i18n/langs/zh/exam.js
index 70ce7b59c..970e474e7 100644
--- a/src/i18n/langs/zh/exam.js
+++ b/src/i18n/langs/zh/exam.js
@@ -22,6 +22,7 @@ export default {
 	viewCoursePapers: '查看课程试卷',
 	nameOfTestPaper: '试卷名称',
 	examStartTime: '考试时间',
+	minutes: '分钟',
 	theExamIsReadyAnyTime: '随时都可以考试',
 	testExplanation: '考试说明',
 	examTimeAvailable: '考试时长',
diff --git a/src/i18n/langs/zh/global.js b/src/i18n/langs/zh/global.js
index 5e1b92ba7..801450af3 100644
--- a/src/i18n/langs/zh/global.js
+++ b/src/i18n/langs/zh/global.js
@@ -158,6 +158,6 @@ export default {
 	processFailure: '处理失败',
 	enterLastStep: '请输入提示并点击下一步',
 	pleaseOpearte: '请开始操作',
-	help: '帮助'
-
+	help: '帮助',
+	city: '城市'
 };
diff --git a/src/i18n/langs/zh/index.js b/src/i18n/langs/zh/index.js
index da016c94d..c84bf1120 100644
--- a/src/i18n/langs/zh/index.js
+++ b/src/i18n/langs/zh/index.js
@@ -24,6 +24,8 @@ import joinTraining from './joinTraining';
 import trainRoom from './trainRoom';
 import menu from './menu';
 import ibp from './ibp';
+import approval from './approval';
+import systemGenerate from './systemGenerate';
 
 export default {
 	...cnLocale,
@@ -51,5 +53,7 @@ export default {
 	joinTraining,
 	trainRoom,
 	menu,
-	ibp
+	ibp,
+	approval,
+	systemGenerate
 };
diff --git a/src/i18n/langs/zh/lesson.js b/src/i18n/langs/zh/lesson.js
index 85e3d108e..b0978644a 100644
--- a/src/i18n/langs/zh/lesson.js
+++ b/src/i18n/langs/zh/lesson.js
@@ -101,6 +101,21 @@ export default {
 	train: '列车',
 	station: '车站',
 	trainWindow: '车次窗',
-	countSkinCode: '复制皮肤与被复制皮肤类型不能一样'
+	countSkinCode: '复制皮肤与被复制皮肤类型不能一样',
+	trainingRecord: '实训录制',
+	lesson: '课程',
+	taskManage: '任务管理',
+	trainingRule: '操作定义',
+	trainingManage: '实训管理',
+	newConstruction: '新建',
+	applicationForRelease: '申请发布',
+	rejectReason: '驳回原因',
+	withdraw: '撤销',
+	notRelease: '未发布',
+	pendingReview: '待审核',
+	published: '已发布',
+	rejected: '已驳回',
+	review: '查看'
+
 };
 
diff --git a/src/i18n/langs/zh/map.js b/src/i18n/langs/zh/map.js
index 0caac8094..dbfefb015 100644
--- a/src/i18n/langs/zh/map.js
+++ b/src/i18n/langs/zh/map.js
@@ -12,6 +12,7 @@ export default {
 	saveMapAs: '地图另存为',
 	create: '创建',
 	dataVerification: '数据校验',
+	edit3d: '三维编辑',
 	logicalView: '逻辑视图',
 	physicalView: '物理视图',
 	mixedView: '混合视图',
@@ -116,7 +117,7 @@ export default {
 	editAutoRouting: '编辑自动信号',
 	setSwitch: '联动道岔',
 	pathUnit: '路径单元',
-	jlmap3d: '三维化编辑',
+	jlmap3d: '三维编辑',
 
 	automaticSignalList: '自动信号列表',
 	automaticSignalCode: '自动信号编码',
diff --git a/src/i18n/langs/zh/menu.js b/src/i18n/langs/zh/menu.js
index 21ca42c26..c4cd66d80 100644
--- a/src/i18n/langs/zh/menu.js
+++ b/src/i18n/langs/zh/menu.js
@@ -487,6 +487,7 @@ export default {
 	settingTrain: '设置列车',
 	sourceTrainWindow: '源车次窗',
 	trainWindow: '车次窗',
-	targetTrainWindow: '目的车次窗'
+	targetTrainWindow: '目的车次窗',
+	category: '类别'
 
 };
diff --git a/src/i18n/langs/zh/planMonitor.js b/src/i18n/langs/zh/planMonitor.js
index e00dbe117..1bd84440d 100644
--- a/src/i18n/langs/zh/planMonitor.js
+++ b/src/i18n/langs/zh/planMonitor.js
@@ -232,5 +232,9 @@ export default {
 	endTime: '终到时间',
 	editPlanningTrain: '编辑计划车',
 	tipOperationTime: '请先设置区段站间运行时间, 【文件】-> 【修改站间运行时间】',
-	serverTrainNum: '表号车次号'
+	serverTrainNum: '表号车次号',
+	explanation: '驳回说明',
+	creationDate: '创建日期',
+	load: '加载',
+	modifyName: '修改名称'
 };
diff --git a/src/i18n/langs/zh/router.js b/src/i18n/langs/zh/router.js
index 118b85442..8fea8e837 100644
--- a/src/i18n/langs/zh/router.js
+++ b/src/i18n/langs/zh/router.js
@@ -1,6 +1,9 @@
 export default {
 	homePage: '首页',
 
+	designhomePage: '公共地图',
+	designUserPage: '个人地图',
+
 	mapManage: '地图管理',
 	skinManage: '皮肤管理',
 	mapDraw: '地图绘制',
@@ -59,5 +62,11 @@ export default {
 	userSimulationManage: '用户仿真统计',
 	existingSimulation: '存在仿真管理',
 
-	ibpDraw: 'Ibp盘绘制'
+	ibpDraw: 'Ibp盘绘制',
+	trainingPlatform: '实训平台',
+	releaseApplication: '发布申请',
+	courseApplication: '课程发布申请',
+	scriptReleaseApplication: '剧本发布申请',
+	runGraphReleaseApplication: '运行图发布申请',
+	subsystemGeneration: '子系统生成'
 };
diff --git a/src/i18n/langs/zh/rules.js b/src/i18n/langs/zh/rules.js
index c91b14297..022b62002 100644
--- a/src/i18n/langs/zh/rules.js
+++ b/src/i18n/langs/zh/rules.js
@@ -308,5 +308,6 @@ export default {
 	enterTheKeyWidth: '请输入钥匙宽度',
 	selectTheKeyDirection: '请选择钥匙朝向',
 	enterTheUpperText: '请输入上侧文字',
-	enterTheLowerText: '请输入下侧文字'
+	enterTheLowerText: '请输入下侧文字',
+    enterRejectReason: '请输入驳回说明'
 };
diff --git a/src/i18n/langs/zh/scriptRecord.js b/src/i18n/langs/zh/scriptRecord.js
index 89eb76ee4..5f93c5a3e 100644
--- a/src/i18n/langs/zh/scriptRecord.js
+++ b/src/i18n/langs/zh/scriptRecord.js
@@ -4,6 +4,7 @@ export default {
 	saveData: '保存数据',
 	mapList: '地图列表',
 	createScript: '创建剧本',
+	modifyScript: '修改剧本',
 	scriptName: '剧本名称',
 	addScript: '添加剧本',
 	map: '所属地图',
@@ -15,6 +16,7 @@ export default {
 	createScriptFail: '创建剧本失败',
 	scriptDetail: '剧本详情',
 	scriptRecord: '编制',
+	scriptCreate: '创建',
 	scriptModify: '修改',
 	scriptDelete: '删除',
 	getScriptFail: '获取剧本信息失败',
@@ -82,7 +84,25 @@ export default {
 	scriptBack: '返回',
 	speakTo: '对',
 	executeCommandTips: '执行指令: ',
+	operate: '操作',
+	scriptList: '剧本列表',
+	applyPublish: '申请发布',
+	preview: '预览',
+	status: '状态',
+	applyRevoke: '撤回',
+	publish: '发布',
+	revokeReason: '驳回原因',
 	language: '语言',
 	chinese: '中文',
-	english: '英文'
+	english: '英文',
+	publishScript: '发布剧本',
+	releaseScriptSuccess: '申请发布成功',
+	releaseScriptFailed: '申请发布失败',
+	publishScriptSuccess: '发布成功',
+	publishScriptFailed: '发布失败',
+	releaseScriptTip: '此操作将申请发布剧本, 是否继续?',
+	revokeScriptTip: '此操作将撤销发布剧本申请, 是否继续?',
+	inputScriptName: '请输入剧本',
+	selectMap: '请选择地图',
+	inputScriptDescription: '请输入剧本描述'
 };
diff --git a/src/i18n/langs/zh/systemGenerate.js b/src/i18n/langs/zh/systemGenerate.js
new file mode 100644
index 000000000..059145485
--- /dev/null
+++ b/src/i18n/langs/zh/systemGenerate.js
@@ -0,0 +1,31 @@
+export default {
+	map: '地图',
+	mapName: '地图名称',
+	prdName: '产品名称',
+	name: '名称',
+	type: '类型',
+	updateData: '更新',
+	generate: '生成',
+	selectMap: '请选择地图',
+	generateSuccess: '生成该地图下子系统成功！',
+	generateFail: '生成该地图下子系统失败！',
+	inputName: '请输入子系统名称',
+	selectType: '请选择类型',
+	selectPrdName: '请选择产品名称',
+	createSubSystem: '定制子系统',
+	modifySubSystem: '修改子系统',
+	commission: '定制',
+	customized: '项目',
+	selectProject: '请选择项目',
+	createMapSystemSuccess: '创建地图系统成功',
+	createMapSystemFail: '创建地图系统失败',
+	getSubSystemInfoFail: '获取子系统信息失败',
+	updateMapSystemSuccess: '更新地图系统成功',
+	updateMapSystemFail: '更新地图系统失败',
+	generation: '一键生成',
+	deleteData: '删除',
+	deleteMapSystemSuccess: '删除地图系统成功',
+	deleteMapSystemFail: '删除地图系统失败',
+	deleteMapSystemTip: '此操作将删除地图系统, 是否继续?'
+
+};
diff --git a/src/i18n/langs/zh/tip.js b/src/i18n/langs/zh/tip.js
index 79890a85e..a84170e28 100644
--- a/src/i18n/langs/zh/tip.js
+++ b/src/i18n/langs/zh/tip.js
@@ -198,5 +198,12 @@ export default {
 	runGraphNameModifiedSuccessfully: '修改运行图名称成功！',
 	modifyRunGraphNameFailed: '修改运行图名称失败！',
 	planCreationSuccessful: '创建计划成功！',
-	createPlanFailed: '创建计划失败！'
+	createPlanFailed: '创建计划失败！',
+	cancelCoursePublicationHint: '此操作将撤销课程发布申请，是否确定？',
+	cancelTheSuccessfulApplicationOfTheCourseRelease: '撤销课程发布申请成功！',
+	cancellationOfCoursePublicationApplicationFailed: '撤销课程发布申请失败！',
+	publishTheCourseHint: '此操作将发布课程，是否确定？',
+	rejectedCourseReleaseApplicationSuccessful: '驳回课程发布申请成功！',
+	rejectedCourseReleaseApplicationFailed: '驳回课程发布申请失败！',
+	duplicatePlanFailedTips: '间隔时间需要大于30秒或次数大于1'
 };
diff --git a/src/jlmap3d/edit/Jlmap3ddata.js b/src/jlmap3d/edit/Jlmap3ddata.js
index b9a37d365..e93eaa0af 100644
--- a/src/jlmap3d/edit/Jlmap3ddata.js
+++ b/src/jlmap3d/edit/Jlmap3ddata.js
@@ -154,7 +154,7 @@ export function Jlmap3ddata(mapid,scope){
       })
       .then(function(data){
         //console.log(data);
-        return   jlmap3ddata.signallist.loadpromise(signaldata,scene,assetloader);
+        return   jlmap3ddata.signallist.loadpromise(signaldata,scene,assetloader,mapdata.signalList);
       })
       .then(function(data){
         //console.log(data);
diff --git a/src/jlmap3d/edit/connect/getmodels.js b/src/jlmap3d/edit/connect/getmodels.js
index dffc3782b..c8e2619ea 100644
--- a/src/jlmap3d/edit/connect/getmodels.js
+++ b/src/jlmap3d/edit/connect/getmodels.js
@@ -48,7 +48,8 @@ export function getmodels(data) {
           rightlist:data.mapdata.linklist.linksgroup.children[i].rightlist,
           leftlist:data.mapdata.linklist.linksgroup.children[i].leftlist,
           lp:data.mapdata.linklist.linksgroup.children[i].lp,
-          rp:data.mapdata.linklist.linksgroup.children[i].rp
+          rp:data.mapdata.linklist.linksgroup.children[i].rp,
+          rail:data.mapdata.linklist.linksgroup.children[i].rail,
         }
         links.push(link);
       }
@@ -57,6 +58,7 @@ export function getmodels(data) {
       //section隧道
       console.log(data.mapdata.sectionlist.sections);
       let sections = [];
+
       for(let i=0;i<data.mapdata.sectionlist.sections.datalist.length;i++){
         let section = {
           uuid:data.mapdata.sectionlist.sections.modellist[i].uuid,
@@ -80,6 +82,7 @@ export function getmodels(data) {
 
         sections.push(section);
       }
+          console.log(links);
       let arrray = {
           link:links,
           section:sections,
diff --git a/src/jlmap3d/edit/editmodel/LinkList.js b/src/jlmap3d/edit/editmodel/LinkList.js
index 5f4183aa0..094c78b95 100644
--- a/src/jlmap3d/edit/editmodel/LinkList.js
+++ b/src/jlmap3d/edit/editmodel/LinkList.js
@@ -89,7 +89,7 @@ function linkhelp(data,scene){
       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-29;
+          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();
@@ -208,7 +208,7 @@ function linkhelp(data,scene){
 
         let testmesh2 = autorail.clone(true);
         for(let i=0;i<autorail.rightlist.length;i++){
-						testmesh2.geometry.attributes.position.array[autorail.rightlist[i]*3] = len-26;
+						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();
@@ -240,11 +240,11 @@ function linkhelp(data,scene){
             let rotenum = axixnow.angleTo(axix);
             //不同坐标系方向值不同
             if(data.lp.y>data.rp.y){
-              testmesh2.rotation.z = 0.197;
+              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.197;
+              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{
@@ -272,11 +272,11 @@ function linkhelp(data,scene){
             let rotenum = axixnow.angleTo(axix);
             //不同坐标系方向值不同
             if(data.lp.y>data.rp.y){
-              testmesh2.rotation.z = 0.197;
+              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.197;
+              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);
             }
diff --git a/src/jlmap3d/edit/editmodel/RailList.js b/src/jlmap3d/edit/editmodel/RailList.js
index 16ee771f5..03c688bed 100644
--- a/src/jlmap3d/edit/editmodel/RailList.js
+++ b/src/jlmap3d/edit/editmodel/RailList.js
@@ -15,7 +15,7 @@ export function RailList(){
 
     let raillink = mapdata.linklist.linksgroup.children;
     for(let i=0;i<raillink.length;i++){
-      var geometry = new THREE.PlaneBufferGeometry( raillink[i].lengthfact-20.5, 0.1, 0.1 );
+      var geometry = new THREE.PlaneBufferGeometry( raillink[i].lengthfact-25, 0.1, 0.1 );
       var material = new THREE.MeshBasicMaterial( {color: 0xffff00, side: THREE.DoubleSide} );
       var plane = new THREE.Mesh( geometry, material );
       plane.position.x = raillink[i].position.x;
@@ -29,15 +29,23 @@ export function RailList(){
       var geometry2 = new THREE.CircleBufferGeometry( 1, 16 );
       var material2 = new THREE.MeshBasicMaterial( { color: 0xff2000 } );
       var circle1 = new THREE.Mesh( geometry1, material1 );
-      circle1.position.x = plane.position.x + (raillink[i].lengthfact-20.5)/2*Math.cos(plane.rotation.z);
-			circle1.position.z = plane.position.z - (raillink[i].lengthfact-20.5)/2*Math.sin(plane.rotation.z);
+      circle1.position.x = plane.position.x + (raillink[i].lengthfact-25)/2*Math.cos(plane.rotation.z);
+			circle1.position.z = plane.position.z - (raillink[i].lengthfact-25)/2*Math.sin(plane.rotation.z);
 			circle1.rotation.x = -Math.PI/2;
+
       scene.add( circle1 );
 
       var circle2 = new THREE.Mesh( geometry2, material2 );
-      circle2.position.x = plane.position.x - (raillink[i].lengthfact-20.5)/2*Math.cos(plane.rotation.z);
-			circle2.position.z = plane.position.z + (raillink[i].lengthfact-20.5)/2*Math.sin(plane.rotation.z);
+      circle2.position.x = plane.position.x - (raillink[i].lengthfact-25)/2*Math.cos(plane.rotation.z);
+			circle2.position.z = plane.position.z + (raillink[i].lengthfact-25)/2*Math.sin(plane.rotation.z);
 			circle2.rotation.x = -Math.PI/2;
+      mapdata.linklist.linksgroup.children[i].rail = [{
+        x:circle2.position.x,
+        z:circle2.position.z
+      },{
+        x:circle1.position.x,
+        z:circle1.position.z
+      }];
       scene.add( circle2 );
       scene.add( plane );
     }
@@ -51,6 +59,8 @@ export function RailList(){
 			circle1.rotation.x = -Math.PI/2;
       scene.add( circle1 );
     }
+
+
   };
 
   this.getrail = function(){
diff --git a/src/jlmap3d/edit/editmodel/SectionList.js b/src/jlmap3d/edit/editmodel/SectionList.js
index aad586362..369528b35 100644
--- a/src/jlmap3d/edit/editmodel/SectionList.js
+++ b/src/jlmap3d/edit/editmodel/SectionList.js
@@ -6,11 +6,11 @@ export function SectionList() {
 
   this.type = "sectionlist";
 
-  let sectiongroup = new THREE.Group();
-  sectiongroup.name = "section";
+  this.sectiongroup = new THREE.Group();
+  this.sectiongroup.name = "section";
 
-  let switchgroup = new THREE.Group();
-  switchgroup.name = "switch";
+  this.switchgroup = new THREE.Group();
+  this.switchgroup.name = "switch";
 
   this.sections = {
     datalist:[],
@@ -24,8 +24,8 @@ export function SectionList() {
 
   this.initpromise = function(jlmap3ddata,assetloader,sectiondata,switchdata,scene){
     return new Promise(function(resolve, reject){
-      scene.add(sectiongroup);
-      scene.add(switchgroup);
+      scene.add(scope.sectiongroup);
+      scene.add(scope.switchgroup);
       let linkdata = jlmap3ddata.linklist;
       //遍历区段
       for(let i=0;i<sectiondata.length;i++){
@@ -187,7 +187,7 @@ export function SectionList() {
           testswitch.position.z = switchposz;
 
           scope.switchs.modellist.push(testswitch);
-          switchgroup.add(testswitch);
+          scope.switchgroup.add(testswitch);
         }
 
         resolve("loadersection");
@@ -271,8 +271,8 @@ export function SectionList() {
   this.loadpromise = function(jlmap3ddata,assetloader,sectiondata,switchdata,scene){
     return new Promise(function(resolve, reject){
       console.log(sectiondata);
-      scene.add(sectiongroup);
-      scene.add(switchgroup);
+      scene.add(scope.sectiongroup);
+      scene.add(scope.switchgroup);
       let linkdata = jlmap3ddata.linklist;
 
       for(let i=0;i<sectiondata.length;i++){
@@ -347,12 +347,12 @@ export function SectionList() {
 
 
         if(testmesh1.isStandTrack == false){
-          sectiongroup.add(testmesh1);
+          // scope.sectiongroup.add(testmesh1);
 
         }else{
           scope.standtrack.push(testmesh1);
           var box = new THREE.BoxHelper( testmesh1, 0xff0000 );
-          sectiongroup.add( box );
+          // scope.sectiongroup.add( box );
         }
         scope.sections.modellist.push(testmesh1);
       }
@@ -367,7 +367,8 @@ export function SectionList() {
           switchmesh2 = assetloader.modellist[i].mesh;
         }
       }
-
+      // switchmesh1.rotation.x = Math.PI/2;
+      // switchmesh2.rotation.z = Math.PI/2;
       for(let i=0;i<switchdata.length;i++){
         let newswitch = {
           code:switchdata[i].code,
@@ -406,6 +407,7 @@ export function SectionList() {
             }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){
@@ -420,19 +422,20 @@ export function SectionList() {
             }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;
+        // 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);
+        scope.switchgroup.add(testswitch);
       }
 
       resolve("loadersection");
@@ -538,17 +541,21 @@ export function SectionList() {
       testmesh1.lengthfact = len;
       testmesh1.linkCode = suidao.linkCode;
       if(suidaodata.datalist[i].isStandTrack == false){
-        sectiongroup.add(testmesh1);
+        scope.sectiongroup.add(testmesh1);
 
       }else{
         scope.standtrack.push(testmesh1);
         var box = new THREE.BoxHelper( testmesh1, 0xff0000 );
-        sectiongroup.add( box );
+        scope.sectiongroup.add( box );
       }
       scope.sections.modellist.push(testmesh1);
     }
   }
 
+  this.resetsection = function(scene){
+    scene.remove(scope.sectiongroup);
+  };
+
   this.reposition = function(){
 
   }
diff --git a/src/jlmap3d/edit/editmodel/SignalList.js b/src/jlmap3d/edit/editmodel/SignalList.js
index ed047c0f3..fdce9486f 100644
--- a/src/jlmap3d/edit/editmodel/SignalList.js
+++ b/src/jlmap3d/edit/editmodel/SignalList.js
@@ -59,7 +59,10 @@ export function SignalList() {
           newmesh.scale.x = 0.05;
           newmesh.scale.y = 0.05;
           newmesh.scale.z = 0.05;
+          newmesh.offset = data[i].offset;
+          newmest.linkCode = data[i].linkCode;
           newsignal.mesh = newmesh;
+          newsignal.offset = data[i].offset;
           newsignal.mesh.status = "01";
           scope.group.add(newsignal.mesh);
           scope.list.push(newsignal);
@@ -101,7 +104,7 @@ export function SignalList() {
     });
   }
 
-  this.loadpromise  = function(signaldata,scene,assetloader){
+  this.loadpromise  = function(signaldata,scene,assetloader,data){
     return new Promise(function(resolve, reject){
       for(let i=0;i<signaldata.length;i++){
         let newsignal = new SignalModel(signaldata[i]);
@@ -111,11 +114,15 @@ export function SignalList() {
             num = j;
           }
         }
+
         let newmesh = assetloader.modellist[num].mesh.clone(true);
         newmesh.uuid = signaldata[i].id;
         newmesh.name = signaldata[i].name;
         newmesh.modelid = assetloader.modellist[num].id;
         newmesh.code = signaldata[i].code;
+        newmesh.offset = data[i].offset;
+        newmesh.linkCode = data[i].linkCode;
+        newmesh.directionType = data[i].directionType;
         newmesh.position.x = signaldata[i].position.x;
         newmesh.position.y = signaldata[i].position.y;
         newmesh.position.z = signaldata[i].position.z;
@@ -132,7 +139,30 @@ export function SignalList() {
       resolve("loadedsignal");
     });
   };
+  this.resetsignal = function(jlmap3ddata){
+    console.log(jlmap3ddata.linksgroup);
+    console.log(scope);
+    let linkdata = jlmap3ddata.linksgroup;
+    for(let i=0;i<scope.group.children.length;i++){
+      let signaldata = scope.group.children[i];
+      let link = linkdata.getObjectByProperty("code",signaldata.linkCode);
+      let posx = null;
 
+      if(signaldata.offset > link.lengthfact/2){
+        posx = link.position.x + signaldata.offset - link.lengthfact/2-10;
+      }else{
+        posx = link.position.x - (link.lengthfact/2 - signaldata.offset)+10;
+      }
+      //根据线路方向修改信号灯位置
+      if(signaldata.directionType == "01"){
+        signaldata.position.set(posx,0,link.position.z-3);
+        signaldata.rotation.z = ( Math.PI / 2 );
+      }else if(signaldata.directionType == "02"){
+        signaldata.position.set(posx,0,link.position.z+3);
+        signaldata.rotation.z = ( - Math.PI / 2 );
+      }
+    }
+  };
   this.init = function(data,realsectionlist,scene,assetloader){
 
 
diff --git a/src/jlmap3d/edit/jlmap3dedit.js b/src/jlmap3d/edit/jlmap3dedit.js
index f2ee2712f..abaef70ee 100644
--- a/src/jlmap3d/edit/jlmap3dedit.js
+++ b/src/jlmap3d/edit/jlmap3dedit.js
@@ -158,9 +158,12 @@ export function JLmap3dEdit(dom, data, mapid) {
   };
 
   this.export = function(){
-    var exporter = new THREE.OBJExporter();
-    console.log(scope.exportmodel);
-    var result = exporter.parse( scope.exportmodel );
+    let exporter = new THREE.OBJExporter();
+    console.log(scope.mapdata);
+    // let exportmodels = scope.mapdata.linklist.linksgroup;
+    // let exportmodels = scope.mapdata.sectionlist.switchgroup;
+    let exportmodels = scope.mapdata.stationstandlist.group;
+    let result = exporter.parse( exportmodels );
 
     console.log(result);
   }
@@ -243,6 +246,8 @@ export function JLmap3dEdit(dom, data, mapid) {
 
   this.autoss = function(){
     console.log("autoss");
+    console.log(scope.mapdata);
+    scope.mapdata.signallist.resetsignal(scope.mapdata.linklist);
   };
 
   function onWindowResize() {
diff --git a/src/jlmap3d/jl3ddrive/jl3ddrive.js b/src/jlmap3d/jl3ddrive/jl3ddrive.js
index b99903cfc..4cd1fff72 100644
--- a/src/jlmap3d/jl3ddrive/jl3ddrive.js
+++ b/src/jlmap3d/jl3ddrive/jl3ddrive.js
@@ -6,11 +6,6 @@ import {OBJLoader} from '@/jlmap3d/main/loaders/OBJLoader.js';
 import {MTLLoader} from '@/jlmap3d/main/loaders/MTLLoader.js';
 import { FBXLoader } from '@/jlmap3d/main/loaders/FBXLoader.js';
 
-// controls
-import {OrbitControls} from '@/jlmap3d/main/control/OrbitControls.js';
-import { DragControls } from '@/jlmap3d/main/control/DragControls.js';
-// component
-
 // data
 import { Jl3ddata } from '@/jlmap3d/main/model/jl3ddata';
 
@@ -20,11 +15,14 @@ import { SetRender } from '@/jlmap3d/config/SetRender';
 import { SetScene } from '@/jlmap3d/config/SetScene';
 import { SetLights } from '@/jlmap3d/config/SetLights';
 
+// controls
+import {OrbitControls} from '@/jlmap3d/main/control/OrbitControls.js';
+import { DragControls } from '@/jlmap3d/main/control/DragControls.js';
+
 // 加载器
 import { ModelLoad } from '@/jlmap3d/main/loaders/simulationloader';
 // connect
 import {Jl3dDriving} from '@/jlmap3d/jl3ddrive/moveupdate/DrivingConnect';
-
 import { getPublishMapVersion, getPublishMapDetail, getPublish3dMapDetail} from '@/api/jlmap3d/load3ddata';
 
 // utils
@@ -38,9 +36,9 @@ import {MouseControls} from '@/jlmap3d/main/control/FirstControls';
 
 var clock = new THREE.Clock();
 
-export function JLmapDriving(dom, data, skinCode) {
+export function JLmapDriving(dom, data, skinCode,storemod) {
 
-	const scope = this;
+	let scope = this;
 
 	//界面更新函数
 	let updatemmi = {};
@@ -49,7 +47,7 @@ export function JLmapDriving(dom, data, skinCode) {
 	this.animateswitch = false;
 	this.cctvswitch = false;
 	// 初始化webgl渲染
-	const renderer = SetRender(dom);
+	let renderer = SetRender(dom);
 	renderer.domElement.style.position = 'absolute';
 	renderer.domElement.style.top = '0';
 
@@ -63,9 +61,9 @@ export function JLmapDriving(dom, data, skinCode) {
 	// 定义相机
 	//let camera = SetCamera(dom);
 	// 定义场景(渲染容器)
-	const scene = SetScene();
+	let scene = SetScene();
 
-	const speed = 0;
+	let speed = 0;
 
 	let drivingcode = null;
 
@@ -98,11 +96,11 @@ export function JLmapDriving(dom, data, skinCode) {
 	// 地图模型数据
 	let mapdata = new Jl3ddata();
 
-	let camera = new THREE.PerspectiveCamera(70, dom.clientWidth/dom.clientHeight, 1, 1100);
+	let camera = new THREE.PerspectiveCamera(70, dom.clientWidth/dom.clientHeight, 1, 11000);
 	camera.position.set( 0, 0, 0 );
 	camera.aspect = window.innerWidth / window.innerHeight;
 	camera.updateProjectionMatrix();
-
+	camera.rotation.x = 0;
 	let listener = new THREE.AudioListener();
 	listener.position.y = -2;
 	camera.add( listener );
@@ -119,12 +117,13 @@ export function JLmapDriving(dom, data, skinCode) {
 		sound.play();
 	});
 
-	const controls3 = new MouseControls(camera, 1.6);
+	let controls3 = new MouseControls(camera, 1.6);
 	controls3.enabled = true;
+	// controls3.getObject().rotation.x = Math.PI/2;
 	scene.add(controls3.getObject());
 
 	let cameracctv = new THREE.PerspectiveCamera(70, dom.clientWidth/dom.clientHeight, 1, 120);
-	cameracctv.position.set( 5, -3,27 );
+	cameracctv.position.set( 2, -1,27 );
 
 	cameracctv.rotation.y = Math.PI/5*3;
 	camera.add(cameracctv);
@@ -133,18 +132,46 @@ export function JLmapDriving(dom, data, skinCode) {
 
 	this.Subscribe.socketon(scope.Subscribe.topic);
 	var timer = setInterval(function() {
-		if(mapdata.trainlisttest.group){
-			if(mapdata.trainlisttest.group.children[0]){
+		if(mapdata.trainlisttest){
+			if(mapdata.trainlisttest.group){
+				if(mapdata.trainlisttest.group.children[0]){
+					updatemmi.updatedrivingcode(mapdata.trainlisttest.group.children[0].name);
+					scope.Subscribe.initdrivercode(mapdata.trainlisttest.group.children[0].name);
+					for(let k in mapdata.rails.switchrail){
+						const ddd = storemod.getters['map/getDeviceByCode'](k);
+						let switchdata = mapdata.rails.switchrail[k];
+						mapdata.rails.switchrail[k].locateType = ddd.locateType;
 
-				updatemmi.updatedrivingcode(mapdata.trainlisttest.group.children[0].name);
-				scope.Subscribe.initdrivercode(mapdata.trainlisttest.group.children[0].name);
-				clearInterval(timer);
+						if(ddd.locateType == "01"){
+							//1--向左  2--向右
+							//__\__    __/__
+							if(mapdata.rails.switchrail[k].directtype == "1"){
+								mapdata.rails.linkrail[switchdata.alink].lconnect = switchdata.blink;
+								mapdata.rails.linkrail[switchdata.blink].rconnect = switchdata.alink;
+							}else if(mapdata.rails.switchrail[k].directtype == "2"){
+								mapdata.rails.linkrail[switchdata.alink].rconnect = switchdata.blink;
+								mapdata.rails.linkrail[switchdata.blink].lconnect = switchdata.alink;
+							}
+
+						}else if(ddd.locateType == "02"){
+							if(mapdata.rails.switchrail[k].directtype == "1"){
+								mapdata.rails.linkrail[switchdata.alink].lconnect = switchdata.clink;
+								mapdata.rails.linkrail[switchdata.clink].rconnect = switchdata.alink;
+							}else if(mapdata.rails.switchrail[k].directtype == "2"){
+								mapdata.rails.linkrail[switchdata.alink].rconnect = switchdata.clink;
+								mapdata.rails.linkrail[switchdata.clink].lconnect = switchdata.alink;
+							}
+						}
+					}
+					clearInterval(timer);
+				}
 			}
 		}
-	}, 1000);
+
+	}, 2000);
 	// 初始化加载数据和模型
 	getPublish3dMapDetail(skinCode).then(netdata => {
-		ModelLoad(data, scope, netdata.data, mapdata, camera, controls3, scene,mixers);
+		ModelLoad(data, scope, netdata.data, mapdata, camera, controls3, scene,mixers,storemod);
 	});
 	// let stats = new Stats();
 	// dom.appendChild( stats.dom );
@@ -170,7 +197,7 @@ export function JLmapDriving(dom, data, skinCode) {
 				renderercctv.render(scene,cameracctv);
 			}
 			//相机按键位移
-			//controls3.update();
+			// controls3.update();
 			delta = clock.getDelta();
 			for (let i=mixers.length-1; i>=0; i--) {
 					mixers[i].update( delta );
@@ -186,6 +213,8 @@ export function JLmapDriving(dom, data, skinCode) {
 			controls3.getObject().position.y=10;
 			controls3.getObject().position.z = mapdata.trainlisttest.list[drivingcode].children[0].matrixWorld.elements[14];
 
+			console.log(controls3);
+
 		}
 	}
 
@@ -227,12 +256,11 @@ export function JLmapDriving(dom, data, skinCode) {
 	updatemmi.updatedrivingcode = function(code) {
 		drivingcode = code;
 		mapdata.trainlisttest.list[drivingcode].children[0].add(controls3.getObject());
-		mapdata.trainlisttest.list[drivingcode].children[0].add(scope.assetloader.modellist[4].mesh);
-		controls3.getObject().position.x = 40;
-		controls3.getObject().position.y= 12.5;
+		controls3.getObject().position.x = 10;
+		controls3.getObject().position.y = 0;
+		controls3.getObject().position.z = 2.5;
+		controls3.getObject().rotation.x = Math.PI/2;
 		controls3.getObject().rotation.y = -Math.PI/2;
-		scope.assetloader.modellist[4].mesh.position.x = 34;
-		scope.assetloader.modellist[4].mesh.position.y = 0;
 	};
 
 	this.dispose = function() {
@@ -253,6 +281,7 @@ export function JLmapDriving(dom, data, skinCode) {
 		scope.actions = null;
 		scope.Subscribe = null;
 		sound.stop();
+		scope.webwork.terminate();
 		// console.log(scope);
 		// scope = null;
 	};
@@ -373,9 +402,9 @@ export function JLmapDriving(dom, data, skinCode) {
 		if (event.button == '0') {
 
 			// 定义光线
-			const raycaster = new THREE.Raycaster();
+			let raycaster = new THREE.Raycaster();
 			// 定义平面鼠标点击坐标
-			const mouse = new THREE.Vector2();
+			let mouse = new THREE.Vector2();
 			mouse.x = (event.clientX / window.innerWidth) * 2 - 1;
 			mouse.y = -(event.clientY / window.innerHeight) * 2 + 1;
 
@@ -387,7 +416,7 @@ export function JLmapDriving(dom, data, skinCode) {
 
 			if (scope.raycasterswitch == 'stand') {
 				// 从站台对象组获取点击目标
-				const intersects1 = raycaster.intersectObjects( mapdata.stationstandlist.textlist);
+				let intersects1 = raycaster.intersectObjects( mapdata.stationstandlist.textlist);
 				// 获取最近处点击到的模型对象
 				if (intersects1[0]) {
 					// 遍历对象组获取对象坐标更新相机数据
@@ -405,7 +434,7 @@ export function JLmapDriving(dom, data, skinCode) {
 			}
 
 			if (scope.raycasterswitch == 'train') {
-				const intersects = raycaster.intersectObjects( mapdata.trainlisttest.textlist);
+				let intersects = raycaster.intersectObjects( mapdata.trainlisttest.textlist);
 				if (intersects[0]) {
 					for (let j=0; j<mapdata.trainlisttest.list.length; j++) {
 						if (intersects[0].object.name == mapdata.trainlisttest.list[j].name) {
@@ -419,7 +448,7 @@ export function JLmapDriving(dom, data, skinCode) {
 
 			if (scope.raycasterswitch == 'section') {
 				// console.log(mapdata.sectionlist.sections.modellist);
-				const intersects = raycaster.intersectObjects( mapdata.sectionlist.sections.modellist, true);
+				let intersects = raycaster.intersectObjects( mapdata.sectionlist.sections.modellist, true);
 				if (intersects[0]) {
 
 					scope.helpbox = new THREE.BoxHelper( intersects[0].object, 0xff0000 );
@@ -429,7 +458,7 @@ export function JLmapDriving(dom, data, skinCode) {
 
 			if (scope.raycasterswitch == 'signal') {
 
-				const intersects = raycaster.intersectObjects( mapdata.signallist.group.children, true);
+				let intersects = raycaster.intersectObjects( mapdata.signallist.group.children, true);
 
 				if (intersects[0]) {
 					scope.helpbox = new THREE.BoxHelper( intersects[0].object, 0xff0000 );
@@ -438,7 +467,7 @@ export function JLmapDriving(dom, data, skinCode) {
 			}
 
 			if (scope.raycasterswitch == 'switch') {
-				const intersects = raycaster.intersectObjects( mapdata.sectionlist.switchs.modellist, true);
+				let intersects = raycaster.intersectObjects( mapdata.sectionlist.switchs.modellist, true);
 
 				if (intersects[0]) {
 					scope.helpbox = new THREE.BoxHelper( intersects[0].object, 0xff0000 );
diff --git a/src/jlmap3d/jl3ddrive/moveupdate/DrivingConnect.js b/src/jlmap3d/jl3ddrive/moveupdate/DrivingConnect.js
index 34cdd345d..f67da179f 100644
--- a/src/jlmap3d/jl3ddrive/moveupdate/DrivingConnect.js
+++ b/src/jlmap3d/jl3ddrive/moveupdate/DrivingConnect.js
@@ -19,6 +19,9 @@ export function Jl3dDriving(updatemmi,sound) {
 	var sectionlist = null;
 	var materials = null;
 	var actions = null;
+	var rails = null;
+	var links = null;
+
 	var scenes = null;
 
 	var code = null;
@@ -52,7 +55,8 @@ export function Jl3dDriving(updatemmi,sound) {
 		materials = materiallist;
 		scenes = scene;
 		actions = nowaction;
-
+		links = this.map.linklist;
+		rails = this.map.rails;
 	};
 
 	this.initdrivercode = function(code) {
@@ -98,16 +102,16 @@ export function Jl3dDriving(updatemmi,sound) {
 		//
 		// }
 		switch (data.type) {
+				case 'Simulation_Driver_Change':
+					drivingcode = data.body.code;
+					// sound.volswitch = true;
+					updatemmi.updatedrivingcode( data.body.code);
+					break;
 				case 'Simulation_TrainSpeed':
 					trainspeed(data);
 					break;
         case 'Simulation_Drive_Data_Routing':
             updatemmi.updatedrivedata(data.body);
-            break;
-        case 'Simulation_Driver_Change':
-						drivingcode = data.body.code;
-						sound.volswitch = true;
-						updatemmi.updatedrivingcode( data.body.code);
             break;
 				case 'SJL3D_TrainStatus':
             trainstatus(data);
@@ -153,13 +157,13 @@ export function Jl3dDriving(updatemmi,sound) {
 					if (trainlisttest.list[code].runMode == '02') {
 
 						if (trainlisttest.list[code].isStandTrack == true) {
-							trainlisttest.list[code].speeds = parseFloat(data.body[tl].v*10/36/19.5/trainlisttest.list[code].len);
+							trainlisttest.list[code].speeds = parseFloat(data.body[tl].v*10/36/21/trainlisttest.list[code].len);
 						} else {
-							trainlisttest.list[code].speeds = parseFloat(data.body[tl].v*10/36/20.3/trainlisttest.list[code].len);
+							trainlisttest.list[code].speeds = parseFloat(data.body[tl].v*10/36/21/trainlisttest.list[code].len);
 						}
 					} else {
 
-						trainlisttest.list[code].speeds = parseFloat(data.body[tl].v*10/36/20/trainlisttest.list[code].len);
+						trainlisttest.list[code].speeds = parseFloat(data.body[tl].v*10/36/21/trainlisttest.list[code].len);
 					}
 
 					if (code == drivingcode) {
@@ -168,6 +172,8 @@ export function Jl3dDriving(updatemmi,sound) {
 						// } else {
 
 						updatemmi.updatenowspeed(Math.abs(data.body[tl].v));
+						// console.log(data.body[i]);
+
 						// }
 					}
 				}
@@ -189,6 +195,25 @@ export function Jl3dDriving(updatemmi,sound) {
 					} else {
 						updatemmi.updateatospeed(-1);
 					}
+					if(trainlisttest.list[code].progress<1){
+						let syncdata = {
+							type: 'Train',
+							code: code,
+							linkCode: trainlisttest.list[code].nowcode,
+							percent: 0
+						};
+
+						if (trainlisttest.list[code].status == '02') {
+							syncdata.percent = trainlisttest.list[code].progress;
+						} else {
+							syncdata.percent = 1 - trainlisttest.list[code].progress;
+						}
+						// console.log(syncdata);
+						// console.log(trainlisttest.list[code].nextcurve);
+						// console.log("=============");
+						scope.teststomp.send('/app/topic/simulation/client/drive', syncdata);
+					}
+
 				}
 			}
 		}
@@ -208,29 +233,6 @@ export function Jl3dDriving(updatemmi,sound) {
 							//更新车组号
 							updatemmi.updatetrainnum(data.body[i].groupNumber);
 							//更新列车
-							let syncdata = {
-								type: 'Train',
-								code: code,
-								sectionCode: data.body[i].sectionCode,
-								percent: 0
-							};
-
-							if (trainlisttest.list[code].isStandTrack == true && trainlisttest.list[code].progress>0.95 && trainlisttest.list[code].speed<=0) {
-								if (data.body[i].directionType == '02') {
-									syncdata.percent = 1-(sectionlist.sections.datalist[data.body[i].sectionCode].rstop/trainlisttest.list[code].len);
-								} else {
-									syncdata.percent = sectionlist.sections.datalist[data.body[i].sectionCode].lstop/trainlisttest.list[code].len;
-								}
-								//scope.teststomp.send('/app/topic/simulation/client/drive', syncdata);
-							} else {
-								if (data.body[i].directionType == '02') {
-									syncdata.percent = trainlisttest.list[code].progress;
-								} else {
-									syncdata.percent = 1 - trainlisttest.list[code].progress;
-								}
-								//scope.teststomp.send('/app/topic/simulation/client/drive', syncdata);
-							}
-
 							if (data.body[i].parkRemainTime>0) {
 								updatemmi.updatestoptime('停站时间:'+parseInt(data.body[i].parkRemainTime));
 							} else {
@@ -304,91 +306,49 @@ export function Jl3dDriving(updatemmi,sound) {
 
 						if (trainlisttest.list[code].dispose != data.body[i].dispose && data.body[i].dispose == false) {
 
-							if (sectionlist.sections.datalist[data.body[i].sectionCode].code) {
+							if (rails.linkrail[data.body[i].linkCode]) {
 								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].sectionCode;
-								trainlisttest.list[code].nextcode = data.body[i].nextSectionCode;
+								trainlisttest.list[code].nowcode = data.body[i].linkCode;
 								let vexlist = [];
 								let endrotation = null;
 
 								if (data.body[i].directionType == '02') { // 向右
-									let offset = null;
-									let rotaposx = null;
-
-									if (sectionlist.sections.datalist[data.body[i].sectionCode].rail[0].x>sectionlist.sections.datalist[data.body[i].sectionCode].rail[1].x) {
-										offset = sectionlist.sections.datalist[data.body[i].sectionCode].rail[0].x-sectionlist.sections.datalist[data.body[i].sectionCode].rail[1].x;
-										rotaposx = sectionlist.sections.datalist[data.body[i].sectionCode].rail[1].x+offset*data.body[i].sectionOffsetPercent;
-									} else {
-										offset = sectionlist.sections.datalist[data.body[i].sectionCode].rail[1].x-sectionlist.sections.datalist[data.body[i].sectionCode].rail[0].x;
-										rotaposx = sectionlist.sections.datalist[data.body[i].sectionCode].rail[0].x+offset*data.body[i].sectionOffsetPercent;
-									}
-
-									let rotaposz = sectionlist.sections.datalist[data.body[i].sectionCode].rail[0].z;
-
+									let point = rails.linkrail[data.body[i].linkCode].lineleft.getPointAt(data.body[i].linkOffsetPercent);
 									trainlisttest.list[code].rotation.y = 0;
-									trainlisttest.list[code].position.x = rotaposx;
+									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 = rotaposz;
+										trainlisttest.list[code].children[tl].position.z = point.z;
 									}
 
-									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].progress = data.body[i].sectionOffsetPercent;
+									trainlisttest.list[code].progress = data.body[i].linkOffsetPercent;
+									trainlisttest.list[code].curve = rails.linkrail[data.body[i].linkCode].lineleft;
 								} else if (data.body[i].directionType == '03') { // 向左
-									trainlisttest.list[code].dispose = false;
-									trainlisttest.group.add(trainlisttest.list[code]);
-									let offset = null;
-									let rotaposx = null;
-
-									if (sectionlist.sections.datalist[data.body[i].sectionCode].rail[0].x>sectionlist.sections.datalist[data.body[i].sectionCode].rail[1].x) {
-
-										offset = sectionlist.sections.datalist[data.body[i].sectionCode].rail[0].x-sectionlist.sections.datalist[data.body[i].sectionCode].rail[1].x;
-										rotaposx = sectionlist.sections.datalist[data.body[i].sectionCode].rail[1].x+offset*data.body[i].sectionOffsetPercent;
-									} else {
-
-										offset = sectionlist.sections.datalist[data.body[i].sectionCode].rail[1].x-sectionlist.sections.datalist[data.body[i].sectionCode].rail[0].x;
-										rotaposx = sectionlist.sections.datalist[data.body[i].sectionCode].rail[0].x+offset*data.body[i].sectionOffsetPercent;
-									}
-									let rotaposz = sectionlist.sections.datalist[data.body[i].sectionCode].rail[1].z;
-
+									let point = rails.linkrail[data.body[i].linkCode].lineright.getPointAt((1-data.body[i].linkOffsetPercent));
 									trainlisttest.list[code].rotation.y = Math.PI;
-									trainlisttest.list[code].position.x = rotaposx;
+									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 = -rotaposz;
-									}
-									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].children[tl].position.z = -point.z;
 									}
+									// if(trainlisttest.list[code].rname == "006"){
+									// 	console.log("0000000000000000");
+									// 	console.log(data.body[i].linkOffsetPercent);
+									// }
+
 									trainlisttest.list[code].status = '03';
-									trainlisttest.list[code].progress = 1-data.body[i].sectionOffsetPercent;
+									trainlisttest.list[code].progress = 1-data.body[i].linkOffsetPercent;
+									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].isStandTrack = sectionlist.sections.datalist[data.body[i].sectionCode].isStandTrack;
 
-								trainlisttest.list[code].curve = new THREE.CatmullRomCurve3(vexlist);
-								trainlisttest.list[code].isStandTrack = sectionlist.sections.datalist[data.body[i].sectionCode].isStandTrack;
-
-								trainlisttest.list[code].len = sectionlist.sections.datalist[data.body[i].sectionCode].distance;
+								// trainlisttest.list[code].len = sectionlist.sections.datalist[data.body[i].sectionCode].distance;
 
 
 								if(data.body[i].speed == 0){
@@ -397,9 +357,10 @@ export function Jl3dDriving(updatemmi,sound) {
 									// 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/20/trainlisttest.list[code].len);
+									trainlisttest.list[code].speeds = parseFloat(data.body[i].speed*10/36/22/trainlisttest.list[code].len);
 								}
 
+
 							}
 
 						} else if (trainlisttest.list[code].dispose != data.body[i].dispose && data.body[i].dispose == true) {
@@ -415,7 +376,7 @@ export function Jl3dDriving(updatemmi,sound) {
 
 						} 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 (rails.linkrail[data.body[i].linkCode]) {
 								if (driverswitch == '02' && code == drivingcode) {
 									updatemmi.updatenowspeed(data.body[i].speed);
 									if (data.body[i].atpSpeed) {
@@ -433,8 +394,19 @@ export function Jl3dDriving(updatemmi,sound) {
 									} 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);
@@ -442,15 +414,10 @@ export function Jl3dDriving(updatemmi,sound) {
 										updatemmi.updatenowlen(0);
 									}
 								}
-
-
-								if (trainlisttest.list[code].nowcode != data.body[i].sectionCode) {
-									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) {
+											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;
@@ -458,126 +425,110 @@ export function Jl3dDriving(updatemmi,sound) {
 											for (let tl=0; tl<6; tl++) {
 												trainlisttest.list[code].children[tl].position.z = rotaposz;
 											}
-											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(data.body[i].speed > 0){
-												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]);
-													}
-												}
-											}else if(data.body[i].speed < 0){
-												if (sectionlist.sections.datalist[data.body[i].sectionCode].rail[0].x<sectionlist.sections.datalist[data.body[i].sectionCode].rail[1].x) {
-													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]);
-														}
-													}
-													vexlist.push(new THREE.Vector3(trainlisttest.list[code].position.x, 0, trainlisttest.list[code].children[0].matrixWorld.elements[14]));
 
-												} else {
-													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]);
-														}
-													}
-													vexlist.push(new THREE.Vector3(trainlisttest.list[code].position.x, 0, trainlisttest.list[code].children[0].matrixWorld.elements[14]));
-
-												}
-											}
-											trainlisttest.list[code].rotation.y = 0;
+											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].status = '02';
+										trainlisttest.list[code].len = rails.linkrail[data.body[i].linkCode].lengthfact;
+
 									} else if (data.body[i].directionType == '03') { // 向左
+
 										if (trainlisttest.list[code].status != data.body[i].directionType) {
+											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].children[tl].position.z = -rotaposz;
 											}
-											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(data.body[i].speed > 0){
-												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]);
-													}
-												}
-											}else if(data.body[i].speed < 0){
-
-												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--) {
-														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]);
-														}
-													}
-													vexlist.push(new THREE.Vector3(trainlisttest.list[code].position.x, 0, trainlisttest.list[code].children[0].matrixWorld.elements[14]));
-												} else {
-													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]);
-														}
-													}
-													vexlist.push(new THREE.Vector3(trainlisttest.list[code].position.x, 0, trainlisttest.list[code].children[0].matrixWorld.elements[14]));
-												}
-											}
-
-											trainlisttest.list[code].rotation.y = Math.PI;
+											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;
+
+									}
+
+
+										// console.log(data.body[i].directionType);
+										// console.log(data.body[i].linkCode);
+										// console.log(rails.linkrail[data.body[i].linkCode].lengthfact);
+										// console.log(rails.linkrail[data.body[i].linkCode].lconnect);
+										// console.log(rails.linkrail[data.body[i].linkCode].rconnect);
+										// console.log("--------------------");
+										// console.log(rails.linkrail[rails.linkrail[data.body[i].linkCode].lconnect].lconnect);
+										// console.log(rails.linkrail[rails.linkrail[data.body[i].linkCode].lconnect].rconnect);
+										// console.log("---------------------");
+										// console.log(trainlisttest.list[code].curve.points);
+										// console.log(rails.linkrail[nextcode].lineleft.points);
+										// console.log("***********************");
+										// console.log(rails.linkrail[nextcode].lineleft.points);
+
+								if(code == drivingcode){
+									let nextcode;
+
+									if(data.body[i].directionType == '02'){
+										trainlisttest.list[code].status = '02';
+										nextcode = rails.linkrail[data.body[i].linkCode].rconnect;
+										if(nextcode){
+											trainlisttest.list[code].nextcurve = rails.linkrail[nextcode].lineleft;
+											trainlisttest.list[code].nextlen = rails.linkrail[nextcode].lengthfact;
+										}
+
+									}else if(data.body[i].directionType == '03'){
 										trainlisttest.list[code].status = '03';
-									}
-									trainlisttest.list[code].curve = new THREE.CatmullRomCurve3(vexlist);
-									trainlisttest.list[code].isStandTrack = sectionlist.sections.datalist[data.body[i].sectionCode].isStandTrack;
-									trainlisttest.list[code].len = sectionlist.sections.datalist[data.body[i].sectionCode].distance;
+										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;
+										}
 
-									trainlisttest.list[code].speed = data.body[i].speed;
-									if(data.body[i].speed>0){
-										trainlisttest.list[code].progress = 0;
-									}else if(data.body[i].speed<0){
-										trainlisttest.list[code].progress = 0.999;
 									}
-									trainlisttest.list[code].speeds = parseFloat(data.body[i].speed*10/36/20/trainlisttest.list[code].len);
+									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{
+									let nextcode;
+									if(data.body[i].directionType == '02'){
+										if(rails.linkrail[data.body[i].linkCode].lineleft){
+											trainlisttest.list[code].status = '02';
+											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].speeds = parseFloat(trainlisttest.list[code].speed*10/36/21/trainlisttest.list[code].len);
+										}
+									}else if(data.body[i].directionType == '03'){
+										if(rails.linkrail[data.body[i].linkCode].lineright){
+											trainlisttest.list[code].status = '03';
+											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].speeds = parseFloat(trainlisttest.list[code].speed*10/36/21/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("==========================================");
 							}
 						}
 					}
@@ -734,9 +685,11 @@ export function Jl3dDriving(updatemmi,sound) {
 	function switchupdate(data) {
 		code = data.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.locateType) {
+			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();
@@ -744,7 +697,26 @@ export function Jl3dDriving(updatemmi,sound) {
 							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];
+						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();
@@ -752,6 +724,23 @@ export function Jl3dDriving(updatemmi,sound) {
 							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];
+						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/jl3ddrive/moveupdate/UpdateTrain.js b/src/jlmap3d/jl3ddrive/moveupdate/UpdateTrain.js
index e39f803f3..e2c0363f8 100644
--- a/src/jlmap3d/jl3ddrive/moveupdate/UpdateTrain.js
+++ b/src/jlmap3d/jl3ddrive/moveupdate/UpdateTrain.js
@@ -4,7 +4,7 @@ export function UpdateTrain(camera,traindata,control){
 
     for(let j=traindata.group.children.length-1;j>=0;j--){
       //判断是否有移动事件
-      //if(traindata.group.children[j].dispose == false){
+      if(traindata.group.children[j].dispose == false){
 
         if(traindata.group.children[j].progress != null){
 
@@ -12,22 +12,26 @@ export function UpdateTrain(camera,traindata,control){
 
           if(trainmodel.speeds > 0 && trainmodel.speeds){
             let speed = null;
-            if(traindata.group.children[j].progress<1){
+            if(traindata.group.children[j].progress >=0&&traindata.group.children[j].progress<=1){
 
               let movecurve = trainmodel.curve;
 
               if(trainmodel.status == "03"){
                 if(movecurve.points.length>1){
                   let point = movecurve.getPointAt(traindata.group.children[j].progress);
-                  if(Math.abs( point.z -trainmodel.children[0].matrixWorld.elements[14]) >0.1){
+
+                  if(Math.abs( point.z -trainmodel.children[0].matrixWorld.elements[14]) >0.001){
                     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.y
+                      rota:trainmodel.children[0].rotation.z
                     }
                     trainmodel.children[1].rotalist.push(rotas);
 
@@ -48,7 +52,7 @@ export function UpdateTrain(camera,traindata,control){
                         trainmodel.children[rs].position.z += offsetz;
 
                         for(let xh=0;xh<trainmodel.children[rs].rotalist.length;xh++){
-                          if((trainmodel.children[rs].matrixWorld.elements[12]-38)<=trainmodel.children[rs].rotalist[0].posr.x){
+                          if((trainmodel.children[rs].matrixWorld.elements[12]-6)<=trainmodel.children[rs].rotalist[0].posr.x){
 
                             if(rs != 5){
                               let asd = trainmodel.children[rs].rotalist[0];
@@ -56,7 +60,7 @@ export function UpdateTrain(camera,traindata,control){
 
                             }
 
-                            trainmodel.children[rs].rotation.y = trainmodel.children[rs].rotalist[0].rota;
+                            trainmodel.children[rs].rotation.z = trainmodel.children[rs].rotalist[0].rota;
                             trainmodel.children[rs].rotalist.splice(0,1)
                             xh--;
                           }else{
@@ -74,16 +78,19 @@ export function UpdateTrain(camera,traindata,control){
               if(trainmodel.status == "02"){
                 if(movecurve.points.length>1){
                   let point = movecurve.getPointAt(trainmodel.progress);
-                  if(Math.abs( point.z -trainmodel.children[0].matrixWorld.elements[14]) >0.1){
+
+                  if(Math.abs( point.z -trainmodel.children[0].matrixWorld.elements[14]) >0.001){
                     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.y
+                      rota:trainmodel.children[0].rotation.z
                     }
                     trainmodel.children[1].rotalist.push(rotas);
                     let offsetz = parseFloat(point.z) - parseFloat(trainmodel.children[0].matrixWorld.elements[14]);
@@ -103,7 +110,7 @@ export function UpdateTrain(camera,traindata,control){
                           trainmodel.children[rs].position.z += offsetz;
 
                           for(let xh=0;xh<trainmodel.children[rs].rotalist.length;xh++){
-                            if((trainmodel.children[rs].matrixWorld.elements[12]+38)>=trainmodel.children[rs].rotalist[0].posr.x){
+                            if((trainmodel.children[rs].matrixWorld.elements[12]+6)>=trainmodel.children[rs].rotalist[0].posr.x){
 
                               if(rs != 5){
                                 let asd = trainmodel.children[rs].rotalist[0];
@@ -112,7 +119,7 @@ export function UpdateTrain(camera,traindata,control){
                               }
                               //let offsetx = trainmodel.children[1].matrixWorld.elements[12]-trainmodel.children[0].children[3].matrixWorld.elements[12];
 
-                              trainmodel.children[rs].rotation.y = trainmodel.children[rs].rotalist[0].rota;
+                              trainmodel.children[rs].rotation.z = trainmodel.children[rs].rotalist[0].rota;
                               trainmodel.children[rs].rotalist.splice(0,1)
                               xh--;
                             }else{
@@ -127,32 +134,62 @@ export function UpdateTrain(camera,traindata,control){
                     }
                     // console.log(trainmodel.rotalist);
                   }
-
-
                   trainmodel.progress += trainmodel.speeds;
                 }
               }
+            }else{
+              if(trainmodel.nextcurve){
+                // if(trainmodel.status == '02'){
+                // }else if(trainmodel.status == '03'){
+                // }
+        
+                trainmodel.progress = 0;
+                trainmodel.len = trainmodel.nextlen;
+                trainmodel.nowcode = trainmodel.nextcode;
+                trainmodel.speeds = parseFloat(trainmodel.speed*10/36/21/trainmodel.len);
+                trainmodel.curve = trainmodel.nextcurve;
+
+                trainmodel.nextcurve = null;
+                trainmodel.nextlen = null;
+                trainmodel.nextcode = null;
+
+
+
+              }
+
+              // console.log(trainmodel.name);
+              // console.log(trainmodel.progress);
+              // console.log(trainmodel.nextcurve);
+              // if(trainmodel.status == "02"){
+              //   trainmodel.progress = 0;
+              // }else if(trainmodel.status == "03"){
+              //   trainmodel.progress = 1;
+              // }
+              // trainmodel.curve = trainmodel.nextcurve;
 
             }
 
           }else if(trainmodel.speeds < 0 && trainmodel.speeds){
             let speed = null;
-            if(traindata.group.children[j].progress<1){
+            if(traindata.group.children[j].progress >=0&&traindata.group.children[j].progress<=1){
 
               let movecurve = trainmodel.curve;
 
               if(trainmodel.status == "03"  && trainmodel.progress>0){
                 if(movecurve.points.length>1){
                   let point = movecurve.getPointAt(traindata.group.children[j].progress);
-                  if(Math.abs( point.z -trainmodel.children[0].matrixWorld.elements[14]) >0.1){
+                  if(Math.abs( point.z -trainmodel.children[0].matrixWorld.elements[14]) >0.01){
                     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.y
+                      rota:trainmodel.children[0].rotation.z
                     }
                     trainmodel.children[1].rotalist.push(rotas);
 
@@ -173,7 +210,7 @@ export function UpdateTrain(camera,traindata,control){
                         trainmodel.children[rs].position.z += offsetz;
 
                         for(let xh=0;xh<trainmodel.children[rs].rotalist.length;xh++){
-                          if((trainmodel.children[rs].matrixWorld.elements[12]-38)<=trainmodel.children[rs].rotalist[0].posr.x){
+                          if((trainmodel.children[rs].matrixWorld.elements[12]-6)<=trainmodel.children[rs].rotalist[0].posr.x){
 
                             if(rs != 5){
                               let asd = trainmodel.children[rs].rotalist[0];
@@ -181,7 +218,7 @@ export function UpdateTrain(camera,traindata,control){
 
                             }
 
-                            trainmodel.children[rs].rotation.y = trainmodel.children[rs].rotalist[0].rota;
+                            trainmodel.children[rs].rotation.z = trainmodel.children[rs].rotalist[0].rota;
                             trainmodel.children[rs].rotalist.splice(0,1)
                             xh--;
                           }else{
@@ -203,16 +240,18 @@ export function UpdateTrain(camera,traindata,control){
                 if(movecurve.points.length>1 && trainmodel.progress>0){
 
                   let point = movecurve.getPointAt(trainmodel.progress);
-                  if(Math.abs( point.z -trainmodel.children[0].matrixWorld.elements[14]) >0.1){
+                  if(Math.abs( point.z -trainmodel.children[0].matrixWorld.elements[14]) >0.01){
                     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.y
+                      rota:trainmodel.children[0].rotation.z
                     }
                     trainmodel.children[1].rotalist.push(rotas);
                     let offsetz = parseFloat(point.z) - parseFloat(trainmodel.children[0].matrixWorld.elements[14]);
@@ -232,7 +271,7 @@ export function UpdateTrain(camera,traindata,control){
                           trainmodel.children[rs].position.z += offsetz;
 
                           for(let xh=0;xh<trainmodel.children[rs].rotalist.length;xh++){
-                            if((trainmodel.children[rs].matrixWorld.elements[12]+38)>=trainmodel.children[rs].rotalist[0].posr.x){
+                            if((trainmodel.children[rs].matrixWorld.elements[12]+6)>=trainmodel.children[rs].rotalist[0].posr.x){
 
                               if(rs != 5){
                                 let asd = trainmodel.children[rs].rotalist[0];
@@ -241,7 +280,7 @@ export function UpdateTrain(camera,traindata,control){
                               }
                               //let offsetx = trainmodel.children[1].matrixWorld.elements[12]-trainmodel.children[0].children[3].matrixWorld.elements[12];
 
-                              trainmodel.children[rs].rotation.y = trainmodel.children[rs].rotalist[0].rota;
+                              trainmodel.children[rs].rotation.z = trainmodel.children[rs].rotalist[0].rota;
                               trainmodel.children[rs].rotalist.splice(0,1)
                               xh--;
                             }else{
@@ -257,7 +296,7 @@ export function UpdateTrain(camera,traindata,control){
                     // console.log(trainmodel.rotalist);
                   }
 
-
+                  console.log(trainmodel.nextcurve);
                   if(trainmodel.progress > -(trainmodel.speeds)){
                     trainmodel.progress += trainmodel.speeds;
                   }
@@ -269,7 +308,7 @@ export function UpdateTrain(camera,traindata,control){
 
 
         }
-      //}
+      }
 
     }
 
diff --git a/src/jlmap3d/jl3dsimulation/connect/TrainingConnect.js b/src/jlmap3d/jl3dsimulation/connect/TrainingConnect.js
index 054a14afe..1c96ff20f 100644
--- a/src/jlmap3d/jl3dsimulation/connect/TrainingConnect.js
+++ b/src/jlmap3d/jl3dsimulation/connect/TrainingConnect.js
@@ -19,6 +19,9 @@ export function Jlmap3dSubscribe(jlmap3d) {
 	var sectionlist = null;
 	var materials = null;
 	var actions = null;
+	var rails = null;
+	var links = null;
+
 	var scenes = null;
 
 	var code = null;
@@ -52,6 +55,8 @@ export function Jlmap3dSubscribe(jlmap3d) {
 		materials = materiallist;
 		scenes = scene;
 		actions = nowaction;
+		links = this.map.linklist;
+		rails = this.map.rails;
 
 	};
 
@@ -111,11 +116,11 @@ export function Jlmap3dSubscribe(jlmap3d) {
 						if (trainlisttest.list[code].isStandTrack == true) {
 							trainlisttest.list[code].speeds = parseFloat(data.body[tl].v*10/36/17/trainlisttest.list[code].len);
 						} else {
-							trainlisttest.list[code].speeds = parseFloat(data.body[tl].v*10/36/20/trainlisttest.list[code].len);
+							trainlisttest.list[code].speeds = parseFloat(data.body[tl].v*10/36/21/trainlisttest.list[code].len);
 						}
 					} else {
 
-						trainlisttest.list[code].speeds = parseFloat(data.body[tl].v*10/36/20/trainlisttest.list[code].len);
+						trainlisttest.list[code].speeds = parseFloat(data.body[tl].v*10/36/21/trainlisttest.list[code].len);
 					}
 
 					if (code == drivingcode) {
@@ -150,30 +155,31 @@ export function Jlmap3dSubscribe(jlmap3d) {
 						if ( trainlisttest.list[code]) {
 							if (code == drivingcode) {
 								driverswitch = data.body[i].runMode;
+								//更新车组号
 								jlmap3d.updatetrainnum(data.body[i].groupNumber);
-								// console.log(trainlisttest.list[code].progress);
-								const syncdata = {
+								//更新列车
+								let syncdata = {
 									type: 'Train',
 									code: code,
 									sectionCode: data.body[i].sectionCode,
 									percent: 0
 								};
 
-								if (trainlisttest.list[code].isStandTrack == true && trainlisttest.list[code].progress>0.95 && trainlisttest.list[code].speed<=0) {
-									if (data.body[i].directionType == '02') {
-										syncdata.percent = 1-(sectionlist.sections.datalist[data.body[i].sectionCode].rstop/trainlisttest.list[code].len);
-									} else {
-										syncdata.percent = sectionlist.sections.datalist[data.body[i].sectionCode].lstop/trainlisttest.list[code].len;
-									}
-									scope.teststomp.send('/app/topic/simulation/client/drive', syncdata);
-								} else {
-									if (data.body[i].directionType == '02') {
-										syncdata.percent = trainlisttest.list[code].progress;
-									} else {
-										syncdata.percent = 1 - trainlisttest.list[code].progress;
-									}
-									scope.teststomp.send('/app/topic/simulation/client/drive', syncdata);
-								}
+								// if (trainlisttest.list[code].isStandTrack == true && trainlisttest.list[code].progress>0.95 && trainlisttest.list[code].speed<=0) {
+								// 	if (data.body[i].directionType == '02') {
+								// 		syncdata.percent = 1-(sectionlist.sections.datalist[data.body[i].sectionCode].rstop/trainlisttest.list[code].len);
+								// 	} else {
+								// 		syncdata.percent = sectionlist.sections.datalist[data.body[i].sectionCode].lstop/trainlisttest.list[code].len;
+								// 	}
+								// 	scope.teststomp.send('/app/topic/simulation/client/drive', syncdata);
+								// } else {
+								// 	if (data.body[i].directionType == '02') {
+								// 		syncdata.percent = trainlisttest.list[code].progress;
+								// 	} else {
+								// 		syncdata.percent = 1 - trainlisttest.list[code].progress;
+								// 	}
+								// 	scope.teststomp.send('/app/topic/simulation/client/drive', syncdata);
+								// }
 
 								if (data.body[i].parkRemainTime>0) {
 									jlmap3d.updatestoptime('停站时间:'+parseInt(data.body[i].parkRemainTime));
@@ -181,21 +187,21 @@ export function Jlmap3dSubscribe(jlmap3d) {
 									if (data.body[i].runMode == '02') {
 										jlmap3d.updatestoptime('列车自动驾驶中');
 									} 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){
-											//       jlmap3d.updatestoptime("停站时间:"+num);
-											//       num --;
-											//     }
-											//   },1000);
-											// }
-
-										} else {
-											jlmap3d.updatestoptime('列车人工驾驶中');
-										}
+										// 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){
+										// 	//       jlmap3d.updatestoptime("停站时间:"+num);
+										// 	//       num --;
+										// 	//     }
+										// 	//   },1000);
+										// 	// }
+										//
+										// } else {
+										// 	jlmap3d.updatestoptime('列车人工驾驶中');
+										// }
 
 									}
 								}
@@ -252,106 +258,53 @@ export function Jlmap3dSubscribe(jlmap3d) {
 							//   }
 							// }
 							// 遍历获取所在轨道
-
 							if (trainlisttest.list[code].dispose != data.body[i].dispose && data.body[i].dispose == false) {
 
-								if (sectionlist.sections.datalist[data.body[i].sectionCode].code) {
+								if (rails.linkrail[data.body[i].linkCode]) {
 									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].oldoffset = data.body[i].linkOffsetPercent;
 									trainlisttest.list[code].dispose = false;
-									trainlisttest.list[code].nowcode = data.body[i].sectionCode;
-									trainlisttest.list[code].nextcode = data.body[i].nextSectionCode;
+									trainlisttest.list[code].nowcode = data.body[i].linkCode;
+									trainlisttest.list[code].nextcode = rails.linkrail[data.body[i].linkCode].next;
 									let vexlist = [];
-									let endrotation = null;
 
 									if (data.body[i].directionType == '02') { // 向右
-										let offset = null;
-										let rotaposx = null;
-
-										if (sectionlist.sections.datalist[data.body[i].sectionCode].rail[0].x>sectionlist.sections.datalist[data.body[i].sectionCode].rail[1].x) {
-											offset = sectionlist.sections.datalist[data.body[i].sectionCode].rail[0].x-sectionlist.sections.datalist[data.body[i].sectionCode].rail[1].x;
-											rotaposx = sectionlist.sections.datalist[data.body[i].sectionCode].rail[1].x+offset*data.body[i].sectionOffsetPercent;
-										} else {
-											offset = sectionlist.sections.datalist[data.body[i].sectionCode].rail[1].x-sectionlist.sections.datalist[data.body[i].sectionCode].rail[0].x;
-											rotaposx = sectionlist.sections.datalist[data.body[i].sectionCode].rail[0].x+offset*data.body[i].sectionOffsetPercent;
-										}
-
-										let rotaposz = sectionlist.sections.datalist[data.body[i].sectionCode].rail[0].z;
-
+										let point = rails.linkrail[data.body[i].linkCode].lineleft.getPointAt(data.body[i].linkOffsetPercent);
 										trainlisttest.list[code].rotation.y = 0;
-										trainlisttest.list[code].position.x = rotaposx;
+										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 = rotaposz;
+											trainlisttest.list[code].children[tl].position.z = point.z;
 										}
 
-										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(rotaposx, 0, rotaposz));
-											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>rotaposx) {
-													vexlist.push(sectionlist.sections.datalist[data.body[i].sectionCode].rail[m]);
-												}
-
-											}
-										} else {
-											vexlist.push(new THREE.Vector3(rotaposx, 0, rotaposz));
-											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>rotaposx) {
-													vexlist.push(sectionlist.sections.datalist[data.body[i].sectionCode].rail[m]);
-												}
-											}
-										}
 										trainlisttest.list[code].status = '02';
-
+										trainlisttest.list[code].progress = data.body[i].linkOffsetPercent;
+										trainlisttest.list[code].curve = rails.linkrail[data.body[i].linkCode].lineleft;
 									} else if (data.body[i].directionType == '03') { // 向左
-
-										trainlisttest.list[code].dispose = false;
-										trainlisttest.group.add(trainlisttest.list[code]);
-										let offset = null;
-										let rotaposx = null;
-
-										if (sectionlist.sections.datalist[data.body[i].sectionCode].rail[0].x>sectionlist.sections.datalist[data.body[i].sectionCode].rail[1].x) {
-
-											offset = sectionlist.sections.datalist[data.body[i].sectionCode].rail[0].x-sectionlist.sections.datalist[data.body[i].sectionCode].rail[1].x;
-											rotaposx = sectionlist.sections.datalist[data.body[i].sectionCode].rail[1].x+offset*data.body[i].sectionOffsetPercent;
-										} else {
-
-											offset = sectionlist.sections.datalist[data.body[i].sectionCode].rail[1].x-sectionlist.sections.datalist[data.body[i].sectionCode].rail[0].x;
-											rotaposx = sectionlist.sections.datalist[data.body[i].sectionCode].rail[0].x+offset*data.body[i].sectionOffsetPercent;
-										}
-										let rotaposz = sectionlist.sections.datalist[data.body[i].sectionCode].rail[1].z;
-
+										let point = rails.linkrail[data.body[i].linkCode].lineright.getPointAt((1-data.body[i].linkOffsetPercent));
 										trainlisttest.list[code].rotation.y = Math.PI;
-										trainlisttest.list[code].position.x = rotaposx;
+										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 = -rotaposz;
-										}
-										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(rotaposx, 0, rotaposz));
-											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<rotaposx) {
-													vexlist.push(sectionlist.sections.datalist[data.body[i].sectionCode].rail[m]);
-												}
-											}
-										} else {
-											vexlist.push(new THREE.Vector3(rotaposx, 0, rotaposz));
-											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<rotaposx) {
-													vexlist.push(sectionlist.sections.datalist[data.body[i].sectionCode].rail[m]);
-												}
-											}
+											trainlisttest.list[code].children[tl].position.z = -point.z;
 										}
+										// if(trainlisttest.list[code].rname == "006"){
+										// 	console.log("0000000000000000");
+										// 	console.log(data.body[i].linkOffsetPercent);
+										// }
+
 										trainlisttest.list[code].status = '03';
+										trainlisttest.list[code].progress = 1-data.body[i].linkOffsetPercent;
+										trainlisttest.list[code].curve = rails.linkrail[data.body[i].linkCode].lineright;
 									}
 
-									trainlisttest.list[code].curve = new THREE.CatmullRomCurve3(vexlist);
-									trainlisttest.list[code].isStandTrack = sectionlist.sections.datalist[data.body[i].sectionCode].isStandTrack;
-									trainlisttest.list[code].progress = 0;
-									trainlisttest.list[code].len = sectionlist.sections.datalist[data.body[i].sectionCode].distance;
+
+									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){
@@ -360,7 +313,7 @@ export function Jlmap3dSubscribe(jlmap3d) {
 										// 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/20/trainlisttest.list[code].len);
+										trainlisttest.list[code].speeds = parseFloat(data.body[i].speed*10/36/21/trainlisttest.list[code].len);
 									}
 
 								}
@@ -377,7 +330,7 @@ export function Jlmap3dSubscribe(jlmap3d) {
 
 							} 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 (rails.linkrail[data.body[i].linkCode]) {
 									if (driverswitch == '02' && code == drivingcode) {
 										jlmap3d.updatenowspeed(data.body[i].speed);
 										if (data.body[i].atpSpeed) {
@@ -415,13 +368,11 @@ export function Jlmap3dSubscribe(jlmap3d) {
 											jlmap3d.updatenowlen(0);
 										}
 									}
-
-									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(trainlisttest.list[code].nowcode != data.body[i].linkCode){
+										trainlisttest.list[code].nowcode = data.body[i].linkCode;
+										trainlisttest.list[code].nextcode = rails.linkrail[data.body[i].linkCode].next;
 										if (data.body[i].directionType == '02') { // 向右
+											trainlisttest.list[code].progress = 0;
 											if (trainlisttest.list[code].status != data.body[i].directionType) {
 												const rotaposx = trainlisttest.list[code].children[5].matrixWorld.elements[12];
 												const rotaposz = trainlisttest.list[code].children[0].matrixWorld.elements[14];
@@ -430,81 +381,52 @@ export function Jlmap3dSubscribe(jlmap3d) {
 												for (let tl=0; tl<6; tl++) {
 													trainlisttest.list[code].children[tl].position.z = rotaposz;
 												}
-												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].rotation.y = 0;
+
+												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;
 										} else if (data.body[i].directionType == '03') { // 向左
+											trainlisttest.list[code].progress = 0;
 											if (trainlisttest.list[code].status != data.body[i].directionType) {
 												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].children[tl].position.z = -rotaposz;
 												}
-												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].rotation.y = Math.PI;
+													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 = new THREE.CatmullRomCurve3(vexlist);
-										trainlisttest.list[code].isStandTrack = sectionlist.sections.datalist[data.body[i].sectionCode].isStandTrack;
-										trainlisttest.list[code].len = sectionlist.sections.datalist[data.body[i].sectionCode].distance;
-										trainlisttest.list[code].progress = 0;
-										trainlisttest.list[code].speed = data.body[i].speed;
-										trainlisttest.list[code].speeds = parseFloat(data.body[i].speed*10/36/20/trainlisttest.list[code].len);
 
+											trainlisttest.list[code].status = '03';
+											trainlisttest.list[code].curve = rails.linkrail[data.body[i].linkCode].lineright;
+										}
+
+
+
+										// console.log(rails.linkrail[data.body[i].linkCode]);
+										// console.log(data.body[i].linkCode)
+										// console.log(nextcode);
+
+
+										trainlisttest.list[code].len = rails.linkrail[data.body[i].linkCode].lengthfact;
 									}
+
+
+						      if(data.body[i].directionType == '02'){
+										let nextcode = rails.linkrail[data.body[i].linkCode].rconnect;
+										if(nextcode){
+											trainlisttest.list[code].nextcurve = rails.linkrail[nextcode].lineright;
+										}
+
+						      }else if(data.body[i].directionType == '03'){
+										let nextcode = rails.linkrail[data.body[i].linkCode].lconnect;
+										if(nextcode){
+											trainlisttest.list[code].nextcurve = rails.linkrail[nextcode].lineleft;
+										}
+
+						      }
 								}
 							}
 						}
@@ -514,6 +436,7 @@ export function Jlmap3dSubscribe(jlmap3d) {
 		}
 
 		if (data.type == 'Simulation_DeviceStatus') {
+
 			for (let i=data.body.length-1; i>=0; i--) {
 				// 0xFFFFFF
 				// 0xCD0000  红
@@ -663,8 +586,8 @@ export function Jlmap3dSubscribe(jlmap3d) {
 	function switchupdate(data) {
 		code = data.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.locateType) {
+			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;
@@ -673,6 +596,21 @@ export function Jlmap3dSubscribe(jlmap3d) {
 							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;
@@ -681,6 +619,20 @@ export function Jlmap3dSubscribe(jlmap3d) {
 							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;
diff --git a/src/jlmap3d/jl3dsimulation/jlmap3d.js b/src/jlmap3d/jl3dsimulation/jlmap3d.js
index 5e2db0c19..e5fa3291c 100644
--- a/src/jlmap3d/jl3dsimulation/jlmap3d.js
+++ b/src/jlmap3d/jl3dsimulation/jlmap3d.js
@@ -17,7 +17,6 @@ import { SetRender } from '@/jlmap3d/config/SetRender';
 import { SetScene } from '@/jlmap3d/config/SetScene';
 import { SetLights } from '@/jlmap3d/config/SetLights';
 
-
 //controls
 import { OrbitControls } from '@/jlmap3d/main/control/OrbitControls';
 import { DragControls } from '@/jlmap3d/main/control/DragControls';
@@ -29,15 +28,15 @@ import {Jlmap3dSubscribe } from '@/jlmap3d/jl3dsimulation/connect/TrainingConnec
 import { getPublishMapVersion, getPublishMapDetail,getPublish3dMapDetail} from '@/api/jlmap3d/load3ddata';
 
 //utils
-import { UpdateTrain } from '@/jlmap3d/main/utils/UpdateTrain';
-//import { UpdateTrain } from '@/jlmap3d/main/utils/UpdateTrainTest';
+// import { UpdateTrain } from '@/jlmap3d/main/utils/UpdateTrain';
+import { UpdateTrain } from '@/jlmap3d/main/utils/UpdateTrainTest';
 // import { ReStart } from '@/jlmap3d/main/utils/ReStart';
 
 import {Stats} from '@/jlmap3d/main/lib/stats.min.js';
 
 var clock = new THREE.Clock();
 
-export function JLmap3d(dom, data,skinCode) {
+export function JLmap3d(dom, data,skinCode,storemod) {
 
 
   let scope = this;
@@ -55,7 +54,6 @@ export function JLmap3d(dom, data,skinCode) {
   //定义场景(渲染容器)
   let scene = SetScene();
   //定义镜头操作
-  console.log(THREE.OrbitControls);
   let controls = new THREE.OrbitControls(camera);
   controls.maxPolarAngle = Math.PI/2;
   //controls.minPolarAngle = Math.PI/8;
@@ -83,14 +81,13 @@ export function JLmap3d(dom, data,skinCode) {
   this.Subscribe = new Jlmap3dSubscribe(this.webwork);
   //连接到通信
   //console.log(this.Subscribe.config);
-
   //this.webwork.postMessage(this.Subscribe.teststomp);
 
   this.Subscribe.socketon(scope.Subscribe.topic);
 
   //初始化加载数据和模型
   getPublish3dMapDetail(skinCode).then(netdata => {
-    ModelLoad(data,scope,netdata.data,mapdata,camera,controls,scene);
+    ModelLoad(data,scope,netdata.data,mapdata,camera,controls,scene,storemod);
   });
   //
   // let stats = new Stats();
diff --git a/src/jlmap3d/main/control/ScalControls.js b/src/jlmap3d/main/control/ScalControls.js
index d6e291b26..9adb87dad 100644
--- a/src/jlmap3d/main/control/ScalControls.js
+++ b/src/jlmap3d/main/control/ScalControls.js
@@ -142,7 +142,7 @@ THREE.ScalControls = function ( scene,_camera, _domElement ) {
 				// _movemesh.geometry.computeBoundingBox();
 				_movemesh.geometry.computeBoundingSphere();
 				_movemesh.geometry.center();
-				_movemesh.lengthfact = (_movemesh.geometry.attributes.position.array[_movemesh.rightlist[0]] - _movemesh.geometry.attributes.position.array[_movemesh.leftlist[0]])*2+20.5;
+				_movemesh.lengthfact = (_movemesh.geometry.attributes.position.array[_movemesh.rightlist[0]] - _movemesh.geometry.attributes.position.array[_movemesh.leftlist[0]])*2+28;
 				// testmesh2.position.z = 50;
 
 				// testmesh2.geometry.center();
diff --git a/src/jlmap3d/main/loaders/AssetLoader.js b/src/jlmap3d/main/loaders/AssetLoader.js
index 05011ca8d..9410a6329 100644
--- a/src/jlmap3d/main/loaders/AssetLoader.js
+++ b/src/jlmap3d/main/loaders/AssetLoader.js
@@ -9,7 +9,7 @@ let defaultsignal = {
   deviceType:"signal",
   type:"low",
   picUrl:"",
-  assetUrl:"https://joylink.club/oss/models/signal/d3d.FBX"
+  assetUrl:"https://test.joylink.club/oss/models/signal/d3d.FBX"
 }
 
 let defaulttrain = {
@@ -18,7 +18,7 @@ let defaulttrain = {
   deviceType:"train",
   type:"num4",
   picUrl:"",
-  assetUrl:"https://joylink.club/oss/models/train/train.FBX"
+  assetUrl:"https://test.joylink.club/oss/models/train/train.FBX"
 }
 
 
@@ -28,8 +28,10 @@ let defaultstation = {
   deviceType:"stand",
   type:"num4",
   picUrl:"",
-  assetUrl:"../../static/model/station/fuzhou.FBX"
-}//https://joylink.club/oss/models/station/fuzhou/fuzhou.FBX
+  assetUrl:"https://test.joylink.club/oss/models/station/fuzhou/fuzhou.FBX"
+}
+//https://test.joylink.club/oss/models/station/fuzhou/fuzhou.FBX
+//https://joylink.club/oss/models/station/fuzhou/fuzhou.FBX
 //../../static/model/station/zhantai715(2).FBX
 
 let defaultswitch = {
@@ -38,7 +40,7 @@ let defaultswitch = {
   deviceType:"switch",
   type:"fuzhou",
   picUrl:"",
-  assetUrl:"../../static/model/daocha/daocha.FBX"
+  assetUrl:"https://test.joylink.club/oss/models/daocha/daocha.FBX"
 }
 
 let defaultdriver = {
@@ -56,8 +58,10 @@ let defaultsuidao = {
   deviceType:"suidao",
   type:"suidao",
   picUrl:"",
-  assetUrl:"https://joylink.club/oss/models/suidao/suidao.FBX"
-}//https://joylink.club/oss/models/suidao/suidao.FBX
+  assetUrl:"https://test.joylink.club/oss/models/suidao/suidao.FBX"
+}
+//https://test.joylink.club/oss/models/suidao/suidao.FBX
+//https://joylink.club/oss/models/suidao/suidao.FBX
 //../../static/model/
 
 let defaultautorail = {
@@ -75,7 +79,7 @@ let defaultautosuidao = {
   deviceType:"autosuidao",
   type:"autosuidao",
   picUrl:"",
-  assetUrl:"../../static/model/auto/suidao.FBX"
+  assetUrl:"https://test.joylink.club/oss/models/auto/suidao.FBX"
 }
 
 let autoswitch1 = {
@@ -84,7 +88,7 @@ let autoswitch1 = {
   deviceType:"autoswitch1",
   type:"fuzhou",
   picUrl:"",
-  assetUrl:"../../static/model/auto/switch1.FBX"
+  assetUrl:"https://test.joylink.club/oss/models/auto/switch1.FBX"
 }
 
 let autoswitch2 = {
@@ -93,7 +97,7 @@ let autoswitch2 = {
   deviceType:"autoswitch2",
   type:"fuzhou",
   picUrl:"",
-  assetUrl:"../../static/model/auto/switch2.FBX"
+  assetUrl:"https://test.joylink.club/oss/models/auto/switch2.FBX"
 }
 
 export function AssetLoader(){
@@ -107,7 +111,7 @@ export function AssetLoader(){
   this.materiallist = [];
   //初始化资源加载器
   this.setmodellist = function (data){
-
+    // console.log("setmodellist");
     let defaultmodel1 = new AssetModel(defaultsignal);
     scope.modellist.push(defaultmodel1);
 
@@ -129,7 +133,6 @@ export function AssetLoader(){
     let defaultswitch2 = new AssetModel(autoswitch2);
     scope.modellist.push(defaultswitch2);
 
-
     let modeldata = JSON.parse(data);
 
     for(let j=0;j<modeldata.length;j++){
@@ -444,10 +447,9 @@ export function AssetLoader(){
       var loader = new THREE.FBXLoader();
       loader.load( asset.assetUrl, function ( object ) {
         let mixer = new THREE.AnimationMixer( object );
-        // object.traverse(function (node) {//获取其中对象
-        //           node.frustumCulled = true;
-        //
-        //   });
+        //object.traverse(function (node) {//获取其中对象
+        //  node.frustumCulled = true;
+        //});
 
 
         if(asset.deviceType == "train"){
@@ -456,7 +458,7 @@ export function AssetLoader(){
             let name = "c"+j;
             for(let i=0;i<object.children.length;i++){
               if(object.children[i].name == name){
-                object.children[i].position.x = object.children[i].position.x+38.1;
+                object.children[i].position.x = object.children[i].position.x;
                 //object.children[i].position.y = j*10;
                 realtrain.add(object.children[i]);
                 i--;
diff --git a/src/jlmap3d/main/loaders/ModelLoad.js b/src/jlmap3d/main/loaders/ModelLoad.js
index 367f28774..fce2a61c2 100644
--- a/src/jlmap3d/main/loaders/ModelLoad.js
+++ b/src/jlmap3d/main/loaders/ModelLoad.js
@@ -4,13 +4,15 @@ 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 { Loading } from 'element-ui';
 // import {SwitchModel} from '@/jlmap3d/model/SwitchModel.js';
 
-export function ModelLoad(data,scope,netdata,mapdata,camera,controls,scene){
+export function ModelLoad(data,scope,netdata,mapdata,camera,controls,scene,storemod){
   //console.log(mapdata);
   Materialload(scope);
   //console.log(data);
@@ -28,13 +30,13 @@ export function ModelLoad(data,scope,netdata,mapdata,camera,controls,scene){
 
   let isSection = false;
   if(netdata.assets){
-    let assetsdata = JSON.parse(netdata.assets);
-    for(let i=0;i<assetsdata.length;i++){
-      if(assetsdata[i].deviceType == "mapSection"){
-        isSection = true;
-      }
+    let assetsdata = JSON.parse(netdata.sections);
+    if(assetsdata.link){
+      isSection = true;
     }
+
   }
+
   if(isSection == true){
     init3d(data,netdata);
   }else{
@@ -48,7 +50,9 @@ export function ModelLoad(data,scope,netdata,mapdata,camera,controls,scene){
       // console.log(data);
       //初始化轨道和道岔   暂时
       lengthfact(data);
+      jlmap3ddata.linklist = new LinkList();
       jlmap3ddata.sectionlist = new SectionList();
+      //初始化信号机
       jlmap3ddata.signallist = new SignalList();
       //初始化站台
       jlmap3ddata.stationstandlist = new StationStandList();
@@ -56,10 +60,19 @@ export function ModelLoad(data,scope,netdata,mapdata,camera,controls,scene){
       jlmap3ddata.trainlisttest = new TrainList();
 
       jlmap3ddata.realsectionlist = new RealSectionList();
-
+      jlmap3ddata.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);
 
         assetloader.assetpromise(sceneload)
+        .then(function(data){
+          //console.log(data);
+          return   jlmap3ddata.linklist.loadpromise(loaderdata.link,scene,assetloader);
+        })
         .then(function(data){
           //console.log(data);
           return  jlmap3ddata.stationstandlist.initpromise(mapdata.stationList,mapdata.stationStandList,sceneload,assetloader,netdata.stands,mixers,actions);
@@ -71,53 +84,31 @@ export function ModelLoad(data,scope,netdata,mapdata,camera,controls,scene){
         })
         .then(function(data){
           //console.log(data);
-          return   jlmap3ddata.sectionlist.initpromise(mapdata.sectionList,mapdata.switchList,sceneload);
-        })
-        .then(function(data){
-          //console.log(data);
-          return  jlmap3ddata.realsectionlist.initpromise(jlmap3ddata,sceneload,assetloader,mixers,actions);
+          return   jlmap3ddata.sectionlist.loadpromise(jlmap3ddata,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   jlmap3ddata.signallist.initpromise(mapdata.signalList,sceneload,assetloader,netdata.signals);
         })
         .then(function(data){
           return new Promise(function(resolve, reject){
-
-            let loader = new THREE.OBJLoader(  );
-
-            loader.load( '../../static/rail/fuzhoupath.obj', function ( obj ) {
-
-              let object = obj;
-              //console.log(object.children.length);
-
-              let rail = [];
-              for(let i=0;i<object.children.length;i++){
-                let name = object.children[i].name.split("_");
-                let newmeshname = name[0]+"_"+name[1]+"_"+name[2]+"."+name[3];
-
-                let vexlist = [];
-                //console.log( object.children[i].geometry.attributes.position.array);
-                for(let j=0;j<object.children[i].geometry.attributes.position.array.length;j){
-                  //console.log(object.children[i].geometry.attributes.position.array[j]);
-                  let ved = new THREE.Vector3( object.children[i].geometry.attributes.position.array[j], object.children[i].geometry.attributes.position.array[j+1], object.children[i].geometry.attributes.position.array[j+2] );
-                  j=j+3;
-
-                  vexlist.push(ved);
-                }
-
-                if(jlmap3ddata.sectionlist.sections.datalist[newmeshname].code){
-                  jlmap3ddata.sectionlist.sections.datalist[newmeshname].rail = vexlist;
-                  //console.log(jlmap3ddata.sectionlist.sections.datalist[n].rail.length);
-                }
-              }
-
-                  resolve("loadedrealsection");
-              }, onProgress, onError );
+            jlmap3ddata.rails.init(loaderdata.link,switchdata,sceneload,storemod);
+            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;
+          //     console.log(scope.assetloader.modellist[mn].mesh.position);
+          //     scene.add(scope.assetloader.modellist[mn].mesh);
+          //   }
+          // }
 
           scope.animateswitch = true;
 
diff --git a/src/jlmap3d/main/loaders/simulationloader.js b/src/jlmap3d/main/loaders/simulationloader.js
index 5bc9be451..f374edf57 100644
--- a/src/jlmap3d/main/loaders/simulationloader.js
+++ b/src/jlmap3d/main/loaders/simulationloader.js
@@ -4,13 +4,15 @@ 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 { Loading } from 'element-ui';
 // import {SwitchModel} from '@/jlmap3d/model/SwitchModel.js';
 
-export function ModelLoad(data,scope,netdata,mapdata,camera,controls,scene,mixerss){
+export function ModelLoad(data,scope,netdata,mapdata,camera,controls,scene,mixerss,storemod){
   //console.log(mapdata);
   Materialload(scope);
   //console.log(data);
@@ -27,12 +29,12 @@ export function ModelLoad(data,scope,netdata,mapdata,camera,controls,scene,mixer
 
 
   let isSection = false;
+
   if(netdata.assets){
-    let assetsdata = JSON.parse(netdata.assets);
-    for(let i=0;i<assetsdata.length;i++){
-      if(assetsdata[i].deviceType == "mapSection"){
-        isSection = true;
-      }
+    let assetsdata = JSON.parse(netdata.sections);
+      // console.log(netdata);
+    if(assetsdata.link){
+      isSection = true;
     }
   }
   if(isSection == true){
@@ -48,6 +50,7 @@ export function ModelLoad(data,scope,netdata,mapdata,camera,controls,scene,mixer
       // console.log(data);
       //初始化轨道和道岔   暂时
       lengthfact(data);
+      jlmap3ddata.linklist = new LinkList();
       jlmap3ddata.sectionlist = new SectionList();
       jlmap3ddata.signallist = new SignalList();
       //初始化站台
@@ -56,10 +59,18 @@ export function ModelLoad(data,scope,netdata,mapdata,camera,controls,scene,mixer
       jlmap3ddata.trainlisttest = new TrainList();
 
       jlmap3ddata.realsectionlist = new RealSectionList();
-
+      jlmap3ddata.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){
+          //console.log(data);
+          return   jlmap3ddata.linklist.loadpromise(loaderdata.link,scene,assetloader);
+        })
         .then(function(data){
           //console.log(data);
           return  jlmap3ddata.stationstandlist.initpromise(mapdata.stationList,mapdata.stationStandList,sceneload,assetloader,netdata.stands,mixers,actions);
@@ -71,64 +82,34 @@ export function ModelLoad(data,scope,netdata,mapdata,camera,controls,scene,mixer
         })
         .then(function(data){
           //console.log(data);
-          return   jlmap3ddata.sectionlist.initpromise(mapdata.sectionList,mapdata.switchList,sceneload);
-        })
-        .then(function(data){
-          //console.log(data);
-          return  jlmap3ddata.realsectionlist.initpromise(jlmap3ddata,sceneload,assetloader,mixers,actions);
+          return   jlmap3ddata.sectionlist.loadpromise(jlmap3ddata,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   jlmap3ddata.signallist.initpromise(mapdata.signalList,sceneload,assetloader,netdata.signals);
         })
         .then(function(data){
           return new Promise(function(resolve, reject){
-
-            let loader = new THREE.OBJLoader(  );
-
-            loader.load( '../../static/rail/fuzhoupath.obj', function ( obj ) {
-
-              let object = obj;
-              //console.log(object.children.length);
-
-              let rail = [];
-              for(let i=0;i<object.children.length;i++){
-                let name = object.children[i].name.split("_");
-                let newmeshname = name[0]+"_"+name[1]+"_"+name[2]+"."+name[3];
-
-                let vexlist = [];
-                //console.log( object.children[i].geometry.attributes.position.array);
-                for(let j=0;j<object.children[i].geometry.attributes.position.array.length;j){
-                  //console.log(object.children[i].geometry.attributes.position.array[j]);
-                  let ved = new THREE.Vector3( object.children[i].geometry.attributes.position.array[j], object.children[i].geometry.attributes.position.array[j+1], object.children[i].geometry.attributes.position.array[j+2] );
-                  j=j+3;
-
-                  vexlist.push(ved);
-                }
-
-                if(jlmap3ddata.sectionlist.sections.datalist[newmeshname].code){
-                  jlmap3ddata.sectionlist.sections.datalist[newmeshname].rail = vexlist;
-                  //console.log(jlmap3ddata.sectionlist.sections.datalist[n].rail.length);
-                }
-              }
-
-                  resolve("loadedrealsection");
-              }, onProgress, onError );
+            jlmap3ddata.rails.init(loaderdata.link,switchdata,sceneload,storemod);
+            resolve("loadrail");
 
           });
         })
-        .then(function(data){
 
+        .then(function(data){
           for(let mn=0;mn<scope.assetloader.modellist.length;mn++){
-            if(scope.assetloader.modellist[mn].name && scope.assetloader.modellist[mn].name == "驾驶台"){
-              scope.assetloader.modellist[mn].mesh.position.y = -50000;
-              scene.add(scope.assetloader.modellist[mn].mesh);
-            }
             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;
               scene.add(scope.assetloader.modellist[mn].mesh);
             }
           }
 
+
           scope.animateswitch = true;
 
           mapdata = jlmap3ddata;
diff --git a/src/jlmap3d/main/model/LinkList.js b/src/jlmap3d/main/model/LinkList.js
new file mode 100644
index 000000000..094c78b95
--- /dev/null
+++ b/src/jlmap3d/main/model/LinkList.js
@@ -0,0 +1,309 @@
+
+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){
+    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){
+    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);
+}
+
+
+
+  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++){
+      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;
+      scope.linkdata.push(testmesh2);
+      scope.linksgroup.add(testmesh2);
+    }
+  }
+
+
+
+  // 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
new file mode 100644
index 000000000..ea24cd669
--- /dev/null
+++ b/src/jlmap3d/main/model/RailList.js
@@ -0,0 +1,149 @@
+export function RailList(){
+  let scope = this;
+
+  this.linkrail = [];
+
+  this.switchrail = [];
+
+  this.setrail = function(){
+
+  };
+
+  this.init = function(linkdata,switchdata,scene,storemod){
+
+    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
+      };
+      if(linkdata[i].rotation._z == 0){
+        scope.linkrail[linkdata[i].code].points.push(new THREE.Vector3(scope.linkrail[linkdata[i].code].lp.x+2,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-2,0,scope.linkrail[linkdata[i].code].rp.z));
+        scope.linkrail[linkdata[i].code].type = 0;
+      }else{
+
+        if(linkdata[i].rotation._z>0){
+          scope.linkrail[linkdata[i].code].points.push(new THREE.Vector3(scope.linkrail[linkdata[i].code].lp.x+2.1,0,scope.linkrail[linkdata[i].code].lp.z-0.6));
+          scope.linkrail[linkdata[i].code].points.push(new THREE.Vector3(scope.linkrail[linkdata[i].code].rp.x-2.1,0,scope.linkrail[linkdata[i].code].rp.z+0.6));
+          scope.linkrail[linkdata[i].code].type = 1;
+        }else{
+          scope.linkrail[linkdata[i].code].type = 2;
+          scope.linkrail[linkdata[i].code].points.push(new THREE.Vector3(scope.linkrail[linkdata[i].code].lp.x+2.1,0,scope.linkrail[linkdata[i].code].lp.z+0.6));
+          scope.linkrail[linkdata[i].code].points.push(new THREE.Vector3(scope.linkrail[linkdata[i].code].rp.x-2.1,0,scope.linkrail[linkdata[i].code].rp.z-0.6));
+        }
+      }
+
+    }
+    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].blink].points.push(new THREE.Vector3(switchdata[i].position.x,switchdata[i].position.y,switchdata[i].position.z));
+        if(scope.linkrail[switchdata[i].alink].type == 1){
+          scope.linkrail[switchdata[i].blink].points.push(new THREE.Vector3(scope.linkrail[switchdata[i].alink].lp.x+2.1,0,scope.linkrail[switchdata[i].alink].lp.z-0.6));
+        }else if(scope.linkrail[switchdata[i].alink].type == 2){
+          scope.linkrail[switchdata[i].blink].points.push(new THREE.Vector3(scope.linkrail[switchdata[i].alink].lp.x+2.1,0,scope.linkrail[switchdata[i].alink].lp.z+0.6));
+        }else{
+          scope.linkrail[switchdata[i].blink].points.push(new THREE.Vector3(scope.linkrail[switchdata[i].alink].lp.x+2,0,scope.linkrail[switchdata[i].alink].lp.z));
+        }
+        scope.switchrail[switchdata[i].code].directtype = "1";
+      }else{
+        scope.linkrail[switchdata[i].blink].points.splice(0,0,new THREE.Vector3(switchdata[i].position.x,switchdata[i].position.y,switchdata[i].position.z));
+        if(scope.linkrail[switchdata[i].alink].type == 1){
+          scope.linkrail[switchdata[i].blink].points.splice(0,0,new THREE.Vector3(scope.linkrail[switchdata[i].alink].rp.x-2.1,0,scope.linkrail[switchdata[i].alink].rp.z+0.6));
+        }else if(scope.linkrail[switchdata[i].alink].type == 2){
+          scope.linkrail[switchdata[i].blink].points.splice(0,0,new THREE.Vector3(scope.linkrail[switchdata[i].alink].rp.x-2.1,0,scope.linkrail[switchdata[i].alink].rp.z-0.6));
+        }else{
+          scope.linkrail[switchdata[i].blink].points.splice(0,0,new THREE.Vector3(scope.linkrail[switchdata[i].alink].rp.x-2,0,scope.linkrail[switchdata[i].alink].rp.z));
+        }
+        scope.switchrail[switchdata[i].code].directtype = "2";
+      }
+      //
+      if(scope.linkrail[switchdata[i].clink].lp.x < switchdata[i].position.x){
+        scope.linkrail[switchdata[i].clink].points.push(new THREE.Vector3(switchdata[i].position.x,switchdata[i].position.y,switchdata[i].position.z));
+        if(scope.linkrail[switchdata[i].alink].type == 1){
+          scope.linkrail[switchdata[i].clink].points.push(new THREE.Vector3(scope.linkrail[switchdata[i].alink].lp.x+2.1,0,scope.linkrail[switchdata[i].alink].lp.z-0.6));
+        }else if(scope.linkrail[switchdata[i].alink].type == 2){
+          scope.linkrail[switchdata[i].clink].points.push(new THREE.Vector3(scope.linkrail[switchdata[i].alink].lp.x+2.1,0,scope.linkrail[switchdata[i].alink].lp.z+0.6));
+        }else{
+          scope.linkrail[switchdata[i].clink].points.push(new THREE.Vector3(scope.linkrail[switchdata[i].alink].lp.x+2,0,scope.linkrail[switchdata[i].alink].lp.z));
+        }
+        scope.switchrail[switchdata[i].code].directtype = "1";
+      }else{
+        scope.linkrail[switchdata[i].clink].points.splice(0,0,new THREE.Vector3(switchdata[i].position.x,switchdata[i].position.y,switchdata[i].position.z));
+        if(scope.linkrail[switchdata[i].alink].type == 1){
+            scope.linkrail[switchdata[i].clink].points.splice(0,0,new THREE.Vector3(scope.linkrail[switchdata[i].alink].rp.x-2.1,0,scope.linkrail[switchdata[i].alink].rp.z+0.6));
+        }else if(scope.linkrail[switchdata[i].alink].type == 2){
+            scope.linkrail[switchdata[i].clink].points.splice(0,0,new THREE.Vector3(scope.linkrail[switchdata[i].alink].rp.x-2.1,0,scope.linkrail[switchdata[i].alink].rp.z-0.6));
+        }else{
+            scope.linkrail[switchdata[i].clink].points.splice(0,0,new THREE.Vector3(scope.linkrail[switchdata[i].alink].rp.x-2,0,scope.linkrail[switchdata[i].alink].rp.z));
+        }
+        scope.switchrail[switchdata[i].code].directtype = "2";
+      }
+
+      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;
+        }
+      }
+    }
+    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 = "catmullrom";
+      // 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 = "catmullrom";
+      // scope.linkrail[linkdata[i].code].lineright.tension = 0.1;
+      var points = scope.linkrail[linkdata[i].code].lineleft.getPoints( 50 );
+      var geometry = new THREE.BufferGeometry().setFromPoints( points );
+
+      var material = new THREE.LineBasicMaterial( { color : 0xff0000 } );
+
+      // Create the final object to add to the scene
+      var curveObject = new THREE.Line( geometry, material );
+      // scene.add(curveObject);
+    }
+
+  }
+
+  this.getrail = function(){
+
+  };
+}
diff --git a/src/jlmap3d/main/model/SectionList.js b/src/jlmap3d/main/model/SectionList.js
index 3cafeeed6..12114d0a8 100644
--- a/src/jlmap3d/main/model/SectionList.js
+++ b/src/jlmap3d/main/model/SectionList.js
@@ -6,6 +6,12 @@ export function SectionList() {
 
 	this.type = 'sectionlist';
 
+	let sectiongroup = new THREE.Group();
+	sectiongroup.name = "section";
+
+	let switchgroup = new THREE.Group();
+	switchgroup.name = "switch";
+
 	this.sections = {
 		datalist: [],
 		modellist: []
@@ -15,6 +21,7 @@ export function SectionList() {
 		datalist: [],
 		modellist: []
 	};
+	this.standtrack = [];
 
 	this.initpromise = function (sectiondata, switchdata, scene) {
 		return new Promise(function(resolve, reject) {
@@ -97,78 +104,287 @@ export function SectionList() {
 		});
 
 	};
+	this.loadpromise = function(jlmap3ddata,assetloader,sectiondata,switchdata,scene){
+    return new Promise(function(resolve, reject){
+      // scene.add(sectiongroup);
+      scene.add(switchgroup);
+      let linkdata = jlmap3ddata.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);
+        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;
+        }
+      }
+      // switchmesh1.rotation.x = Math.PI/2;
+      // switchmesh2.rotation.z = Math.PI/2;
+      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);
+    }
+  }
 
-	// this.init = function(sectiondata,switchdata,scene){
-	//
-	//   //遍历区段
-	//   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.type = sectiondata[i].type;
-	//
-	//       scope.sections.datalist.push(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("");
-	//   }
-	//
-	// }
 
 }
diff --git a/src/jlmap3d/main/model/SectionModel.js b/src/jlmap3d/main/model/SectionModel.js
index d3950be4a..9ba9abb07 100644
--- a/src/jlmap3d/main/model/SectionModel.js
+++ b/src/jlmap3d/main/model/SectionModel.js
@@ -8,8 +8,10 @@ export function  SectionModel(data) {
 	this.index = null;
 	//轨迹点
 	this.rail = [];
+
+	this.railline = null;
 	//长度
-	this.distance = null;
+	this.distance = [];
 
 	this.isStandTrack = null;
 
diff --git a/src/jlmap3d/main/model/StationStandList.js b/src/jlmap3d/main/model/StationStandList.js
index 367b644b6..cdde72fd3 100644
--- a/src/jlmap3d/main/model/StationStandList.js
+++ b/src/jlmap3d/main/model/StationStandList.js
@@ -50,11 +50,13 @@ export function StationStandList() {
               }
             }
           }
-          newstationstand.index = i;
+          newstationstand.num = i;
+
           scope.list[stationdata[i].code] = newstationstand;
         }
 
       }
+
       let map = scope.list;
       for(let k in map){
 
@@ -65,10 +67,6 @@ export function StationStandList() {
               num = j;
             }
           }
-
-
-
-
           map[k].mesh = assetloader.modellist[num].mesh.clone(true);
           map[k].id = assetloader.modellist[num].id;
           map[k].mesh.code = map[k].code;
@@ -98,25 +96,19 @@ export function StationStandList() {
           textmaterial.dispose();
           textt.dispose();
         }else{
+          for(let netnum =0;netnum <netstand.length;netnum++){
+            if(netstand[netnum].code == k ){
 
-
-            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;
-                    }
+                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;
                   }
-                  netnum = netstand.length;
-              }
+                }
+                netnum = netstand.length;
             }
-
-
-
-
+          }
           map[k].mesh = assetloader.modellist[num].mesh.clone(true);
           let newclip = assetloader.modellist[num].mesh.animations[ 0 ];
 
@@ -172,16 +164,15 @@ export function StationStandList() {
           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;
-
           let textgeometry = new THREE.PlaneBufferGeometry( 271, 374, 1 );
-          let textt = new THREE.CanvasTexture(getTextCanvas(stationdata[map[k].index]));
+          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].index].code;
+          textplane.name = stationdata[map[k].num].code;
 
           map[k].type = "station";
-          map[k].rname = stationdata[map[k].index].runPlanName;
-          map[k].kmmark = stationdata[map[k].index].kmPost;
+          map[k].rname = stationdata[map[k].num].runPlanName;
+          map[k].kmmark = stationdata[map[k].num].kmPost;
 
           textplane.position.y = 300;
           textplane.rotation.x = Math.PI/2;
diff --git a/src/jlmap3d/main/model/StationStandModel.js b/src/jlmap3d/main/model/StationStandModel.js
index 8e40c2a81..020992024 100644
--- a/src/jlmap3d/main/model/StationStandModel.js
+++ b/src/jlmap3d/main/model/StationStandModel.js
@@ -10,7 +10,7 @@ export function StationStandModel(opts) {
 	this.ismodel = false;
 	this.istexture = false;
 	this.modelurl = null;
-	
+	this.index = null;
 	this.direction1= {
 		position:null,
 		name:null,
diff --git a/src/jlmap3d/main/model/TrainList.js b/src/jlmap3d/main/model/TrainList.js
index a6b452ff3..604ae49e0 100644
--- a/src/jlmap3d/main/model/TrainList.js
+++ b/src/jlmap3d/main/model/TrainList.js
@@ -38,6 +38,7 @@ export function TrainList() {
           top:[],
           down:[]
         };
+
         for(let j=0;j<newmesh.children.length;j++){
 
           if(newmesh.children[j].name == "c1" || newmesh.children[j].name == "c6"){
@@ -122,8 +123,9 @@ export function TrainList() {
         let textmaterial = new THREE.MeshBasicMaterial( { side: THREE.DoubleSide,map:textt ,transparent: true} );
         let textplane = new THREE.Mesh( textgeometry, textmaterial );
         textplane.name = data[i].code;
-        textplane.position.x = -50;
-        textplane.position.y = 130;
+        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);
@@ -139,7 +141,7 @@ export function TrainList() {
         newmesh.groupNumber = data[i].groupNumber;
 
         newmesh.position.set(0,-50000,0);
-        newmesh.children[0].position.y = 0;
+        // newmesh.children[0].position.y = 0;
         //newmesh.rotation.y = Math.PI/2;
         newmesh.status = "00";
         newmesh.nowcode = null;
diff --git a/src/jlmap3d/main/utils/UpdateTrainTest.js b/src/jlmap3d/main/utils/UpdateTrainTest.js
index a5d6c7e6a..901b2794c 100644
--- a/src/jlmap3d/main/utils/UpdateTrainTest.js
+++ b/src/jlmap3d/main/utils/UpdateTrainTest.js
@@ -12,107 +12,61 @@ export function UpdateTrain(camera,traindata){
           if(trainmodel.speeds > 0 && trainmodel.speeds){
 
             let speed = null;
-            if(traindata.group.children[j].progress<1){
+            if(traindata.group.children[j].progress >=0&&traindata.group.children[j].progress<=1){
               // console.log(trainmodel.rname);
               // console.log(trainmodel.speeds);
               // console.log(trainmodel.progress);
               let movecurve = trainmodel.curve;
+              if(trainmodel.status == "03"){
+                if(movecurve.points.length>1){
+                  let point = movecurve.getPointAt(traindata.group.children[j].progress);
 
-              if(trainmodel.status == "03"){//向左
-                let point = movecurve.getPointAt(traindata.group.children[j].progress);
-                if(Math.abs( point.z -trainmodel.children[0].matrixWorld.elements[14]) >0.1){
-                  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);
-                  let rotas = {
-                    posr:point,
-                    rota:trainmodel.children[0].rotation.y
-                  }
-                  trainmodel.children[1].rotalist.push(rotas);
+                  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));
 
-                  let offsetz = parseFloat(trainmodel.children[0].matrixWorld.elements[14]) - parseFloat(point.z);
-                  trainmodel.children[0].position.z += offsetz;
-                  //trainmodel.position.z = point.z;
-                }
+                    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;
 
-                trainmodel.position.x = point.x;
-                trainmodel.position.y = 0;
-
-                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++){
-                    //console.log(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]-38)<=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.y = trainmodel.children[rs].rotalist[0].rota;
-                          trainmodel.children[rs].rotalist.splice(0,1)
-                          xh--;
-                        }else{
-                          xh = trainmodel.children[rs].rotalist.length;
-                        }
-                      }
-                      //console.log(trainmodel.children[rs].rotalist.length);
+                    // console.log(trainmodel.children[0].rotation.x);
+                    // console.log(trainmodel.children[0].rotation.y);
+                    // console.log(trainmodel.children[0].rotation.z);
+                    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;
+                    //trainmodel.position.z = point.z;
                   }
-                }
-                trainmodel.progress += trainmodel.speeds;
-              }
 
-              if(trainmodel.status == "02"){
+                  trainmodel.position.x = point.x;
+                  trainmodel.position.y = 0;
 
-                let point = movecurve.getPointAt(trainmodel.progress);
-                if(Math.abs( point.z -trainmodel.children[0].matrixWorld.elements[14]) >0.1){
-                  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);
-
-                  let rotas = {
-                    posr:point,
-                    rota:trainmodel.children[0].rotation.y
-                  }
-                  trainmodel.children[1].rotalist.push(rotas);
-                  let offsetz = parseFloat(point.z) - parseFloat(trainmodel.children[0].matrixWorld.elements[14]);
-                  trainmodel.children[0].position.z += offsetz;
-                  //trainmodel.position.z = point.z;
-                }
-
-                trainmodel.position.x = point.x;
-                trainmodel.position.y = 0;
-                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[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++){
                       //console.log(rs);
                       if(trainmodel.children[rs].rotalist[0]){
+                        let offsetz = parseFloat(trainmodel.children[rs].matrixWorld.elements[14]) - parseFloat(trainmodel.children[rs].rotalist[0].posr.z);
 
-                        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]+38)>=trainmodel.children[rs].rotalist[0].posr.x){
+                          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);
 
                             }
-                            //let offsetx = trainmodel.children[1].matrixWorld.elements[12]-trainmodel.children[0].children[3].matrixWorld.elements[12];
 
-                            trainmodel.children[rs].rotation.y = trainmodel.children[rs].rotalist[0].rota;
+                            trainmodel.children[rs].rotation.z = trainmodel.children[rs].rotalist[0].rota;
                             trainmodel.children[rs].rotalist.splice(0,1)
                             xh--;
                           }else{
@@ -120,17 +74,94 @@ export function UpdateTrain(camera,traindata){
                           }
                         }
                         //console.log(trainmodel.children[rs].rotalist.length);
-
                       }
-
-
+                    }
                   }
-                  // console.log(trainmodel.rotalist);
+                  trainmodel.progress += trainmodel.speeds;
                 }
-
-                trainmodel.progress += trainmodel.speeds;
               }
 
+              if(trainmodel.status == "02"){
+                if(movecurve.points.length>1){
+                  let point = movecurve.getPointAt(trainmodel.progress);
+                  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;
+                    //trainmodel.position.z = point.z;
+                  }
+
+                  trainmodel.position.x = point.x;
+                  trainmodel.position.y = 0;
+                  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++){
+                        //console.log(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);
+
+                              }
+                              //let offsetx = trainmodel.children[1].matrixWorld.elements[12]-trainmodel.children[0].children[3].matrixWorld.elements[12];
+
+                              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;
+                            }
+                          }
+                          //console.log(trainmodel.children[rs].rotalist.length);
+
+                        }
+
+
+                    }
+                    // console.log(trainmodel.rotalist);
+                  }
+
+
+                  trainmodel.progress += trainmodel.speeds;
+                }
+              }
+
+            }
+            else{
+
+              if(trainmodel.status == '02'){
+                trainmodel.curve = trainmodel.nextcurve;
+              }else if(trainmodel.status == '03'){
+                trainmodel.curve = trainmodel.nextcurve;
+              }
+              // console.log(trainmodel.name);
+              // console.log(trainmodel.progress);
+              // console.log(trainmodel.nextcurve);
+              // if(trainmodel.status == "02"){
+              //   trainmodel.progress = 0;
+              // }else if(trainmodel.status == "03"){
+              //   trainmodel.progress = 1;
+              // }
+              // trainmodel.curve = trainmodel.nextcurve;
             }
 
           }
diff --git a/src/jmap/shape/StationStand/index.js b/src/jmap/shape/StationStand/index.js
index 732860278..4331c55bd 100644
--- a/src/jmap/shape/StationStand/index.js
+++ b/src/jmap/shape/StationStand/index.js
@@ -250,6 +250,7 @@ class StationStand extends Group {
 	/** 中心+车站扣车*/
 	standAndCenterDetainTrain() {
 		this.detain && this.detain.show();
+		this.detain && this.detain.setColor(this.style.StationStand.detainCar.andCenterTrainColor);
 	}
 
 	/** 人工设置停战时间*/
diff --git a/src/jmap/theme/batong_01/menus/index.vue b/src/jmap/theme/batong_01/menus/index.vue
index 3c7e76b67..2f160d9ab 100644
--- a/src/jmap/theme/batong_01/menus/index.vue
+++ b/src/jmap/theme/batong_01/menus/index.vue
@@ -70,7 +70,7 @@ export default {
                     this.$store.state.training.roles == 'BigScreen';
 		},
 		isShowMenu() {
-			return this.$store.state.training.prdType != '';
+			return this.$store.state.training.prdType;
 		}
 	},
 	watch: {
diff --git a/src/jmap/theme/beijing_01/menus/index.vue b/src/jmap/theme/beijing_01/menus/index.vue
index badcb49e5..64aac8c71 100644
--- a/src/jmap/theme/beijing_01/menus/index.vue
+++ b/src/jmap/theme/beijing_01/menus/index.vue
@@ -72,7 +72,7 @@ export default {
                     this.$store.state.training.roles != 'BigScreen';
 		},
 		isShowBar() {
-			return this.$store.state.training.prdType != '';
+			return this.$store.state.training.prdType;
 		}
 	},
 	watch: {
diff --git a/src/jmap/theme/beijing_01/menus/menuBar.vue b/src/jmap/theme/beijing_01/menus/menuBar.vue
index 7d02f6eb0..221e19047 100644
--- a/src/jmap/theme/beijing_01/menus/menuBar.vue
+++ b/src/jmap/theme/beijing_01/menus/menuBar.vue
@@ -157,7 +157,7 @@ export default {
 						operate: OperationEvent.Command.mBar.system,
 						children: [
 							{
-								title: '登陆',
+								title: '登录',
 								click: this.undeveloped
 							},
 							{
@@ -424,7 +424,7 @@ export default {
 						operate: OperationEvent.Command.mBar.system,
 						children: [
 							{
-								title: '登陆',
+								title: '登录',
 								click: this.undeveloped
 							},
 							{
diff --git a/src/jmap/theme/chengdu_03/menus/dialog/cancelAllLimit.vue b/src/jmap/theme/chengdu_03/menus/dialog/cancelAllLimit.vue
deleted file mode 100644
index 15fbc4750..000000000
--- a/src/jmap/theme/chengdu_03/menus/dialog/cancelAllLimit.vue
+++ /dev/null
@@ -1,355 +0,0 @@
-<template>
-    <el-dialog class="chengdou-03__systerm stand-detain-train" :title="title" :visible.sync="show" width="380px"
-        :before-close="doClose" :zIndex="2000" :modal="false" :close-on-click-modal="false" v-dialogDrag>
-        <div class="head_content content">
-            <span class="base-label" style="left: 0px;">会话管理</span>
-            <el-col :span="8">
-                <el-button class="status">查询会话状态</el-button>
-            </el-col>
-            <el-col :span="15" :offset="1">
-                <el-input :value="messageText" placeholder="" size="mini" disabled></el-input>
-            </el-col>
-            <el-col :span="12">
-                <el-button class="status_btn" :id="openMessageId" @click="handleMessage('open')"
-                    :disabled="isOpenMessage">打开会话</el-button>
-            </el-col>
-            <el-col :span="12">
-                <el-button class="status_btn" :id="closeMessageId" @click="handleMessage('close')"
-                    :disabled="!isOpenMessage">关闭会话
-                </el-button>
-            </el-col>
-        </div>
-        <div class="content cotnent_body">
-            <span class="base-label" style="left: 0px;">操作</span>
-            <el-col :span="3">
-                <div class="text">操作</div>
-            </el-col>
-            <el-col :span="11" :offset="1">
-                <el-input :value="messageText1" placeholder="" size="mini" disabled></el-input>
-            </el-col>
-            <el-col :span="8" :offset="1">
-                <el-button class="status_btn" :id="confirmId1" @click="confirm1" :disabled="disabledConfirm1">确认
-                </el-button>
-            </el-col>
-        </div>
-        <div class="content cotnent_body">
-            <span class="base-label" style="left: 0px;">确认</span>
-            <el-col :span="3">
-                <div class="text">操作</div>
-            </el-col>
-            <el-col :span="11" :offset="1">
-                <el-input :value="messageText2" placeholder="" size="mini" disabled></el-input>
-            </el-col>
-            <el-col :span="8" :offset="1">
-                <el-button class="status_btn" :id="confirmId2" @click="confirm2" :disabled="disabledConfirm2">确认
-                </el-button>
-            </el-col>
-        </div>
-        <div class="body_cont">
-            <el-col :span="7">
-                <div class="text">操作倒计时</div>
-            </el-col>
-            <el-col :span="17">
-                <div style="border: 2px inset #E9E9E9; height: 30px; width: 100%;">
-                    {{timeCountConfirm == -1 ? '' : timeCountConfirm}}</div>
-            </el-col>
-        </div>
-        <div class="body_cont">
-            <div class="status_text">状态</div>
-            <div class="textarea_content"></div>
-        </div>
-
-        <el-button class="close_btn" :id="domIdConfirm" type="primary" @click="commit">关闭</el-button>
-        <confirm-tip ref='ConfirmTip' @close="closeMessage"></confirm-tip>
-    </el-dialog>
-</template>
-
-<script>
-    import { MapDeviceType, OperationEvent, getDomIdByOperation } from '@/scripts/ConstDic';
-    import { mouseCancelState } from '../utils/menuItemStatus';
-    import ConfirmTip from './childDialog/confirmTip';
-
-
-    export default {
-        name: 'StandDetainTrain',
-        components: {
-            ConfirmTip
-        },
-        data() {
-            return {
-                dialogShow: false,
-                standName: '',
-                stationName: '',
-                selected: null,
-                operation: null,
-                radio: '1',
-                radio1: '1',
-                earlyDepar: false,
-
-                messageText: '',
-                messageText1: '',
-                messageText2: '',
-                isOpenMessage: false,
-                timeCountConfirm: -1,
-                disabledConfirm1: false,
-                disabledConfirm2: false,
-            }
-        },
-        computed: {
-            show() {
-                return this.dialogShow && !this.$store.state.menuOperation.break;
-            },
-            openMessageId() {
-                return this.dialogShow ? OperationEvent.LimitControl.CancelAllLimit.openMessage.domId : '';
-            },
-            closeMessageId() {
-                return this.dialogShow ? OperationEvent.LimitControl.CancelAllLimit.closeMessage.domId : '';
-            },
-            confirmId1() {
-                return this.dialogShow ? OperationEvent.LimitControl.CancelAllLimit.confirm1.domId : '';
-            },
-            confirmId2() {
-                return this.dialogShow ? OperationEvent.LimitControl.CancelAllLimit.confirm2.domId : '';
-            },
-            domIdConfirm() {
-                return this.dialogShow ? OperationEvent.LimitControl.CancelAllLimit.confirm.domId : '';
-            },
-            title() {
-                return '取消全线临时限速';
-            },
-        },
-        mounted() {
-            this.$nextTick(() => {
-                this.$store.dispatch('training/tipReload');
-            })
-            this.timer = setInterval(() => {
-                if (this.timeCountConfirm > 0) {
-                    this.timeCountConfirm--;
-                } else if (this.timeCountConfirm == 0) { // 关闭会话
-                    this.timeCountConfirm = -1;
-                    this.disabledConfirm2 = true;
-                }
-            }, 1000)
-        },
-        methods: {
-            doShow(operate, selected) {
-                this.selected = selected;
-                if (!this.dialogShow) {
-                    this.standName = '';
-                    this.stationName = '';
-
-                    this.operation = operate.operation;
-                }
-                this.dialogShow = true;
-                this.$nextTick(function () {
-                    this.$store.dispatch('training/emitTipFresh');
-                });
-            },
-            doClose() {
-                this.dialogShow = false;
-                this.$store.dispatch('training/emitTipFresh');
-                mouseCancelState(this.selected);
-            },
-            handleMessage(message) {
-                if (message == 'open') {
-                    let operate = {
-                        type: MapDeviceType.LimitControl.type,
-                        operation: OperationEvent.LimitControl.CancelAllLimit.openMessage.operation,
-                    }
-
-                    this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                        if (valid) {
-                            this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                            this.isOpenMessage = true;
-                            this.messageText1 = '取消全线临时限速';
-                        }
-                    }).catch(error => {
-                        this.doClose();
-                    });
-                } else {
-                    let operate = {
-                        type: MapDeviceType.LimitControl.type,
-                        operation: OperationEvent.LimitControl.CancelAllLimit.closeMessage.operation,
-                    }
-
-                    this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                        if (valid) {
-                            this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                            this.isOpenMessage = false;
-                            this.messageText1 = '';
-                            this.messageText2 = '';
-                            this.disabledConfirm1 = false;
-                            this.disabledConfirm2 = false;
-                            this.timeCountConfirm = -1;  // 倒计时
-                        }
-                    }).catch(error => {
-                        this.doClose();
-                    });
-                }
-            },
-            confirm1() {
-                let operate = {
-                    type: MapDeviceType.LimitControl.type,
-                    operation: OperationEvent.LimitControl.CancelAllLimit.confirm1.operation,
-                }
-
-                this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                    if (valid) {
-                        this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                        this.isOpenMessage = true;
-                        this.messageText1 = '**************';
-                        this.messageText2 = '取消全线临时限速';
-                        this.disabledConfirm1 = true;
-                        this.timeCountConfirm = 60;  // 倒计时
-                    }
-                }).catch(error => {
-                    this.doClose();
-                });
-            },
-            confirm2() {
-                let operate = {
-                    send: true,
-                    type: MapDeviceType.LimitControl.type,
-                    operation: OperationEvent.LimitControl.CancelAllLimit.confirm2.operation,
-                }
-
-                this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                    if (valid) {
-                        this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                        this.isOpenMessage = true;
-                        this.messageText2 = '**************';
-                        this.disabledConfirm2 = true;
-                        this.timeCountConfirm = -1;
-                    }
-                }).catch(error => {
-                    this.doClose();
-                });
-            },
-            commit() {
-                let operate = {
-                    send: true,
-                    type: MapDeviceType.LimitControl.type,
-                    operation: OperationEvent.LimitControl.CancelAllLimit.confirm.operation,
-                }
-                this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    if (!this.isOpenMessage) {
-                        this.doClose();
-                    } else {
-                        let operate = {
-                            message: `是否关闭会话，并关闭窗口`,
-                            confirmId: OperationEvent.LimitControl.CancelAllLimit.close.domId,
-                        }
-                        this.$refs.ConfirmTip.doShow(operate);
-                    }
-                }).catch(error => {
-                    console.log(error);
-                })
-            },
-            closeMessage() {
-                let operate = {
-                    type: MapDeviceType.LimitControl.type,
-                    operation: OperationEvent.LimitControl.CancelAllLimit.close.operation,
-                }
-
-                this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    this.$refs.ConfirmTip.doClose();
-                    this.isOpenMessage = false;
-                    this.messageText1 = '';
-                    this.messageText2 = '';
-                    this.disabledConfirm1 = false;
-                    this.disabledConfirm2 = false;
-                    this.timeCountConfirm = -1;  // 倒计时
-                    this.doClose();
-                }).catch(error => {
-                    console.log(error);
-                })
-            }
-        }
-    }
-</script>
-<style scoped lang="scss">
-    .stand-detain-train .context {
-        height: 80px !important;
-    }
-
-    .content {
-        width: 100%;
-        border: 1px solid lightgray;
-        padding: 18px 5px;
-        position: relative;
-
-        .base-label {
-            position: absolute;
-            top: -5px;
-            left: 20px;
-            background-color: #F0F0F0;
-            padding: 0 5px;
-        }
-
-        .el-button {
-            width: 100%;
-            line-height: 28px;
-        }
-
-        .status_btn {
-            width: 110px;
-            margin: 15px auto 0;
-            display: block;
-        }
-
-    }
-
-    .head_content {
-        height: 110px;
-        margin-bottom: 10px;
-    }
-
-    .cotnent_body {
-        height: 60px;
-        margin-bottom: 10px;
-
-        .text {
-            line-height: 30px;
-            text-align: center;
-            font-size: 15px;
-        }
-
-        .status_btn {
-            width: 80px;
-            margin: 0 auto
-        }
-    }
-
-    .close_btn {
-        margin: 0 auto;
-        width: 80px;
-        display: block;
-    }
-
-    .body_cont {
-        margin-bottom: 10px;
-        padding: 0 3px;
-        overflow: hidden;
-
-        .text {
-            line-height: 30px;
-            text-align: center;
-            font-size: 15px;
-        }
-
-        .status_text {
-            margin-bottom: 3px;
-            font-size: 14px;
-            padding-left: 8px;
-        }
-
-        .textarea_content {
-            height: 85px;
-            width: 100%;
-            border: 2px solid #E9E9E9;
-            box-shadow: 2px 2px #959595 inset;
-        }
-    }
-</style>
\ No newline at end of file
diff --git a/src/jmap/theme/chengdu_03/menus/dialog/childDialog/passwordInputBox.vue b/src/jmap/theme/chengdu_03/menus/dialog/childDialog/passwordInputBox.vue
index 68a8db975..b706da32d 100644
--- a/src/jmap/theme/chengdu_03/menus/dialog/childDialog/passwordInputBox.vue
+++ b/src/jmap/theme/chengdu_03/menus/dialog/childDialog/passwordInputBox.vue
@@ -107,11 +107,7 @@ export default {
 			}
 		},
 		domIdConfirm() {
-			if (this.operate && this.operate.operateCode) {
-				return this.dialogShow ? getDomIdByOperation(this.operate.operateCode) : '';
-			} else {
-				return this.dialogShow ? OperationEvent.Command.close.confirm.domId : '';
-			}
+			return this.dialogShow ? getDomIdByOperation(this.operate.operateNext) : '';
 		}
 	},
 	mounted() {
@@ -135,29 +131,10 @@ export default {
 			this.$store.dispatch('training/emitTipFresh');
 		},
 		commit() {
-			const operate = {
-				send: this.operate.operateCode != null,
-				type: this.operate.type,
-				operation: this.operate.operateCode != null ? this.operate.operateCode : OperationEvent.Command.close.confirm.operation
-			};
-			if (this.operate.val) {
-				operate['val'] = this.operate.val;
-			}
-
 			if (this.passwordCheck === this.correctPassword) {
-				this.$store.dispatch('training/next', operate).then(({ valid }) => {
-					this.loading = false;
-
-					if (valid) {
-						this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-						this.$emit('checkOver');
-						this.doClose();
-						this.inputClear();
-					}
-				}).catch(() => {
-					this.loading = false;
-					this.$refs.noticeInfo && this.$refs.noticeInfo.doShow(operate);
-				});
+				this.$emit('checkOver', this.operate);
+				this.doClose();
+				this.inputClear();
 			} else {
 				this.showMistake = true;
 			}
diff --git a/src/jmap/theme/chengdu_03/menus/dialog/routeControl.vue b/src/jmap/theme/chengdu_03/menus/dialog/routeControl.vue
index d959ba7e3..6af5a13b5 100644
--- a/src/jmap/theme/chengdu_03/menus/dialog/routeControl.vue
+++ b/src/jmap/theme/chengdu_03/menus/dialog/routeControl.vue
@@ -27,7 +27,7 @@
       </el-col>
     </el-row>
     <confirm-control ref="confirmControl" />
-    <password-box ref="password" @checkOver="doClose" />
+    <password-box ref="password" @checkOver="passWordCommit" />
     <notice-info ref="noticeInfo" />
   </el-dialog>
 </template>
@@ -79,10 +79,6 @@ export default {
 				return '信号封锁';
 			} else if (this.operation == OperationEvent.Signal.unlock.menu.operation) {
 				return '信号解封';
-			} else if (this.operation == OperationEvent.Signal.humanControl.menu.operation) {
-				return '进路收人工控';
-			} else if (this.operation == OperationEvent.Signal.atsAutoControl.menu.operation) {
-				return '进路交自动控';
 			} else if (this.operation == OperationEvent.Signal.signalClose.menu.operation) {
 				return '信号关灯';
 			}
@@ -138,17 +134,26 @@ export default {
 			} else if (this.operation == OperationEvent.Signal.unlock.menu.operation) {
 				/** 信号解封*/
 				this.unlock();
-			} else if (this.operation == OperationEvent.Signal.humanControl.menu.operation) {
-				/** 进路收人工控*/
-				this.humanControl();
-			} else if (this.operation == OperationEvent.Signal.atsAutoControl.menu.operation) {
-				/** 进路交自动控*/
-				this.atsAutoControl();
 			} else if (this.operation == OperationEvent.Signal.signalClose.menu.operation) {
 				/** 信号关灯*/
 				this.signalClose();
 			}
 		},
+		passWordCommit(data) {
+			const operate = {
+				send: true,
+				type: data.type,
+				operation: data.operateNext
+			};
+
+			this.$store.dispatch('training/next', operate).then(({ valid }) => {
+				if (valid) { this.doClose(); }
+			}).catch(() => {
+				this.doClose();
+				this.$refs.noticeInfo.doShow(operate);
+			});
+
+		},
 		// 取消列车进路
 		cancelTrainRoute() {
 			if (this.$store.state.training.prdType == '01') {
@@ -174,7 +179,6 @@ export default {
 					this.doClose();
 				}
 			}).catch(() => {
-				this.loading = false;
 				this.doClose();
 				this.$refs.noticeInfo.doShow(operate);
 			});
@@ -194,7 +198,6 @@ export default {
 					this.doClose();
 				}
 			}).catch(() => {
-				this.loading = false;
 				this.doClose();
 				this.$refs.noticeInfo.doShow(operate);
 			});
@@ -204,7 +207,7 @@ export default {
 			const operate = {
 				type: MapDeviceType.Signal.type,
 				operation: OperationEvent.Signal.humanTrainRoute.menu.operation,
-				operateCode: OperationEvent.Signal.humanTrainRoute.confirm.operation
+				operateNext: OperationEvent.Signal.humanTrainRoute.confirm.operation
 			};
 
 			this.$store.dispatch('training/next', operate).then(({ valid }) => {
@@ -213,7 +216,6 @@ export default {
 					this.$refs.password.doShow(operate);
 				}
 			}).catch(() => {
-				this.loading = false;
 				this.doClose();
 				this.$refs.noticeInfo.doShow(operate);
 			});
@@ -233,7 +235,6 @@ export default {
 					this.doClose();
 				}
 			}).catch(() => {
-				this.loading = false;
 				this.doClose();
 				this.$refs.noticeInfo.doShow(operate);
 			});
@@ -243,7 +244,7 @@ export default {
 			const operate = {
 				type: MapDeviceType.Signal.type,
 				operation: OperationEvent.Signal.lock.menu.operation,
-				operateCode: OperationEvent.Signal.lock.confirm.operation
+				operateNext: OperationEvent.Signal.lock.confirm.operation
 			};
 
 			this.$store.dispatch('training/next', operate).then(({ valid }) => {
@@ -259,7 +260,7 @@ export default {
 			const operate = {
 				type: MapDeviceType.Signal.type,
 				operation: OperationEvent.Signal.unlock.menu.operation,
-				operateCode: OperationEvent.Signal.unlock.confirm.operation
+				operateNext: OperationEvent.Signal.unlock.confirm.operation
 			};
 
 			this.$store.dispatch('training/next', operate).then(({ valid }) => {
@@ -270,51 +271,6 @@ export default {
 			}).catch(() => {
 			});
 		},
-		// 进路收人工控
-		humanControl() {
-			const operate = {
-				type: MapDeviceType.Signal.type,
-				operation: OperationEvent.Signal.humanControl.menu.operation,
-				operateCode: OperationEvent.Signal.humanControl.confirm.operation,
-				val: this.operateCode
-			};
-
-			this.loading = true;
-			this.$store.dispatch('training/next', operate).then(({ valid }) => {
-				this.loading = false;
-				if (valid) {
-					this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-					this.$refs.password.doShow(operate);
-				}
-			}).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,
-				operateCode: OperationEvent.Signal.atsAutoControl.confirm.operation,
-				val: this.operateCode
-			};
-
-			this.loading = true;
-			this.$store.dispatch('training/next', operate).then(({ valid }) => {
-				this.loading = false;
-				if (valid) {
-					this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-					this.$refs.password.doShow(operate);
-				}
-			}).catch(() => {
-				this.loading = false;
-				// this.doClose();
-				// this.$refs.noticeInfo.doShow(operate);
-			});
-		},
 		// 信号关灯
 		signalClose() {
 			const operate = {
diff --git a/src/jmap/theme/chengdu_03/menus/dialog/routeGuide.vue b/src/jmap/theme/chengdu_03/menus/dialog/routeGuide.vue
index 3ab16dd4b..847ab9fd2 100644
--- a/src/jmap/theme/chengdu_03/menus/dialog/routeGuide.vue
+++ b/src/jmap/theme/chengdu_03/menus/dialog/routeGuide.vue
@@ -22,17 +22,7 @@
     </el-row>
     <div class="route-table-box">
       <span class="route-table-tip">进路列表</span>
-      <el-table
-        ref="table"
-        :data="tempData"
-        border
-        :cell-style="tableStyle"
-        style="width: 99%;"
-        size="mini"
-        height="90"
-        highlight-current-row
-        @row-click="clickEvent"
-      >
+      <el-table ref="table" :data="tempData" border :cell-style="tableStyle" style="width: 99%;" size="mini" height="90" highlight-current-row @row-click="clickEvent">
         <el-table-column :id="domIdChoose" prop="name" label="进路" style="margin-left:30px" />
         <el-table-column :id="domIdChoose" prop="controlType" label="进路属性" style="margin-left:30px">
           <template slot-scope="scope">{{ controlTypeNameMap[scope.row.controlType] }} </template>
@@ -55,7 +45,7 @@
       </el-col>
     </el-row>
     <notice-info ref="noticeInfo" />
-    <password-box ref="passwordBox" @checkOver="doClose" />
+    <password-box ref="passwordBox" @checkOver="passWordCommit" />
   </el-dialog>
 </template>
 
@@ -78,7 +68,6 @@ export default {
 			dialogShow: false,
 			loading: false,
 			selected: null,
-			row: null,
 			operation: '',
 			display: true,
 			stationName: '',
@@ -160,47 +149,40 @@ export default {
 				this.$store.dispatch('training/emitTipFresh');
 			});
 		},
+		passWordCommit(data) {
+			const operate = {
+				send: true,
+				type: data.type,
+				operation: data.operateNext
+			};
+
+			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);
+			});
+		},
 		doClose() {
 			this.loading = false;
 			this.dialogShow = false;
-			this.guide();
 			this.$refs.table.setCurrentRow();
 			this.$store.dispatch('training/emitTipFresh');
 			mouseCancelState(this.selected);
 		},
-		guide() {
-			// 恢复之前选中设备
-			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.guide();
-				row.canSetting = true;
-				// 设置选中区段为切除状态
-				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 = {
+					repeat: true,
 					type: MapDeviceType.Signal.type,
 					operation: OperationEvent.Signal.guide.choose.operation,
-					val: row.code
+					val: row.code,
+					selection: row
 				};
 
 				this.$store.dispatch('training/next', operate).then(({ valid }) => {
@@ -216,7 +198,7 @@ export default {
 				const operate = {
 					type: MapDeviceType.Signal.type,
 					operation: OperationEvent.Signal.guide.menu.operation,
-					operateCode: OperationEvent.Signal.guide.confirm.operation
+					operateNext: OperationEvent.Signal.guide.confirm.operation
 				};
 
 				this.loading = true;
diff --git a/src/jmap/theme/chengdu_03/menus/dialog/routeHandControl.vue b/src/jmap/theme/chengdu_03/menus/dialog/routeHandControl.vue
new file mode 100644
index 000000000..1d0b730c5
--- /dev/null
+++ b/src/jmap/theme/chengdu_03/menus/dialog/routeHandControl.vue
@@ -0,0 +1,285 @@
+<template>
+  <div>
+    <el-dialog v-dialogDrag class="chengdou-03__systerm route-hand-control" :title="title" :visible.sync="show" width="500px" :before-close="doClose" :z-index="2000" :modal="false" :close-on-click-modal="false">
+      <el-row class="header">
+        <el-col :span="11"><span>车站</span></el-col>
+        <el-col :span="11" :offset="2"><span>始端信号机</span></el-col>
+      </el-row>
+      <el-row>
+        <el-col :span="11">
+          <el-input v-model="stationName" size="small" disabled />
+        </el-col>
+        <el-col :span="11" :offset="2">
+          <el-input v-model="signalName" size="small" disabled />
+        </el-col>
+      </el-row>
+      <div class="table">
+        <el-table ref="tempTable" :data="tempData" border style="width: 100%" size="mini" :highlight-current-row="highlight" :height="140" @row-click="clickEvent">
+          <el-table-column :id="domIdChoose" prop="name" width="155" label="描述" style="margin-left:30px">
+            <template slot-scope="scope">
+              <span :style="{color: scope.row.disabled ? '#CBCBCB':'unset'}">{{ scope.row.name }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column :id="domIdChoose" prop="name" label="方向" style="">
+            <template slot-scope="scope">
+              <span :style="{color: scope.row.disabled ? '#CBCBCB':'unset'}">111</span>
+            </template>
+          </el-table-column>
+          <el-table-column :id="domIdChoose" prop="name" label="属性" style="">
+            <template slot-scope="scope">
+              <span :style="{color: scope.row.disabled ? '#CBCBCB':'unset'}">1111</span>
+            </template>
+          </el-table-column>
+          <el-table-column :id="domIdChoose" prop="name" label="控制" style="">
+            <template slot-scope="scope">
+              <span :style="{color: scope.row.disabled ? '#CBCBCB':'unset'}">{{ scope.row.controlType == '01' ? '自动' : '人工' }}</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">确定</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" />
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { mapGetters } from 'vuex';
+import { MapDeviceType, OperationEvent, getDomIdByOperation } from '@/scripts/ConstDic';
+import ConfirmControl from './childDialog/confirmControl';
+import { mouseCancelState } from '../utils/menuItemStatus';
+import NoticeInfo from './childDialog/childDialog/noticeInfo';
+
+export default {
+	name: 'RouteHandControl',
+	components: {
+		ConfirmControl,
+		NoticeInfo
+	},
+	data() {
+		return {
+			dialogShow: false,
+			loading: false,
+			selected: null,
+			tempData: [],
+			operation: null,
+			selection: [],
+			stationName: '',
+			signalName: '',
+			allSelect: false,
+			highlight: true
+		};
+	},
+	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.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 '进路交人工控';
+			} else if (this.operation == OperationEvent.Signal.atsAutoControl.menu.operation) {
+				return '进路交自动控';
+			}
+			return '';
+		},
+		commitDisabled() {
+			let disabled = true;
+			if (this.selection && this.selection.length) {
+				disabled = false;
+			}
+
+			return disabled;
+		}
+	},
+	mounted() {
+		this.$nextTick(() => {
+			this.$store.dispatch('training/tipReload');
+		});
+	},
+	methods: {
+		doShow(operate, selected, tempData) {
+			this.selected = selected;
+			// 如果不是断点激活，而是第一次显示则初始化
+			if (!this.dialogShow) {
+				this.signalName = '';
+				this.stationName = '';
+				if (selected && selected._type.toUpperCase() === 'Signal'.toUpperCase()) {
+					this.signalName = selected.name;
+					const station = this.$store.getters['map/getDeviceByCode'](selected.stationCode);
+					if (station) {
+						this.stationName = station.name;
+					}
+				}
+
+				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 == '02') {
+							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');
+			mouseCancelState(this.selected);
+		},
+		allSelectChange() {
+			if (this.allSelect) {
+				this.tempData.forEach(item => {
+					if (!item.disabled) {
+						item.check = true;
+					}
+				});
+			} else {
+				this.tempData.forEach(item => {
+					if (!item.disabled) {
+						item.check = false;
+					}
+				});
+			}
+		},
+		// 多个进路code并列
+		serializeCodeListWithSeparator(sep) {
+			const codeList = [];
+			if (this.selection && this.selection.length) {
+				this.selection.forEach(elem => {
+					codeList.push(elem.code);
+				});
+			}
+			return codeList.join(sep);
+		},
+		clickEvent(row, event, column) {
+			this.highlight = false;
+			if (row && !row.disabled) {
+				this.highlight = true;
+				this.selection = [row];
+				this.beforeSectionList = row.containSectionList || [];
+
+				// 设置选中指令
+				const operate = {
+					repeat: true,
+					type: MapDeviceType.Signal.type,
+					operation: '',
+					val: row.code,
+					selection: row
+				};
+				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 });
+					}
+				});
+			}
+		},
+		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/chengdu_03/menus/dialog/sectionControl.vue b/src/jmap/theme/chengdu_03/menus/dialog/sectionControl.vue
index 3b262fa86..ddf690e1e 100644
--- a/src/jmap/theme/chengdu_03/menus/dialog/sectionControl.vue
+++ b/src/jmap/theme/chengdu_03/menus/dialog/sectionControl.vue
@@ -27,7 +27,7 @@
       </el-col>
     </el-row>
     <notice-info ref="noticeInfo" />
-    <password-box ref="passwordBox" @checkOver="doClose" />
+    <password-box ref="passwordBox" @checkOver="passWordCommit" />
   </el-dialog>
 </template>
 
@@ -129,6 +129,22 @@ export default {
 				this.fault();
 			}
 		},
+		passWordCommit(data) {
+			const operate = {
+				send: true,
+				type: data.type,
+				operation: data.operateNext
+			};
+
+			this.$store.dispatch('training/next', operate).then(({ valid }) => {
+				if (valid) {
+					this.doClose();
+				}
+			}).catch(() => {
+				this.doClose();
+				this.$refs.noticeInfo.doShow(operate);
+			});
+		},
 		// 道岔单锁
 		lock() {
 			const operate = {
@@ -192,10 +208,9 @@ export default {
 		// 区故解
 		fault() {
 			const operate = {
-				// send: true,
 				type: MapDeviceType.Section.type,
 				operation: OperationEvent.Section.fault.menu.operation,
-				operateCode: OperationEvent.Section.fault.confirm.operation
+				operateNext: OperationEvent.Section.fault.confirm.operation
 			};
 
 			this.loading = true;
diff --git a/src/jmap/theme/chengdu_03/menus/dialog/switchControl.vue b/src/jmap/theme/chengdu_03/menus/dialog/switchControl.vue
index 4de269dad..911e471b5 100644
--- a/src/jmap/theme/chengdu_03/menus/dialog/switchControl.vue
+++ b/src/jmap/theme/chengdu_03/menus/dialog/switchControl.vue
@@ -31,7 +31,7 @@
       </el-col>
     </el-row>
     <notice-info ref="noticeInfo" />
-    <password-box ref="passwordBox" @checkOver="doClose" />
+    <password-box ref="passwordBox" @checkOver="passWordCommit" />
   </el-dialog>
 </template>
 
@@ -153,6 +153,22 @@ export default {
 				this.openPasswordBox(this.operation, OperationEvent.Switch.fault.confirm.operation);
 			}
 		},
+		passWordCommit(data) {
+			const operate = {
+				send: true,
+				type: data.type,
+				operation: data.operateNext
+			};
+
+			this.$store.dispatch('training/next', operate).then(({ valid }) => {
+				if (valid) {
+					this.doClose();
+				}
+			}).catch(() => {
+				this.doClose();
+				this.$refs.noticeInfo.doShow(operate);
+			});
+		},
 		// 道岔单锁
 		lock() {
 			const operate = {
@@ -311,11 +327,11 @@ export default {
 			});
 		},
 		// 打开密码输入框
-		openPasswordBox(operation, code) {
+		openPasswordBox(operation, operateNext) {
 			const operate = {
 				type: MapDeviceType.Switch.type,
 				operation: operation,
-				operateCode: code
+				operateNext: operateNext
 			};
 			this.loading = true;
 			this.$store.dispatch('training/next', operate).then(({ valid }) => {
diff --git a/src/jmap/theme/chengdu_03/menus/dialog/trainCreate.vue b/src/jmap/theme/chengdu_03/menus/dialog/trainCreate.vue
index c778ce917..210adccf0 100644
--- a/src/jmap/theme/chengdu_03/menus/dialog/trainCreate.vue
+++ b/src/jmap/theme/chengdu_03/menus/dialog/trainCreate.vue
@@ -1,158 +1,153 @@
 <template>
-    <el-dialog class="chengdou-03__systerm route-create" :title="title" :visible.sync="show" width="580px"
-        label-position="top" :before-close="doClose" :zIndex="2000" :modal="false" :close-on-click-modal="false"
-        v-dialogDrag>
-        <div style="padding: 10px 20px; border: 1px solid lightgray;">
-            <el-form size="small" label-width="100px">
-                <el-form-item label="列车:" prop="trainCode">
-                    <el-select v-model="trainCode" filterable placeholder="列车">
-                        <el-option v-for="item in trainList" :key="item.code" :label="item.groupNumber"
-                            :value="item.code"></el-option>
-                    </el-select>
-                </el-form-item>
-                <!-- <el-form-item label="列车车次:" prop="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="列车方向:" prop="direction">
-                    <el-select v-model="direction" filterable placeholder="列车方向">
-                        <el-option v-for="no in directionList" :key="no.value" :label="no.label" :value="no.value">
-                        </el-option>
-                    </el-select>
-                    <!-- <div style="font-size: 12px;">(上行路线车次号选择偶数，下行路线车次号选择基数)</div> -->
-                </el-form-item>
-            </el-form>
-            <el-row>
-                <el-col style="text-align: right;">
-                    <el-button :id="domIdConfirm" type="primary" :loading="loading" @click="commit">确定</el-button>
-                    <el-button :id="domIdCancel" @click="cancel">取 消</el-button>
-                </el-col>
-            </el-row>
-        </div>
-        <notice-info ref="noticeInfo"></notice-info>
-    </el-dialog>
+  <el-dialog v-dialogDrag class="chengdou-03__systerm route-create" :title="title" :visible.sync="show" width="380px" label-position="top" :before-close="doClose" :z-index="2000" :modal="false" :close-on-click-modal="false">
+    <div style="padding: 10px 20px; border: 1px solid lightgray;">
+      <el-form size="small" label-width="100px">
+        <el-form-item label="列车:" prop="trainCode">
+          <el-select v-model="trainCode" filterable placeholder="列车">
+            <el-option
+              v-for="item in trainList"
+              :key="item.code"
+              :label="item.groupNumber"
+              :value="item.code"
+            />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="列车方向:" prop="direction">
+          <el-select v-model="direction" filterable placeholder="列车方向">
+            <el-option v-for="no in directionList" :key="no.value" :label="no.label" :value="no.value" />
+          </el-select>
+          <!-- <div style="font-size: 12px;">(上行路线车次号选择偶数，下行路线车次号选择基数)</div> -->
+        </el-form-item>
+      </el-form>
+      <el-row>
+        <el-col style="text-align: right;">
+          <el-button :id="domIdConfirm" type="primary" :loading="loading" @click="commit">确定</el-button>
+          <el-button :id="domIdCancel" @click="cancel">取 消</el-button>
+        </el-col>
+      </el-row>
+    </div>
+    <notice-info ref="noticeInfo" />
+  </el-dialog>
 </template>
 
 <script>
-    import { mapGetters } from 'vuex';
-    import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
-    import { getPublishTrainList } from '@/api/jmap/map';
-    import { mouseCancelState } from '../utils/menuItemStatus';
-    import NoticeInfo from './childDialog/childDialog/noticeInfo'
+import { mapGetters } from 'vuex';
+import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
+import { getPublishTrainList } from '@/api/jmap/map';
+import { mouseCancelState } from '../utils/menuItemStatus';
+import NoticeInfo from './childDialog/childDialog/noticeInfo';
 
-    export default {
-        name: 'RouteCreate',
-        components: {
-            NoticeInfo
-        },
-        data() {
-            return {
-                dialogShow: false,
-                loading: false,
-                trainList: [],
-                trainNoList: [],
-                directionList: [
-                    {
-                        value: '2',
-                        label: '上行'
-                    },
-                    {
-                        value: '1',
-                        label: '下行'
-                    }
-                ],
-                trainCode: '',
-                tripNumber: '',
-                direction: '',
-                selected: null
-            }
-        },
-        computed: {
-            ...mapGetters('map', [
-                'map'
-            ]),
-            show() {
-                return this.dialogShow && !this.$store.state.menuOperation.break;
-            },
-            domIdCancel() {
-                return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
-            },
-            domIdConfirm() {
-                return OperationEvent.Section.newtrain.menu.domId;
-            },
-            title() {
-                return '设置列车';
-            }
-        },
-        mounted() {
-            this.$nextTick(() => {
-                this.$store.dispatch('training/tipReload');
-            })
-        },
-        methods: {
-            loadInitData(map) {
-                if (Object.keys(map || {}).length) {
-                    getPublishTrainList(map.skinCode).then(response => {
-                        this.trainList = response.data;
-                    }).catch(error => {
-                        this.$messageBox(`获取列车列表失败`);
-                    })
-                }
-            },
-            doShow(operate, selected) {
-                this.dialogShow = true;
-                this.selected = selected;
+export default {
+	name: 'RouteCreate',
+	components: {
+		NoticeInfo
+	},
+	data() {
+		return {
+			dialogShow: false,
+			loading: false,
+			trainList: [],
+			trainNoList: [],
+			directionList: [
+				{
+					value: '2',
+					label: '上行'
+				},
+				{
+					value: '1',
+					label: '下行'
+				}
+			],
+			trainCode: '',
+			tripNumber: '',
+			direction: '',
+			selected: null
+		};
+	},
+	computed: {
+		...mapGetters('map', [
+			'map'
+		]),
+		show() {
+			return this.dialogShow && !this.$store.state.menuOperation.break;
+		},
+		domIdCancel() {
+			return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
+		},
+		domIdConfirm() {
+			return OperationEvent.Section.newtrain.menu.domId;
+		},
+		title() {
+			return '设置列车';
+		}
+	},
+	mounted() {
+		this.$nextTick(() => {
+			this.$store.dispatch('training/tipReload');
+		});
+	},
+	methods: {
+		loadInitData(map) {
+			if (Object.keys(map || {}).length) {
+				getPublishTrainList(map.skinCode).then(response => {
+					this.trainList = response.data;
+				}).catch(() => {
+					this.$messageBox(`获取列车列表失败`);
+				});
+			}
+		},
+		doShow(operate, selected) {
+			this.dialogShow = true;
+			this.selected = selected;
+			console.log(this.map);
+			/** 加载列车数据*/
+			this.loadInitData(this.map);
 
-                /** 加载列车数据*/
-                this.loadInitData(this.map);
+			this.$nextTick(function () {
+				this.$store.dispatch('training/emitTipFresh');
+			});
+		},
+		doClose() {
+			this.trainCode = '';
+			this.direction = '';
+			this.loading = false;
+			this.dialogShow = false;
+			this.$store.dispatch('training/emitTipFresh');
+			mouseCancelState(this.selected);
+		},
+		commit() {
+			const operate = {
+				send: true,
+				type: MapDeviceType.Section.type,
+				operation: OperationEvent.Section.newtrain.menu.operation,
+				val: '' + this.direction + '::' + this.trainCode
+			};
+			this.loading = true;
+			this.$store.dispatch('training/next', operate).then(({ valid }) => {
+				this.loading = false;
+				if (valid) {
+					this.doClose();
+				}
+			}).catch(() => {
+				this.loading = false;
+				this.doClose();
+				this.$refs.noticeInfo.doShow(operate);
+			});
+		},
+		cancel() {
+			const operate = {
+				type: MapDeviceType.Section.type,
+				operation: OperationEvent.Command.cancel.menu.operation
+			};
 
-                this.$nextTick(function () {
-                    this.$store.dispatch('training/emitTipFresh');
-                });
-            },
-            doClose() {
-                this.trainCode = '';
-                this.direction = '';
-                this.loading = false;
-                this.dialogShow = false;
-                this.$store.dispatch('training/emitTipFresh');
-                mouseCancelState(this.selected);
-            },
-            commit() {
-                let operate = {
-                    send: true,
-                    type: MapDeviceType.Section.type,
-                    operation: OperationEvent.Section.newtrain.menu.operation,
-                    val: '' + this.direction + '::' + this.trainCode
-                }
-                this.loading = true;
-                this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                    this.loading = false;
-                    if (valid) {
-                        this.doClose();
-                    }
-                }).catch(error => {
-                    this.loading = false;
-                    this.doClose();
-                    this.$refs.noticeInfo.doShow(operate);
-                });
-            },
-            cancel() {
-                let operate = {
-                    type: MapDeviceType.Section.type,
-                    operation: OperationEvent.Command.cancel.menu.operation,
-                }
-
-                this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                    if (valid) {
-                        this.doClose();
-                    }
-                }).catch(error => {
-                    this.doClose();
-                });
-            }
-        }
-    }
-</script>
\ No newline at end of file
+			this.$store.dispatch('training/next', operate).then(({ valid }) => {
+				if (valid) {
+					this.doClose();
+				}
+			}).catch(() => {
+				this.doClose();
+			});
+		}
+	}
+};
+</script>
diff --git a/src/jmap/theme/chengdu_03/menus/dialog/trainEditNumber.vue b/src/jmap/theme/chengdu_03/menus/dialog/trainEditNumber.vue
index 2cf5460f1..f13e64a16 100644
--- a/src/jmap/theme/chengdu_03/menus/dialog/trainEditNumber.vue
+++ b/src/jmap/theme/chengdu_03/menus/dialog/trainEditNumber.vue
@@ -1,180 +1,174 @@
 <template>
-    <el-dialog class="chengdou-03__systerm stand-stop-time" :title="title" :visible.sync="show" width="480px"
-        :before-close="doClose" :zIndex="2000" :modal="false" :close-on-click-modal="false" v-dialogDrag>
-        <div class="el-dialog-div">
-          <el-form size="small" label-width="80px" :model="addModel" :rules="rules" ref="form" label-position="left">
-            <el-row>
-              <el-col :span="11">
-                <el-form-item prop="stationName">
-                  <span slot="label">车站</span>
-                  <el-input v-model="addModel.stationName" :disabled="true"></el-input>
-                </el-form-item>
-              </el-col>
-              <el-col :span="11" :offset="1">
-                <el-form-item prop="trainWindowCode">
-                  <span slot="label">车次窗</span>
-                  <el-input v-model="addModel.trainWindowCode" :disabled="true"></el-input>
-                </el-form-item>
-              </el-col>
-            </el-row>
-            <el-row>
-              <el-col :span="11">
-                <el-form-item label="旧车组号" prop="oldGroupNumber">
-                  <el-select v-model="addModel.oldGroupNumber" filterable  disabled>
-                    <el-option v-for="train in trainList" :key="train.oldGroupNumber" :label="train.oldGroupNumber"
-                               :value="train.oldGroupNumber">
-                    </el-option>
-                  </el-select>
-                </el-form-item>
-              </el-col>
-              <el-col :span="11" :offset="1">
-                <el-form-item label="新车组号" prop="newGroupNumber">
-                  <el-select v-model="addModel.newGroupNumber">
-                    <el-option v-for="train in trainList" :key="train.newGroupNumber" :label="train.newGroupNumber"
-                               :value="train.newGroupNumber">
-                    </el-option>
-                  </el-select>
-                </el-form-item>
-              </el-col>
-            </el-row>
-          </el-form>
-        </div>
-        <el-row justify="center" class="button-group-train">
-          <el-col :span="10" :offset="2">
-            <el-button :id="domIdConfirm" type="primary" :loading="loading" @click="commit">确定</el-button>
+  <el-dialog v-dialogDrag class="chengdou-03__systerm stand-stop-time" :title="title" :visible.sync="show" width="480px" :before-close="doClose" :z-index="2000" :modal="false" :close-on-click-modal="false">
+    <div class="el-dialog-div">
+      <el-form ref="form" size="small" label-width="80px" :model="addModel" :rules="rules" label-position="left">
+        <el-form-item>
+          <el-col :span="11">
+            <el-form-item prop="stationName">
+              <span slot="label">车站</span>
+              <el-input v-model="addModel.stationName" :disabled="true" />
+            </el-form-item>
           </el-col>
-          <el-col :span="8" :offset="4">
-            <el-button :id="domIdCancel" @click="cancel">取 消</el-button>
+          <el-col :span="11" :offset="1">
+            <el-form-item prop="trainWindowCode">
+              <span slot="label">车次窗</span>
+              <el-input v-model="addModel.trainWindowCode" :disabled="true" />
+            </el-form-item>
+          </el-col>
+        </el-form-item>
+        <el-row>
+          <el-col :span="11">
+            <el-form-item label="旧车组号" prop="oldGroupNumber">
+              <el-select v-model="addModel.oldGroupNumber" filterable disabled>
+                <el-option v-for="train in trainList" :key="train.oldGroupNumber" :label="train.oldGroupNumber" :value="train.oldGroupNumber" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="11" :offset="1">
+            <el-form-item label="新车组号" prop="newGroupNumber">
+              <el-select v-model="addModel.newGroupNumber">
+                <el-option v-for="train in trainList" :key="train.newGroupNumber" :label="train.newGroupNumber" :value="train.newGroupNumber" />
+              </el-select>
+            </el-form-item>
           </el-col>
         </el-row>
-    </el-dialog>
+      </el-form>
+    </div>
+    <el-row justify="center" class="button-group-train">
+      <el-col :span="10" :offset="2">
+        <el-button :id="domIdConfirm" type="primary" :loading="loading" @click="commit">确定</el-button>
+      </el-col>
+      <el-col :span="8" :offset="4">
+        <el-button :id="domIdCancel" @click="cancel">取 消</el-button>
+      </el-col>
+    </el-row>
+  </el-dialog>
 </template>
 
 <script>
-    import { mapGetters } from 'vuex';
-    import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
-    import { mouseCancelState } from '../utils/menuItemStatus';
-    import { getPublishTrainList } from '@/api/jmap/map';
+import { mapGetters } from 'vuex';
+import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
+import { mouseCancelState } from '../utils/menuItemStatus';
+import { getPublishTrainList } from '@/api/jmap/map';
 
-    export default {
-        name: 'TrainEditNumber',
-        components: {
-        },
-        data() {
-            return {
-                trainNoList: [],
-                trainList: [],
-                selected: null,
-                addModel: {
-                    stationName:'',
-                    trainWindowCode: '',
-                    oldGroupNumber:'',
-                    newGroupNumber:'',
-                },
+export default {
+	name: 'TrainEditNumber',
+	components: {
+	},
+	data() {
+		return {
+			trainNoList: [],
+			trainList: [],
+			selected: null,
+			addModel: {
+				stationName: '',
+				trainWindowCode: '',
+				oldGroupNumber: '',
+				newGroupNumber: ''
+			},
 
-                rules: {
-                    newGroupNumber: [
-                        { required: true, message: '请输入新车组号', trigger: 'blur'}
-                    ],
-                },
-                dialogShow: false,
-                loading: false,
-            }
-        },
-        computed: {
-            ...mapGetters('map', [
-                'stationStandList'
-            ]),
-            show() {
-                return this.dialogShow && !this.$store.state.menuOperation.break;
-            },
-            domIdCancel() {
-                return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
-            },
-            domIdConfirm() {
-                return this.dialogShow ? OperationEvent.Train.editTrainNo.menu.domId : '';
-            },
-            title() {
-                return '修改车组号'
-            }
-        },
-        mounted() {
-            this.$nextTick(() => {
-                this.$store.dispatch('training/tipReload');
-            })
-        },
-        methods: {
-            loadInitData(map) {
-              if (map) {
-                getPublishTrainList(map.skinCode).then(resp => {
-                  this.trainList = resp.data;
-                }).catch(error => {
-                  this.$messageBox(`获取列车车组号失败`);
-                });
-              }
-            },
-            doShow(operate, selected) {
-                this.selected = selected;
-                //如果不是断点激活，则需要对初始值进行初始化
-                if (!this.dialogShow) {
-                    this.addModel ={
-                        stationName:'',
-                        trainWindowCode: '',
-                        oldGroupNumber:'',
-                        newGroupNumber:'',
-                    }
-                }
-                this.dialogShow = true;
-                this.$nextTick(function () {
-                    this.$store.dispatch('training/emitTipFresh');
-                });
-            },
-            doClose() {
-                this.loading = false;
-                this.dialogShow = false;
-                this.$store.dispatch('training/emitTipFresh');
-                this.$store.dispatch('map/setTrainWindowShow', false);
-                mouseCancelState(this.selected);
-            },
-            commit() {
-                this.$refs['form'].validate((valid) => {
-                    if (valid) {
-                        let operate = {
-                            send: true,
-                            type: MapDeviceType.Train.type,
-                            operation: OperationEvent.Train.editTrainNo.menu.operation,
-                        }
+			rules: {
+				newGroupNumber: [
+					{ required: true, message: '请输入新车组号', trigger: 'blur'}
+				]
+			},
+			dialogShow: false,
+			loading: false
+		};
+	},
+	computed: {
+		...mapGetters('map', [
+			'stationStandList'
+		]),
+		show() {
+			return this.dialogShow && !this.$store.state.menuOperation.break;
+		},
+		domIdCancel() {
+			return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
+		},
+		domIdConfirm() {
+			return this.dialogShow ? OperationEvent.Train.editTrainNo.menu.domId : '';
+		},
+		title() {
+			return '修改车组号';
+		}
+	},
+	mounted() {
+		this.$nextTick(() => {
+			this.$store.dispatch('training/tipReload');
+		});
+	},
+	methods: {
+		loadInitData(map) {
+			if (map) {
+				getPublishTrainList(map.skinCode).then(resp => {
+					this.trainList = resp.data;
+				}).catch(() => {
+					this.$messageBox(`获取列车车组号失败`);
+				});
+			}
+		},
+		doShow(operate, selected) {
+			this.selected = selected;
+			// 如果不是断点激活，则需要对初始值进行初始化
+			if (!this.dialogShow) {
+				this.addModel ={
+					stationName: '',
+					trainWindowCode: '',
+					oldGroupNumber: '',
+					newGroupNumber: ''
+				};
+			}
+			this.dialogShow = true;
+			this.$nextTick(function () {
+				this.$store.dispatch('training/emitTipFresh');
+			});
+		},
+		doClose() {
+			this.loading = false;
+			this.dialogShow = false;
+			this.$store.dispatch('training/emitTipFresh');
+			this.$store.dispatch('map/setTrainWindowShow', false);
+			mouseCancelState(this.selected);
+		},
+		commit() {
+			this.$refs['form'].validate((valid) => {
+				if (valid) {
+					const operate = {
+						send: true,
+						type: MapDeviceType.Train.type,
+						operation: OperationEvent.Train.editTrainNo.menu.operation
+					};
 
-                        this.loading = true;
-                        this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                            this.loading = false;
-                            if (valid) {
-                                this.doClose();
-                            }
-                        }).catch(error => {
-                            this.loading = false;
-                            this.doClose();
-                            // this.$refs.noticeInfo.doShow(operate);
-                        })
-                    } else {
-                        return false;
-                    }
-                });
-            },
-            cancel() {
-                let operate = {
-                    type: MapDeviceType.Train.type,
-                    operation: OperationEvent.Command.cancel.menu.operation,
-                }
+					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(error => { this.doClose(); });
-            }
-        }
-    }
+			this.$store.dispatch('training/next', operate).then(({ valid }) => {
+				if (valid) {
+					this.doClose();
+				}
+			}).catch(() => { this.doClose(); });
+		}
+	}
+};
 </script>
 <style scoped>
     .chengdou-03__systerm .el-dialog .base-label {
diff --git a/src/jmap/theme/chengdu_03/menus/index.vue b/src/jmap/theme/chengdu_03/menus/index.vue
index 5e9468ffe..67d082909 100644
--- a/src/jmap/theme/chengdu_03/menus/index.vue
+++ b/src/jmap/theme/chengdu_03/menus/index.vue
@@ -13,7 +13,6 @@
       <menu-section ref="menuSection" :selected="selected" />
       <menu-train ref="menuTrain" :selected="selected" />
       <menu-station ref="menuStation" :selected="selected" />
-      <!-- <menu-limit ref="menuLimit" :selected="selected" /> -->
       <passive-alarm ref="passiveAlarm" />
       <passive-contorl ref="passiveControl" />
       <passive-Timeout ref="passiveTimeout" />
@@ -33,7 +32,6 @@ import MenuSection from './menuSection';
 import MenuTrain from './menuTrain';
 import MenuStation from './menuStation';
 import MenuBar from './menuBar';
-// import MenuLimit from './menuLimit';
 import PassiveAlarm from './passiveDialog/alarm';
 import PassiveContorl from './passiveDialog/control';
 import PassiveTimeout from './passiveDialog/timeout';
@@ -51,7 +49,6 @@ export default {
 		MenuStationStand,
 		MenuStation,
 		MenuTrain,
-		// MenuLimit,
 		PassiveAlarm,
 		PassiveContorl,
 		PassiveTimeout
@@ -74,7 +71,7 @@ export default {
                     this.$store.state.training.roles != 'BigScreen';
 		},
 		isShowBar() {
-			return this.$store.state.training.prdType != '';
+			return this.$store.state.training.prdType;
 		}
 	},
 	watch: {
diff --git a/src/jmap/theme/chengdu_03/menus/menuBar.vue b/src/jmap/theme/chengdu_03/menus/menuBar.vue
index 296a52a59..6eda8c025 100644
--- a/src/jmap/theme/chengdu_03/menus/menuBar.vue
+++ b/src/jmap/theme/chengdu_03/menus/menuBar.vue
@@ -133,7 +133,7 @@ export default {
 						operate: OperationEvent.Command.mBar.system,
 						children: [
 							{
-								title: '登陆',
+								title: '登录',
 								click: this.undeveloped
 							},
 							{
@@ -400,7 +400,7 @@ export default {
 						operate: OperationEvent.Command.mBar.system,
 						children: [
 							{
-								title: '登陆',
+								title: '登录',
 								click: this.undeveloped
 							},
 							{
diff --git a/src/jmap/theme/chengdu_03/menus/menuButton.vue b/src/jmap/theme/chengdu_03/menus/menuButton.vue
index cc6b7c233..b8bc3cea8 100644
--- a/src/jmap/theme/chengdu_03/menus/menuButton.vue
+++ b/src/jmap/theme/chengdu_03/menus/menuButton.vue
@@ -97,13 +97,13 @@
         <center><b>工</b><b>控</b></center>
       </span>
     </button>
-    <button id="mbm_clear" class="button_box" :style="{width: width+'px', backgroundColor:buttonUpColor}" @click="buttonDown('mbm_clear')">
+    <button :id="Command.cancel.clearMbm.domId" class="button_box" :style="{width: width+'px', backgroundColor:buttonUpColor}" @click="buttonDown(Command.cancel.clearMbm.operation)">
       <span style="color: black">
         <center><b>清</b></center>
         <center><b>除</b></center>
       </span>
     </button>
-    <password-box ref="password" @checkOver="doClose" />
+    <password-box ref="password" @checkOver="passWordCommit" />
   </div>
 </template>
 
@@ -146,6 +146,9 @@ export default {
 		MixinCommand() {
 			return OperationEvent.MixinCommand;
 		},
+		Command() {
+			return OperationEvent.Command;
+		},
 		isShowBtn() {
 			return this.$store.state.training.prdType == '01';
 		}
@@ -165,8 +168,19 @@ export default {
 		this.resetPosition();
 	},
 	methods: {
-		doClose() {
+		passWordCommit(data) {
+			const operate = {
+				type: 'mbm',
+				operation: data.operateNext
+			};
 
+			this.$store.dispatch('training/next', operate).then(({ valid }) => {
+				if (valid) {
+					this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+				}
+			}).catch(() => {
+				this.$refs.noticeInfo.doShow(operate);
+			});
 		},
 		resetPosition() {
 			this.$nextTick(() => {
@@ -199,30 +213,50 @@ export default {
 			}
 		},
 		buttonDown(operation) {
-			if (operation != 'mbm_clear') {
+			if (operation != this.Command.cancel.clearMbm.operation) {
 				const operate = {
 					type: 'mbm',
 					operation: operation
 				};
 				this.$store.dispatch('training/next', operate).then(({ valid }) => {
 					if (valid) {
+						this.operation = operation;
 						this.$store.dispatch('menuOperation/setButtonOperation', operation); // 按钮菜单是否被按下
 						this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
 						if (operation == this.Signal.humanTrainRoute.button.operation) { // 总人解操作 显示密码窗
+							operate['operateNext'] = this.Command.close.password.operation;
+							this.$refs.password.doShow(operate);
+						} else if (operation == this.Section.fault.button.operation) { // 区故解操作 显示密码窗
+							operate['operateNext'] = this.Command.close.password.operation;
+							this.$refs.password.doShow(operate);
+						} else if (operation == this.Switch.unlock.button.operation) { // 道岔解锁操作 显示密码窗
+							operate['operateNext'] = this.Command.close.password.operation;
+							this.$refs.password.doShow(operate);
+						} else if (operation == this.MixinCommand.unblock.button.operation) { // 解封操作 显示密码窗
+							operate['operateNext'] = this.Command.close.password.operation;
 							this.$refs.password.doShow(operate);
 						}
 						this.$store.dispatch('training/emitTipFresh');
 					}
 				});
 			} else {
-				OperateHandler.cleanOperates(); // 清空操作组
-				this.$store.dispatch('menuOperation/setButtonOperation', null);
+				const operate = {
+					type: 'mbm',
+					operation: operation
+				};
+				this.$store.dispatch('training/next', operate).then(({ valid }) => {
+					if (valid) {
+						this.$store.dispatch('menuOperation/setButtonOperation', null);
+						this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+						OperateHandler.cleanOperates(); // 清空操作组
+					}
+				});
 			}
 		},
 		selectedChange() {
 			// 按钮按下时
 			if (this.$store.state.menuOperation.buttonOperation) {
-				const model = this.$store.state.menuOperation.selected;
+				const model = this.$store.state.menuOperation.selected; // 选择设备
 				if (model._type) {
 					const deviceType = MapDeviceType[model._type];
 					const modelData = deepAssign({}, model);
@@ -239,7 +273,12 @@ export default {
 						if (valid) {
 							if (response) {
 								this.tempData = response.data;
-								// console.log(this.tempData, '步骤数据');
+							}
+							if (this.operation == this.Signal.guide.button.operation) { // 引导进路操作 显示密码窗
+								this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+								operate['operateNext'] = this.Command.close.password.operation;
+								this.operation = '0';
+								this.$refs.password.doShow(operate);
 							}
 						}
 					});
diff --git a/src/jmap/theme/chengdu_03/menus/menuLimit.vue b/src/jmap/theme/chengdu_03/menus/menuLimit.vue
deleted file mode 100644
index 938e1b368..000000000
--- a/src/jmap/theme/chengdu_03/menus/menuLimit.vue
+++ /dev/null
@@ -1,120 +0,0 @@
-<template>
-  <div>
-    <pop-menu ref="popMenu" :menu="menu" />
-    <cancel-all-limit ref="cancelAllLimit" />
-  </div>
-</template>
-
-<script>
-import PopMenu from '@/components/PopMenu';
-import CancelAllLimit from './dialog/cancelAllLimit';
-import { mapGetters } from 'vuex';
-import { OperateMode } from '@/scripts/ConstDic';
-import { MapDeviceType, OperationEvent, DeviceMenu } from '@/scripts/ConstDic';
-import { MenuDisabledState } from './utils/menuItemStatus';
-
-export default {
-	name: 'MenuLimit',
-	components: {
-		PopMenu,
-		CancelAllLimit
-	},
-	props: {
-		selected: {
-			type: Object,
-			default() {
-				return null;
-			}
-		}
-	},
-	data() {
-		return {
-			menu: [{
-				label: '取消全线临时限速',
-				handler: this.cancelSpeed,
-				disabledCallback: '',
-				auth: { station: true, center: false }
-			}],
-			menuNormal: {
-				local: [
-					{
-						label: '取消全线临时限速',
-						handler: this.cancelSpeed,
-						disabledCallback: MenuDisabledState.Section.cancelSpeed,
-						auth: { station: true, center: false }
-					}
-				],
-				central: [
-					{
-						label: '取消全线临时限速',
-						handler: this.cancelSpeed,
-						disabledCallback: MenuDisabledState.Section.cancelSpeed,
-						auth: { station: false, center: true }
-					}
-				]
-			}
-		};
-	},
-	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() {
-			// 编辑模式菜单列表
-			if (this.operatemode === OperateMode.ADMIN) {
-				this.menu = [...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();
-			}
-		},
-		// 取消速度
-		cancelSpeed() {
-			const operate = {
-				start: true,
-				send: true,
-				code: this.selected.code,
-				type: MapDeviceType.LimitControl.type,
-				label: MapDeviceType.LimitControl.label,
-				operation: OperationEvent.LimitControl.CancelAllLimit.menu.operation
-			};
-			this.$store.dispatch('training/next', operate).then(({ valid }) => {
-				if (valid) {
-					this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-					this.$refs.cancelAllLimit.doShow(operate, this.selected);
-				}
-			});
-		}
-	}
-};
-</script>
diff --git a/src/jmap/theme/chengdu_03/menus/menuSignal.vue b/src/jmap/theme/chengdu_03/menus/menuSignal.vue
index 68c496dc9..6be66a90a 100644
--- a/src/jmap/theme/chengdu_03/menus/menuSignal.vue
+++ b/src/jmap/theme/chengdu_03/menus/menuSignal.vue
@@ -5,6 +5,7 @@
     <route-control ref="routeControl" />
     <route-detail ref="routeDetail" />
     <route-guide ref="routeGuide" />
+    <route-hand-control ref="routeHandControl" />
     <notice-info ref="noticeInfo" />
   </div>
 </template>
@@ -14,6 +15,7 @@ import PopMenu from '@/components/PopMenu';
 import RouteControl from './dialog/routeControl';
 import RouteSelection from './dialog/routeSelection';
 import RouteDetail from './dialog/routeDetail';
+import RouteHandControl from './dialog/routeHandControl';
 import RouteGuide from './dialog/routeGuide';
 import NoticeInfo from './dialog/childDialog/childDialog/noticeInfo';
 import { mapGetters } from 'vuex';
@@ -28,6 +30,7 @@ export default {
 		PopMenu,
 		RouteControl,
 		RouteSelection,
+		RouteHandControl,
 		RouteDetail,
 		RouteGuide,
 		NoticeInfo
@@ -441,7 +444,7 @@ export default {
 						tempData = response.data;
 					}
 					this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-					this.$refs.routeControl.doShow(operate, this.selected, tempData);
+					this.$refs.routeHandControl.doShow(operate, this.selected, tempData);
 				}
 			});
 		},
@@ -462,7 +465,7 @@ export default {
 						tempData = response.data;
 					}
 					this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-					this.$refs.routeControl.doShow(operate, this.selected, tempData);
+					this.$refs.routeHandControl.doShow(operate, this.selected, tempData);
 				}
 			});
 		},
diff --git a/src/jmap/theme/chengdu_04/menus/index.vue b/src/jmap/theme/chengdu_04/menus/index.vue
index 849fe2334..ec218b332 100644
--- a/src/jmap/theme/chengdu_04/menus/index.vue
+++ b/src/jmap/theme/chengdu_04/menus/index.vue
@@ -71,7 +71,7 @@ export default {
                     this.$store.state.training.roles != 'BigScreen';
 		},
 		isShowBar() {
-			return this.$store.state.training.prdType != '';
+			return this.$store.state.training.prdType;
 		}
 	},
 	watch: {
diff --git a/src/jmap/theme/chengdu_04/menus/menuBar.vue b/src/jmap/theme/chengdu_04/menus/menuBar.vue
index eb025a093..943662caa 100644
--- a/src/jmap/theme/chengdu_04/menus/menuBar.vue
+++ b/src/jmap/theme/chengdu_04/menus/menuBar.vue
@@ -158,7 +158,7 @@ export default {
 						operate: OperationEvent.Command.mBar.system,
 						children: [
 							{
-								title: '登陆',
+								title: '登录',
 								click: this.undeveloped
 							},
 							{
@@ -425,7 +425,7 @@ export default {
 						operate: OperationEvent.Command.mBar.system,
 						children: [
 							{
-								title: '登陆',
+								title: '登录',
 								click: this.undeveloped
 							},
 							{
diff --git a/src/jmap/theme/fuzhou_01/menus/dialog/trainControl.vue b/src/jmap/theme/fuzhou_01/menus/dialog/trainControl.vue
index 807438db6..d3f571986 100644
--- a/src/jmap/theme/fuzhou_01/menus/dialog/trainControl.vue
+++ b/src/jmap/theme/fuzhou_01/menus/dialog/trainControl.vue
@@ -1,15 +1,5 @@
 <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-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
@@ -32,46 +22,58 @@
           :id="domIdTrainType"
           v-model="formModel.trainType"
           style="margin-left: 15px;"
-          :disabled="trainTypeIsDisabled"
           @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 :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 prop="serviceNumber">
-        <span slot="label">{{$t('menu.serviceNumber')}}</span>
+      <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"
-          @change="serverNoChange"
         />
       </el-form-item>
-      <el-form-item :label="this.$t('menu.tripNumber')+this.$t('global.colon')" prop="tripNumber">
+      <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"
-          @change="trainNoChange"
+          maxlength="4"
         />
       </el-form-item>
-      <el-form-item :label="this.$t('menu.targetCode')+this.$t('global.colon')" prop="targetCode">
+      <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"
-          @change="targetCodeChange"
         />
       </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" @click="commit">{{$t('global.confirm')}}</el-button>
+        <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-button :id="domIdCancel" @click="cancel">{{ $t('global.cancel') }}</el-button>
       </el-col>
     </el-row>
     <confirm-train ref="confirmTrain" />
@@ -85,6 +87,7 @@ import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
 import { getPublishTrainList } from '@/api/jmap/map';
 import ConfirmTrain from './childDialog/confirmTrain';
 import NoticeInfo from './childDialog/childDialog/noticeInfo';
+import OperateHandler from '@/scripts/plugin/trainingOperateHandler';
 
 export default {
 	name: 'TrainControl',
@@ -95,12 +98,16 @@ export default {
 	data() {
 		return {
 			trainList: [],
+			categoryList: [
+				{ name: 'MM', value: '01' }
+			],
 			formModel: {
 				tripNumber: '',
 				groupNumber: '',
 				trainType: '01',
 				serviceNumber: '',
-				targetCode: ''
+				targetCode: '',
+				category: 'MM'
 			},
 
 			rules: {
@@ -134,10 +141,10 @@ export default {
 			return false;
 		},
 		serverNoIsDisabled() {
-			return false;
+			return true;
 		},
 		targetCodeIsDisabled() {
-			return false;
+			return true;
 		},
 		trainNumberIsDisabled() {
 			if (this.operation != OperationEvent.Train.addTrainId.menu.operation) {
@@ -145,12 +152,12 @@ export default {
 			}
 			return '';
 		},
-		trainTypeIsDisabled() {
-			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;
 		},
@@ -236,6 +243,28 @@ export default {
 				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() {
@@ -261,10 +290,11 @@ export default {
 			const model = this.$store.getters['map/getDeviceByCode'](selected.code);
 			this.formModel = {
 				groupNumber: model.groupNumber,
-				tripNumber: model.tripNumber,
-				trainType: '01',
+				tripNumber: `${model.directionCode}${model.tripNumber}`,
+				trainType: model.type,
 				serviceNumber: model.serviceNumber,
-				targetCode: model.targetCode
+				targetCode: model.targetCode,
+				category: 'MM'
 			};
 
 			/** 加载列车数据*/
@@ -318,29 +348,11 @@ export default {
 				}
 			});
 		},
-		serverNoChange(serviceNumber) {
-			const operate = {
-				type: MapDeviceType.Train.type,
-				val: `${serviceNumber}`,
-				operation: ''
-			};
-
-			if (this.operation == OperationEvent.Train.addTrainId.menu.operation) {
-				operate.operation = OperationEvent.Train.addTrainId.serverNoChange.operation;
-			} else if (this.operation == OperationEvent.Train.editTrainId.menu.operation) {
-				operate.operation = OperationEvent.Train.editTrainId.serverNoChange.operation;
-			}
-
-			this.$store.dispatch('training/next', operate).then(({ valid }) => {
-				if (valid) {
-					this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-				}
-			});
-		},
 		trainNoChange(tripNumber) {
 			const operate = {
+				send: true,
 				type: MapDeviceType.Train.type,
-				val: `${tripNumber}`,
+				val: tripNumber,
 				operation: ''
 			};
 
@@ -349,29 +361,29 @@ export default {
 			} else if (this.operation == OperationEvent.Train.editTrainId.menu.operation) {
 				operate.operation = OperationEvent.Train.editTrainId.trainNoChange.operation;
 			}
-
-			this.$store.dispatch('training/next', operate).then(({ valid }) => {
+			OperateHandler.backStep(1);
+			this.$store.dispatch('training/next', operate).then(({ valid, response }) => {
 				if (valid) {
-					this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-				}
-			});
-		},
-		targetCodeChange(targetCode) {
-			const operate = {
-				type: MapDeviceType.Train.type,
-				val: `${targetCode}`,
-				operation: ''
-			};
-
-			if (this.operation == OperationEvent.Train.addTrainId.menu.operation) {
-				operate.operation = OperationEvent.Train.addTrainId.targetCodeChange.operation;
-			} else if (this.operation == OperationEvent.Train.editTrainId.menu.operation) {
-				operate.operation = OperationEvent.Train.editTrainId.targetCodeChange.operation;
-			}
-
-			this.$store.dispatch('training/next', operate).then(({ valid }) => {
-				if (valid) {
-					this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+					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'
+						};
+					}
 				}
 			});
 		},
@@ -424,7 +436,7 @@ export default {
 						type: MapDeviceType.Train.type,
 						operation: OperationEvent.Train.editTrainId.menu.operation,
 						messages: [this.$t('tip.editTrainIdTip')],
-						val: this.formModel.tripNumber
+						val: `${this.formModel.trainType}::${this.formModel.tripNumber}`
 					};
 
 					this.loading = true;
diff --git a/src/jmap/theme/fuzhou_01/menus/dialog/trainCreate.vue b/src/jmap/theme/fuzhou_01/menus/dialog/trainCreate.vue
index 80e2dc550..f6a2d90a5 100644
--- a/src/jmap/theme/fuzhou_01/menus/dialog/trainCreate.vue
+++ b/src/jmap/theme/fuzhou_01/menus/dialog/trainCreate.vue
@@ -1,16 +1,5 @@
 <template>
-  <el-dialog
-    v-dialogDrag
-    class="fuzhou-01__systerm route-create"
-    :title="title"
-    :visible.sync="show"
-    width="580px"
-    label-position="top"
-    :before-close="doClose"
-    :z-index="2000"
-    :modal="false"
-    :close-on-click-modal="false"
-  >
+  <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">
@@ -50,7 +39,7 @@
 <script>
 import { mapGetters } from 'vuex';
 import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
-import { getPublishTrainList } from '@/api/jmap/map';
+// import { getPublishTrainList } from '@/api/jmap/map';
 import NoticeInfo from './childDialog/childDialog/noticeInfo';
 
 export default {
@@ -104,18 +93,16 @@ export default {
 	},
 	methods: {
 		loadInitData(map) {
-			if (Object.keys(map || {}).length) {
-				getPublishTrainList(map.skinCode).then(response => {
-					this.trainList = response.data;
-				}).catch(() => {
-					this.$messageBox(this.$t('error.getTrainListFailed'));
-				});
+			if (map.trainList.length) {
+				this.trainList = map.trainList;
+			} else {
+				this.$messageBox(this.$t('error.getTrainListFailed'));
 			}
 		},
 		doShow(operate, selected) {
 			this.dialogShow = true;
 			this.selected = selected;
-
+			console.log(this.map, 111);
 			/** 加载列车数据*/
 			this.loadInitData(this.map);
 
diff --git a/src/jmap/theme/fuzhou_01/menus/index.vue b/src/jmap/theme/fuzhou_01/menus/index.vue
index b46752185..6dc6325fc 100644
--- a/src/jmap/theme/fuzhou_01/menus/index.vue
+++ b/src/jmap/theme/fuzhou_01/menus/index.vue
@@ -66,7 +66,7 @@ export default {
                     this.$store.state.training.roles != 'BigScreen';
 		},
 		isShowBar() {
-			return this.$store.state.training.prdType != '';
+			return this.$store.state.training.prdType;
 		}
 	},
 	watch: {
diff --git a/src/jmap/theme/fuzhou_01/menus/menuDialog/stationControlConvert.vue b/src/jmap/theme/fuzhou_01/menus/menuDialog/stationControlConvert.vue
index b88e1b9d0..035858631 100644
--- a/src/jmap/theme/fuzhou_01/menus/menuDialog/stationControlConvert.vue
+++ b/src/jmap/theme/fuzhou_01/menus/menuDialog/stationControlConvert.vue
@@ -1,472 +1,472 @@
 <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-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-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>
+        <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';
+    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);
-					}
-				});
-			}
+    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;
-				}
-			}
+                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
-			};
+            },
+            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.$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
-				};
+                    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;
-				}
+                    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.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.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.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.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.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.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;
-		}
-	}
-};
+                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;
-}
+    .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/passiveDialog/alarm.vue b/src/jmap/theme/fuzhou_01/menus/passiveDialog/alarm.vue
index ee1a74227..393599ff2 100644
--- a/src/jmap/theme/fuzhou_01/menus/passiveDialog/alarm.vue
+++ b/src/jmap/theme/fuzhou_01/menus/passiveDialog/alarm.vue
@@ -1,209 +1,209 @@
 <template>
-  <el-dialog
-    v-dialogDrag
-    class="fuzhou-01__systerm alarm-detail"
-    :title="level+$t('menu.passiveDialog.alarmDetailInformation')"
-    :visible.sync="show"
-    width="760px"
-    :before-close="doClose"
-    :z-index="2000"
-    :modal="false"
-    :close-on-click-modal="false"
-  >
-    <el-form label-width="80px" size="mini">
-      <el-row>
-        <el-col :span="8">
-          <el-form-item :label="$t('menu.passiveDialog.lineName')">
-            <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-input v-model="model.unitName" disabled />
-          </el-form-item>
-        </el-col>
-        <el-col :span="8">
-          <el-form-item :label="$t('menu.passiveDialog.moduleName')">
-            <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>
-        </el-col>
-        <el-col :span="7">
-          <el-form-item>
-            <span slot="label">{{ $t('menu.passiveDialog.level') }}</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-input v-model="model.confirm" disabled />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row>
-        <el-col :span="9" class="alarm-type">
-          <el-form-item>
-            <span slot="label">{{ $t('menu.passiveDialog.type') }}</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-input v-model="model.childType" disabled />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-form-item :label="$t('menu.passiveDialog.timeSummary')">
-        <el-input v-model="model.timeSummary" disabled />
-      </el-form-item>
-      <el-form-item :label="$t('menu.passiveDialog.recommendedOperation')">
-        <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 />
-      </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-col>
-      <el-col :span="10">
-        <span style="line-height:26px">{{ $t('menu.passiveDialog.unconfirmedMessageOne') }}{{ level }}{{ $t('menu.passiveDialog.unconfirmedMessageTwo') }}</span>
-      </el-col>
-    </el-row>
-  </el-dialog>
+    <el-dialog
+        v-dialogDrag
+        class="fuzhou-01__systerm alarm-detail"
+        :title="level+$t('menu.passiveDialog.alarmDetailInformation')"
+        :visible.sync="show"
+        width="760px"
+        :before-close="doClose"
+        :z-index="2000"
+        :modal="false"
+        :close-on-click-modal="false"
+    >
+        <el-form label-width="80px" size="mini">
+            <el-row>
+                <el-col :span="8">
+                    <el-form-item :label="$t('menu.passiveDialog.lineName')">
+                        <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-input v-model="model.unitName" disabled />
+                    </el-form-item>
+                </el-col>
+                <el-col :span="8">
+                    <el-form-item :label="$t('menu.passiveDialog.moduleName')">
+                        <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>
+                </el-col>
+                <el-col :span="7">
+                    <el-form-item>
+                        <span slot="label">{{ $t('menu.passiveDialog.level') }}</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-input v-model="model.confirm" disabled />
+                    </el-form-item>
+                </el-col>
+            </el-row>
+            <el-row>
+                <el-col :span="9" class="alarm-type">
+                    <el-form-item>
+                        <span slot="label">{{ $t('menu.passiveDialog.type') }}</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-input v-model="model.childType" disabled />
+                    </el-form-item>
+                </el-col>
+            </el-row>
+            <el-form-item :label="$t('menu.passiveDialog.timeSummary')">
+                <el-input v-model="model.timeSummary" disabled />
+            </el-form-item>
+            <el-form-item :label="$t('menu.passiveDialog.recommendedOperation')">
+                <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 />
+            </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-col>
+            <el-col :span="10">
+                <span style="line-height:26px">{{ $t('menu.passiveDialog.unconfirmedMessageOne') }}{{ level }}{{ $t('menu.passiveDialog.unconfirmedMessageTwo') }}</span>
+            </el-col>
+        </el-row>
+    </el-dialog>
 </template>
 
 <script>
-import { mapGetters } from 'vuex';
-import { OperationEvent } from '@/scripts/ConstDic';
+    import { mapGetters } from 'vuex';
+    import { OperationEvent } from '@/scripts/ConstDic';
 
-export default {
-	name: 'AlarmDetail',
-	data() {
-		return {
-			dialogShow: false,
-			loading: false,
-			level: 0,
-			operate: null,
-			controlProps: {
-				'01': this.$t('menu.passiveDialog.centralControl'),
-				'02': this.$t('menu.passiveDialog.stationControl')
-			},
-			model: {
-				lineName: '',
-				unitName: '',
-				moduleName: '',
-				level: '',
-				confirm: '',
-				alarmDate: '',
-				type: '',
-				childType: '',
-				timeSummary: '',
-				recommendedOperation: '',
-				alarmDetail: ''
-			}
-		};
-	},
-	computed: {
-		...mapGetters('map', [
-			'name'
-		]),
-		show() {
-			return this.dialogShow && !this.$store.state.menuOperation.break;
-		},
-		domIdCancel() {
-			return this.dialogShow ? OperationEvent.Command.close.alarm.domId : '';
-		}
-	},
-	watch: {
-		'$store.state.socket.msgHead': function (elem) {
-			if (elem && elem.type == 'resp' && elem.agree) {
-				if (elem.agree) {
-					const operate = this.$store.state.training.operate;
-					const control = this.$store.getters['map/getDeviceByCode'](elem.stationControlCode);
-					const station = this.$store.getters['map/getDeviceByCode'](control.stationCode);
-					const newOperate = {
-						type: operate.type,
-						name: station.name,
-						currentMode: elem.currentMode
-					};
+    export default {
+        name: 'AlarmDetail',
+        data() {
+            return {
+                dialogShow: false,
+                loading: false,
+                level: 0,
+                operate: null,
+                controlProps: {
+                    '01': this.$t('menu.passiveDialog.centralControl'),
+                    '02': this.$t('menu.passiveDialog.stationControl')
+                },
+                model: {
+                    lineName: '',
+                    unitName: '',
+                    moduleName: '',
+                    level: '',
+                    confirm: '',
+                    alarmDate: '',
+                    type: '',
+                    childType: '',
+                    timeSummary: '',
+                    recommendedOperation: '',
+                    alarmDetail: ''
+                }
+            };
+        },
+        computed: {
+            ...mapGetters('map', [
+                'name'
+            ]),
+            show() {
+                return this.dialogShow && !this.$store.state.menuOperation.break;
+            },
+            domIdCancel() {
+                return this.dialogShow ? OperationEvent.Command.close.alarm.domId : '';
+            }
+        },
+        watch: {
+            '$store.state.socket.msgHead': function (elem) {
+                if (elem && elem.type == 'resp' && elem.agree) {
+                    if (elem.agree) {
+                        const operate = this.$store.state.training.operate;
+                        const control = this.$store.getters['map/getDeviceByCode'](elem.stationControlCode);
+                        const station = this.$store.getters['map/getDeviceByCode'](control.stationCode);
+                        const newOperate = {
+                            type: operate.type,
+                            name: station.name,
+                            currentMode: elem.currentMode
+                        };
 
-					this.doShow(newOperate);
-				}
-			}
-		}
-	},
-	mounted() {
-		this.$nextTick(() => {
-			this.$store.dispatch('training/tipReload');
-		});
-	},
-	methods: {
-		doShow(operate) {
-			this.operate = operate || {};
-			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'),
-				alarmDate: new Date(),
-				type: this.$t('menu.passiveDialog.systemEvent'),
-				childType: this.$t('menu.passiveDialog.childTypeTips'),
-				timeSummary: this.$t('menu.passiveDialog.controlModeSummary'),
-				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')}！`
-			};
-			this.dialogShow = true;
-			this.$nextTick(function () {
-				this.$store.dispatch('training/emitTipFresh');
-			});
-		},
-		doClose() {
-			if (this.dialogShow) {
-				this.$store.dispatch('socket/shiftMsgQueue');
-			}
-			this.dialogShow = false;
-			this.$store.dispatch('training/emitTipFresh');
-		},
-		cancel() {
-			const operate = {
-				type: this.operate.type,
-				operation: OperationEvent.Command.close.alarm.operation
-			};
+                        this.doShow(newOperate);
+                    }
+                }
+            }
+        },
+        mounted() {
+            this.$nextTick(() => {
+                this.$store.dispatch('training/tipReload');
+            });
+        },
+        methods: {
+            doShow(operate) {
+                this.operate = operate || {};
+                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'),
+                    alarmDate: new Date(),
+                    type: this.$t('menu.passiveDialog.systemEvent'),
+                    childType: this.$t('menu.passiveDialog.childTypeTips'),
+                    timeSummary: this.$t('menu.passiveDialog.controlModeSummary'),
+                    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')}！`
+                };
+                this.dialogShow = true;
+                this.$nextTick(function () {
+                    this.$store.dispatch('training/emitTipFresh');
+                });
+            },
+            doClose() {
+                if (this.dialogShow) {
+                    this.$store.dispatch('socket/shiftMsgQueue');
+                }
+                this.dialogShow = false;
+                this.$store.dispatch('training/emitTipFresh');
+            },
+            cancel() {
+                const operate = {
+                    type: this.operate.type,
+                    operation: OperationEvent.Command.close.alarm.operation
+                };
 
-			this.$store.dispatch('training/next', operate).then(({ valid }) => {
-				this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-				if (valid) {
-					this.doClose();
-				}
-			});
-		},
-		commit() {
-			const operate = {
-				type: this.operate.type,
-				operation: OperationEvent.Command.close.alarm.operation
-			};
-			this.$store.dispatch('training/next', operate).then(({ valid }) => {
-				this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-				if (valid) {
-					this.doClose();
-				}
-			});
-		},
-		isClose() {
-			return this.dialogShow;
-		}
-	}
-};
+                this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    if (valid) {
+                        this.doClose();
+                    }
+                });
+            },
+            commit() {
+                const operate = {
+                    type: this.operate.type,
+                    operation: OperationEvent.Command.close.alarm.operation
+                };
+                this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    if (valid) {
+                        this.doClose();
+                    }
+                });
+            },
+            isClose() {
+                return this.dialogShow;
+            }
+        }
+    };
 
 </script>
 <style rel="stylesheet/scss" lang="scss" scoped>
diff --git a/src/jmap/theme/fuzhou_01/menus/utils/menuItemStatus.js b/src/jmap/theme/fuzhou_01/menus/utils/menuItemStatus.js
index 5882a171e..e1d26ee45 100644
--- a/src/jmap/theme/fuzhou_01/menus/utils/menuItemStatus.js
+++ b/src/jmap/theme/fuzhou_01/menus/utils/menuItemStatus.js
@@ -240,12 +240,16 @@ export const MenuDisabledState = {
 		// 设置扣车
 		setDetainTrain() {
 			const device = getCurrentStateObject();
-			if (store.state.training.prdType == '02') {
-				if (device && device.holdStatus == deviceState.StationStand.holdStatus.State03) {
+			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.State02) {
+			} else { // 现地模式
+				if (device && device.holdStatus == deviceState.StationStand.holdStatus.State04) {
+					return true;
+				} else if (device && device.holdStatus == deviceState.StationStand.holdStatus.State02) {
 					return true;
 				}
 			}
@@ -254,11 +258,15 @@ export const MenuDisabledState = {
 		cancelDetainTrain() {
 			const device = getCurrentStateObject();
 			if (store.state.training.prdType == '02') {
-				if (device && device.holdStatus != deviceState.StationStand.holdStatus.State03) {
+				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.State02) {
+				if (device && device.holdStatus == deviceState.StationStand.holdStatus.State04) {
+					return false;
+				} else if (device && device.holdStatus != deviceState.StationStand.holdStatus.State02) {
 					return true;
 				}
 			}
diff --git a/src/layout/components/Entry.vue b/src/layout/components/Entry.vue
index 42b0a3ed7..af388eea5 100644
--- a/src/layout/components/Entry.vue
+++ b/src/layout/components/Entry.vue
@@ -26,7 +26,7 @@ export default {
 					handle: this.quickEntry
 				},
 				{
-					name: 'global.scan',
+                    name: 'global.scan',
 					handle: this.qcodeEntry,
 					hidden: process.env.NODE_ENV != 'development'
 				}
diff --git a/src/layout/components/Logout.vue b/src/layout/components/Logout.vue
index 927e3f0d3..8fe4be3e7 100644
--- a/src/layout/components/Logout.vue
+++ b/src/layout/components/Logout.vue
@@ -25,7 +25,7 @@
 
 <script>
 import Language from './Language';
-
+import { UrlConfig } from '@/router/index';
 export default {
 	name: 'Logout',
 	components: {
@@ -34,11 +34,13 @@ export default {
 	data() {
 		return {
 		};
-	},
+  },
+  mounted(){
+  },
 	computed: {
 		username() {
 			return this.$store.state.user.nickname;
-		}
+    },
 	},
 	methods: {
 		language() {
@@ -48,7 +50,10 @@ export default {
 			this.$store.dispatch('LogOut').then(() => {
 				location.reload(); // 为了重新实例化vue-router对象 避免bug
 			});
-		}
+    },
+    selfPermission(){
+      this.$router.push({ path: `${UrlConfig.permission.prefix}/manage`});
+    }
 	}
 };
 </script>
diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue
index 6ef9d3747..8156024cb 100644
--- a/src/layout/components/Navbar.vue
+++ b/src/layout/components/Navbar.vue
@@ -2,12 +2,13 @@
   <el-menu
     class="navbar"
     router
-    :default-active="$route.path"
+    :default-active="activePath"
     mode="horizontal"
     background-color="#545c64"
     text-color="#fff"
     active-text-color="#ffd04b"
   >
+    <system-title></system-title>
     <template v-for="(item,idx) in routers">
       <template v-if="!item.hidden&&item.children">
         <template v-if="hasOneScreenShowingChildren(item.children) &&!item.alwaysShow">
@@ -23,6 +24,7 @@
         </template>
         <template v-else-if="hasOneShowingChildren(item.children) &&!item.alwaysShow">
           <template :to="item.path+'/'+item.children[0].path">
+          <!--   -->
             <el-menu-item :key="idx" :index="item.redirect ? item.redirect : (item.path+'/'+item.children[0].path)">
               <span
                 v-if="item.children[0].meta&&item.children[0].meta.i18n"
@@ -66,7 +68,7 @@
         </el-submenu>
       </template>
     </template>
-    <quick-entry ref="quickEntry" />
+    <quick-entry ref="quickEntry" v-if="isShow"/>
     <user-logout ref="userLogout" />
   </el-menu>
 </template>
@@ -75,15 +77,20 @@
 import { mapGetters } from 'vuex';
 import UserLogout from './Logout';
 import QuickEntry from './Entry';
+import SystemTitle from './Title';
+import { getSessionStorage } from '@/utils/auth';
 
 export default {
 	components: {
 		UserLogout,
-		QuickEntry
+    QuickEntry,
+    SystemTitle
 	},
 	data() {
 		return {
-			routes: []
+      routes: [],
+      isShow:false,
+      activePath:'',
 		};
 	},
 	computed: {
@@ -93,7 +100,22 @@ export default {
 		])
 	},
 	mounted() {
-		this.routes = this.$router.options.routes;
+    this.routes = this.$router.options.routes;
+    if (getSessionStorage('design')) {
+        this.isShow=false;
+    }
+    else{
+        this.isShow=true;
+    }
+    if(this.$route.fullPath.indexOf('design/userlist')>=0){
+      this.activePath='/design/userlist/home';
+    }
+    else if(this.$route.fullPath.indexOf('design/lesson')>=0 || this.$route.fullPath.indexOf('design/script')>=0 || this.$route.fullPath.indexOf('design/runPlan')>=0){
+      this.activePath='/design/home';
+    }
+    else{
+      this.activePath=this.$route.path;
+    }
 	},
 	methods: {
 		toggleSideBar() {
@@ -103,7 +125,7 @@ export default {
 			const showingChildren = children.filter(item => {
 				if (!item.hidden && !item.target) { return item; }
 			});
-			if (showingChildren.length === 1) {
+            if (showingChildren.length === 1) {
 				return true;
 			}
 			return false;
diff --git a/src/layout/components/Title.vue b/src/layout/components/Title.vue
new file mode 100644
index 000000000..2e34d0ad5
--- /dev/null
+++ b/src/layout/components/Title.vue
@@ -0,0 +1,57 @@
+
+<template>
+    <div class="avatar-container" style="margin-left:40px;">
+        <img class="logo" :src="logoImg"  @click="goToMain"/>
+        <div class="titleInner" style="margin-left:60px;" @click="goToMain">{{systemTitle}}</div>
+    </div>
+</template>
+<script>
+import logoImg from '@/assets/logo_changan.png';
+import { getSessionStorage } from '@/utils/auth';
+import { UrlConfig } from '@/router/index';
+import { loginTitle } from '@/scripts/ConstDic';
+
+export default {
+    data() {
+		return {
+            logoImg: logoImg,
+            systemTitle:"城市轨道交通实训平台"
+		};
+  },
+  mounted(){
+        if (getSessionStorage('design')) {
+            this.systemTitle="城市轨道交通设计平台";
+        }
+        else{
+            this.systemTitle=loginTitle[getSessionStorage('project')||'default'];
+        }
+  },
+  methods:{
+      goToMain(){
+        //   if (getSessionStorage('design')) {
+        //       this.$router.push({ path: `${UrlConfig.design.prefix}/home`});
+        //   }
+      }
+  }
+}
+</script>
+<style lang="scss" scoped>
+.main-container .navbar .avatar-container {
+    height: 61px;
+    position: relative;
+    right: 35px;
+    float: left;
+}
+.titleInner{
+    display:inline-block;
+    color: #fff;
+    font-size:24px;
+    font-weight:bold;
+}
+.logo{
+    position: absolute;
+    width: 40px;
+    height: 40px;
+    top: 10px;
+}
+</style>
diff --git a/src/main.js b/src/main.js
index 7d13b4a18..f9ffc387f 100644
--- a/src/main.js
+++ b/src/main.js
@@ -19,7 +19,13 @@ import router from './router';
 import '@/icons'; // icon
 import '@/permission'; // permission control
 import '@/scripts/GlobalPlugin';
-import '@/directives';
+// import '@/directives';
+import '@/directive/dialogDrag/index.js';
+import '@/directive/dialogDragWidth/index.js';
+import '@/directive/drag/index.js';
+import '@/directive/focus/index.js';
+import '@/directive/quickMenuDrag/index.js';
+import '@/directive/waves/index.js';
 import messages from '@/i18n/index';
 
 Vue.use(ElementUI);
diff --git a/src/permission.js b/src/permission.js
index 1cfac6f57..e64a16dc5 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -3,9 +3,11 @@ import store from '@/store';
 import router from './router';
 import NProgress from 'nprogress'; // Progress 进度条
 import 'nprogress/nprogress.css';// Progress 进度条样式
-import { admin } from './router';
-import { getToken, getScreenToken, getPlanToken } from '@/utils/auth'; // 验权
+import { admin, userDesign} from './router';
+import { getToken, getScreenToken, getDesignToken} from '@/utils/auth'; // 验权
+// getPlanToken
 import { LoginParams } from '@/utils/login';
+import { getSessionStorage } from '@/utils/auth';
 
 function hasPermission(roles, permissionRoles) {
 	if (roles.indexOf(admin) >= 0) return true;
@@ -13,13 +15,24 @@ function hasPermission(roles, permissionRoles) {
 	return roles.some(role => permissionRoles.indexOf(role) >= 0);
 }
 
-const whiteList = ['/login', '/dp/login', '/plan/login', '/en/login']; // 不重定向白名单
+const project = getSessionStorage('project');
+
+// const whiteList = ['/login', '/login1', '/dp/login', '/dp/login1', '/design/login1']; // 不重定向白名单
+//
+// const loginPage = whiteList[0] + (('/'+project) || '');
+//
+// const loginScreenPage = isDev ? whiteList[3] : whiteList[2];
+//
+// const loginPlanPage = isDev ? whiteList[5] : whiteList[4];
+// const loginDesignPage = isDev ? whiteList[4] : whiteList[4];
+
+const whiteList = ['/login', '/dp/login', '/en/login', '/design/login', '/en/design/login', '/login/xty']; // 不重定向白名单
 
 const loginPage = whiteList[0];
 
 const loginScreenPage = whiteList[1];
 
-const loginPlanPage = whiteList[2];
+const loginDesignPage = whiteList[3];
 
 // 获取路径数据
 function getRouteInfo(to) {
@@ -32,10 +45,21 @@ function getRouteInfo(to) {
 		loginPath = loginScreenPage;
 		getTokenInfo = getScreenToken;
 		clientId = LoginParams.DaPing.clientId;
-	} else if (/^\/plan/.test(toRoutePath) || /^\/display\/plan/.test(toRoutePath) || /^\/planEdit/.test(toRoutePath)) {
-		loginPath = loginPlanPage;
-		getTokenInfo = getPlanToken;
-		clientId = LoginParams.LianJiHua.clientId;
+	} else if (/^\/design/.test(toRoutePath) || /^\/scriptDisplay/.test(toRoutePath) || /^\/publish/.test(toRoutePath) || /^\/orderauthor/.test(toRoutePath) || /^\/system/.test(toRoutePath)|| /^\/display\/record/.test(toRoutePath) || /^\/display\/manage/.test(toRoutePath) || /^\/apply/.test(toRoutePath)) {
+		loginPath = loginDesignPage;
+		getTokenInfo = getDesignToken;
+		clientId = LoginParams.Design.clientId;
+	} else if (/^\/plan/.test(toRoutePath) || /^\/display\/plan/.test(toRoutePath)) {
+		const flag = getSessionStorage('design');
+		if (flag == 'true') {
+			loginPath = loginDesignPage;
+			getTokenInfo = getDesignToken;
+			clientId = LoginParams.Design.clientId;
+		} else {
+			loginPath = loginPage;
+			getTokenInfo = getToken;
+			clientId = null;
+		}
 	} else {
 		loginPath = loginPage;
 		getTokenInfo = getToken;
@@ -50,11 +74,15 @@ function handleRoute(to, from, next, routeInfo) {
 		// 拉取用户信息
 		store.dispatch('GetInfo', routeInfo.getTokenInfo).then(res => {
 			// 根据roles权限生成可访问的路由表
+			// debugger;
 			const roles = res.roles;
-
+			if (getSessionStorage('design')) {
+				roles.push(userDesign);
+			}
 			store.dispatch('GenerateRoutes', { roles, clientId: routeInfo.clientId }).then(() => {
 				// 动态添加可访问路由表
 				router.addRoutes(store.getters.addRouters);
+				// router.addRoutes(asyncRouter1);
 				if (to.redirectedFrom) {
 					next({ path: to.redirectedFrom, replace: true });
 				} else {
@@ -64,7 +92,7 @@ function handleRoute(to, from, next, routeInfo) {
 
 		}).catch(() => {
 			store.dispatch('FedLogOut', routeInfo.clientId).then(() => {
-				Vue.prototype.$messageBox('验证失败，请重新登陆！');
+				Vue.prototype.$messageBox('验证失败，请重新登录！');
 				next({ path: routeInfo.loginPath });
 			});
 		});
diff --git a/src/router/index.js b/src/router/index.js
index 682093884..bdbd75af7 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -8,21 +8,21 @@ import Layout from '@/layout';
 import Login from '@/views/login/index';
 // 英文默认登陆窗口
 import LoginEn from '@/views/login/loginEn';
-
-// import LoginNewScreen from '@/views/login/loginNewScreen';
 import LoginScreen from '@/views/login/loginScreen';
-import LoginPlan from '@/views/login/loginPlan';
+import LoginDesign from '@/views/login/loginDesign';
+import LoginDesignEn from '@/views/login/loginEnDesign';
 
 import Jlmap3dedit from '@/views/jlmap3d/edit/jlmap3dedit';
 import Jlmap3d from '@/views/jlmap3d/drive/jl3ddrive';
 import Display from '@/views/display/index';
+import DesignDisplay from '@/views/display/designIndex';
+
 import TrainRoom from '@/views/trainRoom/index';
 import JointTraining from '@/views/jointTraining/index';
 
 import Error401 from '@/views/error-page/401';
 import Errpr404 from '@/views/error-page/404';
-import Dashboard from '@/views/dashboard/index';
-import Dashboard1 from '@/views/dashboard/index.vue';
+
 import SkinCode from '@/views/map/skinCode/index';
 import SkinCodeDraft from '@/views/map/skinCode/draft';
 import Mapdraft from '@/views/map/mapdraft/index';
@@ -30,47 +30,47 @@ import Mapedit from '@/views/map/mapdraft/mapedit/index';
 import Runplan from '@/views/map/runplan/index';
 import MapProduct from '@/views/map/product/index';
 import RunplanView from '@/views/map/runplan/chart';
+
 import Trainingrecord from '@/views/lesson/trainingrecord/index';
 import TrainingrecordManage from '@/views/lesson/trainingrecord/manage/index';
 import Taskmanage from '@/views/lesson/taskmanage/list';
 import TrainingRuleList from '@/views/lesson/trainingRule/list';
 import TrainingRuleEdit from '@/views/lesson/trainingRule/detail/index';
 import Trainingmanage from '@/views/lesson/trainingmanage/index';
-import Lessoncategory from '@/views/lesson/lessoncategory/index';
-// import Scriptmanage from '@/views/lesson/scriptmanage/list';
+import LessonEdit from '@/views/lesson/lessoncategory/index';
+import LessonHome from '@/views/lesson/home';
+import LessonDetail from '@/views/lesson/details';
 
-import Scriptmanage from '@/views/scriptManage/index';
 import ScriptmanageHome from '@/views/scriptManage/home';
 import ScriptDisplay from '@/views/scriptManage/display/index';
 
-import ScriptDetail from '@/views/scriptManage/detail/index';
-import Teach from '@/views/teach/index';
-import TeachHome from '@/views/teach/home';
 import TeachDetail from '@/views/teach/detail/index';
 import TeachPractical from '@/views/teach/practical/index';
+import TeachHome from '@/views/teach/index';
 import Pay from '@/views/components/pay/index';
-import Exam from '@/views/exam/index';
-import ExamHome from '@/views/exam/home';
 import ExamDetail from '@/views/exam/detail/examDetail';
+import ExamHome from '@/views/exam/index';
 import ExamCourseDetail from '@/views/exam/detail/courseDetail';
-import ExamQuestionDetail from '@/views/exam/detail/questionDetail';
 import ExamResult from '@/views/exam/result';
 
 import PublishExamRule from '@/views/publish/examRule/index';
 import PublishExamRuleDraft from '@/views/publish/examRule/draft/index';
 
-import Demonstration from '@/views/demonstration/index';
-import DemonstrationHome from '@/views/demonstration/home';
 import DemonstrationDetail from '@/views/demonstration/detail/index';
 import ScreenMonitor from '@/views/screenMonitor/index';
 import ScreenMonitorHome from '@/views/screenMonitor/home';
 import ScreenMonitorDetail from '@/views/screenMonitor/detail/index';
 
 import PlanMonitorEditTool from '@/views/planMonitor/editTool/index';
+import PlanMonitorEditUserTool from '@/views/planMonitor/editTool/userindex';
 import PlanMonitor from '@/views/planMonitor/index';
 import PlanMonitorHome from '@/views/planMonitor/home';
 import PlanMonitorDetail from '@/views/planMonitor/detail';
 
+import DesignPlatformHome from '@/views/designPlatform/home';
+import DesignPlatform from '@/views/designPlatform/index';
+import DesignPlatformUser from '@/views/designPlatform/userIndex';
+
 import Replay from '@/views/replay/index';
 import Package from '@/views/package/index';
 import PackageDraft from '@/views/package/draft/ruleForm';
@@ -85,8 +85,10 @@ import RunPlanTemplate from '@/views/publish/runPlanTemplate/index';
 import RunPlanEveryDay from '@/views/publish/runPlanEveryDay/index';
 import ProductStatus from '@/views/publish/productStatus/index';
 import PublishLesson from '@/views/publish/publishLesson/index';
-// import SimulationScript from '@/views/publish/simulationScript/index';
+
 import IbpEdit from '@/views/ibp/ibpDraft/ibpEdit/index';
+import TrainingPlatform from '@/views/trainingPlatform/index';
+import TrainingPlatformHome from '@/views/trainingPlatform/home';
 
 import Commodity from '@/views/orderauthor/commodity/index';
 import CommodityDraft from '@/views/orderauthor/commodity/draft';
@@ -94,12 +96,10 @@ import OrderList from '@/views/orderauthor/order/list';
 import OrderDraft from '@/views/orderauthor/order/draft';
 import Author from '@/views/orderauthor/author/index';
 import AuthorDraft from '@/views/orderauthor/author/draft/ruleForm';
-
 import Permission from '@/views/orderauthor/permission/index';
 import PermissionDetail from '@/views/orderauthor/permission/detail';
 import PermissionDraft from '@/views/orderauthor/permission/draft/ruleForm';
 import PermissionCreate from '@/views/orderauthor/permission/create/index';
-
 import UserRules from '@/views/orderauthor/rules/index';
 import UserRulesDetail from '@/views/orderauthor/rules/detail';
 
@@ -110,9 +110,17 @@ import UserTraining from '@/views/management/userTraining/index';
 import UserExam from '@/views/management/userExam/index';
 import UserSimulation from '@/views/management/userSimulation/index';
 import ExistingSimulation from '@/views/management/existingSimulation/index';
-
 import CacheControl from '@/views/management/cacheControl/index';
 
+import LessonApproval from '@/views/approval/lesson/index';
+import ScriptApproval from '@/views/approval/script/index';
+import RunPlanApproval from '@/views/approval/runPlan/index';
+
+import SystemGenerate from '@/views/systemGenerate/index';
+
+import { loginTitle } from '@/scripts/ConstDic';
+import { getSessionStorage } from '@/utils/auth';
+
 /**
  * Note: sub-menu only appear when route children.length >= 1
  * Detail see: https://panjiachen.github.io/vue-element-admin-site/guide/essentials/router-and-nav.html
@@ -143,6 +151,8 @@ export const userLesson = '012'; 		// 教学系统
 export const userSimulation = '013';	// 仿真系统
 export const userScreen = '014'; 		// 大屏系统
 export const userPlan = '015'; 			// 计划系统
+export const userDesign='016';			// 设计系统
+const isDev = process.env.NODE_ENV === 'development';
 
 export const UrlConfig = {
 	display: '/display',
@@ -152,8 +162,8 @@ export const UrlConfig = {
 	map: {
 		prefix: '/map',
 		draft: '/map/draw',
-		skinCode: '/map/skinCode',
-		skinCodeDraft: '/map/skinCode/draft',
+		skinCode: '/system/skinCode',
+		skinCodeDraft: '/system/skinCode/draft',
 		runPlan: '/map/runPlan',
 		runPlanView: '/map/runPlan/view',
 		product: '/map/product',
@@ -161,27 +171,9 @@ export const UrlConfig = {
 	},
 	lesson: {
 		prefix: '/lesson',
-		record: '/lesson/record/training',
+		record: '/system/record/training',
 		manage: '/lesson/manage/training'
 	},
-	teach: {
-		prefix: '/teach',
-		detail: '/teach/detail',
-		practical: '/teach/practical',
-		pay: '/teach/pay'
-	},
-	exam: {
-		prefix: '/exam',
-		detail: '/exam/detail',
-		course: '/exam/course',
-		examRuleManage: '/exam/examRule/manage',
-		pay: '/exam/pay'
-	},
-	demonstration: {
-		prefix: '/demonstration',
-		detail: '/demonstration/detail',
-		pay: '/demonstration/pay'
-	},
 	dp: {
 		prefix: '/dp',
 		detail: '/dp/detail',
@@ -191,18 +183,39 @@ export const UrlConfig = {
 	plan: {
 		prefix: '/plan',
 		tool: '/plan/tool',
+		usertool: '/plan/usertool',
 		detail: '/plan/detail',
 		pay: '/plan/pay'
 	},
+	design: {
+		prefix: '/design/home',
+		// tool: '/design/tool',
+		// detail: '/plan/detail',
+		// pay: '/plan/pay'
+		mapDraw: '/design/map/draw',
+		lessonEdit: '/design/lesson/edit',
+		lessonHome: '/design/lesson/home',
+		lessonManage: '/design/lesson/manage',
+		taskManage: '/design/lesson/taskManage',
+		trainingRule: '/design/lesson/trainingRule',
+		trainingRuleDetail: '/design/lesson/trainingRule/detail',
+		trainingManage: '/design/lesson/trainingManage',
+		lessonTraining: '/design/lesson/training',
+		trainingRecord: '/design/lesson/training',
+		runPlan: '/design/runPlan/detail',
+		scriptHome: '/design/script/home',
+		display: '/design/display'
+	},
+	designUser: {
+		prefix: '/design/userlist/home',
+		scriptHome: '/design/userlist/script/home',
+		mapDraw: '/design/userlist/map/draw',
+		lessonHome: '/design/userlist/lesson/home',
+		runPlan: '/design/userlist/runPlan/detail'
+	},
 	replay: {
 		prefix: '/replay'
 	},
-	permission: {
-		prefix: '/permission',
-		permissionList: '/permission/manage',
-		permissionDraft: '/permission/draft',
-		permission: '/permission/restore'
-	},
 	publish: {
 		prefix: '/publish',
 		map: '/publish/map',
@@ -234,6 +247,24 @@ export const UrlConfig = {
 		prefix: 'ibp',
 		draft: '/ibp/draft',
 		edit: 'ibp/edit'
+	},
+	trainingPlatform: {
+		trainingPlatform: '/trainingPlatform',
+		trainingPlatformHome: '/trainingPlatform/home',
+		prodDetail: '/trainingPlatform/detail',
+		teachDetail: '/trainingPlatform/teach',
+		teachHome: '/trainingPlatform/teachHome',
+		examDetail: '/trainingPlatform/exam',
+		examHome: '/trainingPlatform/examHome',
+		examRuleManage: '/trainingPlatform/examRule/manage',
+		examRuleDraft: '/trainingPlatform/examRule/Draft',
+		course: '/trainingPlatform/course',
+		practical: '/trainingPlatform/practical',
+		permission: '/trainingPlatform/permission',
+		permissionDetails: '/trainingPlatform/permission/detail',
+		draft: '/trainingPlatform/draft',
+		pay: '/trainingPlatform/pay',
+		runPlan: '/trainingPlatform/runPlan/manage'
 	}
 };
 
@@ -243,13 +274,19 @@ export const UrlConfig = {
  * all roles can be accessed
  */
 export const constantRoutes = [
-	// 默认登陆窗口
+	// 实训平台登录
 	{
 		path: '/login',
 		component: Login,
 		hidden: true
 	},
-	// 英文登陆窗口
+	// 项目系统登录
+	{
+		path: '/login/:project',
+		component: Login,
+		hidden: true
+	},
+	// 实训平台英文登录
 	{
 		path: '/en/login',
 		component: LoginEn,
@@ -261,15 +298,20 @@ export const constantRoutes = [
 		component: LoginScreen,
 		hidden: true
 	},
-	// 琏计划登陆
+	// 设计平台登录
 	{
-		path: '/plan/login',
-		component: LoginPlan,
+		path: '/design/login',
+		component: LoginDesign,
 		hidden: true
 	},
-
+	// 设计平台英文登录
 	{
-		path: '/jlmap3d/edit',
+		path: '/design/en/login',
+		component: LoginDesignEn,
+		hidden: true
+	},
+	{
+		path: '/design/jlmap3d/edit',
 		component: Jlmap3dedit,
 		hidden: true
 	},
@@ -284,34 +326,164 @@ export const constantRoutes = [
 		component: Errpr404,
 		hidden: true
 	},
-
-	{
-		path: '/',
-		component: Layout,
-		redirect: '/dashboard',
-		children: [{
-			path: 'dashboard',
-			component: Dashboard,
-			meta: {
-				i18n: 'router.homePage',
-				icon: 'dashboard'
-			}
-		}]
-	},
-
 	{ path: '*', redirect: '/404', hidden: true }
 ];
 
 export const asyncRouter = [
 	{
-		path: '/',
+		path: '/design',
 		component: Layout,
-		redirect: '/dashboard',
-		hidden: true,
+		redirect: '/design/home',
+		meta: {
+			roles: [admin, user, userDesign]
+		},
 		children: [
 			{
-				path: 'dashboard',
-				component: Dashboard1
+				path: '',
+				redirect: '/design/home',
+				component: DesignPlatform,
+				meta: {
+					i18n: 'router.designhomePage',
+					icon: 'design'
+				},
+				children: [
+					{
+						path: 'home',
+						component: DesignPlatformHome,
+						meta: {
+						}
+					},
+					{
+						path: 'map/draw/:mapId/:view',
+						component: Mapedit,
+						hidden: true
+					},
+					// {
+					// 	path: 'lesson/edit/:type',
+					// 	component: LessonEdit,
+					// 	hidden: true
+					// },
+					{
+						path: 'runPlan/detail/:mapId',
+						component: PlanMonitorDetail,
+						hidden: true
+					},
+					{
+						path: 'script/home/:mapId',
+						component: ScriptmanageHome,
+						meta: {
+							i18n: 'router.scriptManage'
+						},
+						hidden: true
+					},
+					{
+						path: 'lesson/home/:mapId/:skinCode',
+						component: LessonHome,
+						hidden: true
+					},
+					{
+						path: 'lesson/details',
+						component: LessonDetail,
+						hidden: true,
+						children: [
+							{
+								path: 'edit/:type',
+								component: LessonEdit,
+								hidden: true
+							}
+						]
+					},
+					{
+						path: 'lesson/training/:trainingId/:trainingName',
+						component: TrainingrecordManage,
+						hidden: true
+					},
+					{
+						path: 'lesson/taskManage',
+						component: Taskmanage,
+						hidden: true
+					},
+					{
+						path: 'lesson/trainingRule',
+						component: TrainingRuleList,
+						hidden: true
+					},
+					{
+						path: 'lesson/trainingRule/detail',
+						hidden: true,
+						component: TrainingRuleEdit
+					},
+					{
+						path: 'lesson/trainingManage/:skinCode',
+						component: Trainingmanage,
+						hidden: true
+					},
+					{
+						path: 'lesson/training/:trainingId/:trainingName',
+						component: TrainingrecordManage,
+						hidden: true
+					}
+				]
+			}
+		]
+	},
+	{
+		path: '/design/userlist',
+		redirect: '/design/userlist/home',
+		component: Layout,
+		meta: {
+			roles: [admin, user, userDesign]
+		},
+		children: [
+			{
+				path: '',
+				redirect: '/design/userlist/home',
+				component: DesignPlatformUser,
+				meta: {
+					i18n: 'router.designUserPage',
+					icon: 'design'
+				},
+				children: [
+					{
+						path: 'home',
+						component: DesignPlatformHome,
+						meta: {
+						}
+					},
+					{
+						path: 'map/draw/:mapId/:view',
+						component: Mapedit,
+						hidden: true
+					},
+					{
+						path: 'lesson/edit/:type',
+						component: LessonEdit,
+						hidden: true
+					},
+					{
+						path: 'runPlan/detail/:mapId',
+						component: PlanMonitorDetail,
+						hidden: true
+					},
+					{
+						path: 'script/home/:mapId',
+						component: ScriptmanageHome,
+						meta: {
+							i18n: 'router.scriptManage'
+						},
+						hidden: true
+					},
+					{
+						path: 'lesson/home/:mapId',
+						component: LessonHome,
+						hidden: true
+					},
+					{
+						path: 'lesson/training/:trainingId/:trainingName',
+						component: TrainingrecordManage,
+						hidden: true
+					}
+				]
 			}
 		]
 	},
@@ -322,6 +494,13 @@ export const asyncRouter = [
 		},
 		hidden: true
 	},
+	{
+		path: '/design/display/:mode',
+		component: DesignDisplay,
+		meta: {
+		},
+		hidden: true
+	},
 	{
 		path: '/scriptDisplay/:mode',
 		component: ScriptDisplay,
@@ -352,22 +531,11 @@ export const asyncRouter = [
 		path: '/map',
 		meta: {
 			i18n: 'router.mapManage',
-			roles: [admin, mapCreater]
+			roles: [admin, mapCreater, userDesign]
 		},
+		hidden: true,
 		component: Layout,
 		children: [
-			{
-				path: 'skinCode',
-				component: SkinCode,
-				meta: {
-					i18n: 'router.skinManage'
-				}
-			},
-			{
-				path: 'skinCode/draft/:mode/:skinCodeId',
-				hidden: true,
-				component: SkinCodeDraft
-			},
 			{
 				path: 'draw',
 				redirect: '/map/draw/0/draft',
@@ -383,13 +551,6 @@ export const asyncRouter = [
 					}
 				]
 			},
-			{
-				path: 'ibp/edit',
-				component: IbpEdit,
-				meta: {
-					i18n: 'router.ibpDraw'
-				}
-			},
 			{
 				path: 'runPlan',
 				redirect: '/map/runPlan/view/draft',
@@ -402,46 +563,18 @@ export const asyncRouter = [
 					component: RunplanView,
 					hidden: true
 				}]
-			},
-			{
-				path: 'product',
-				component: MapProduct,
-				meta: {
-					i18n: 'router.productEdit'
-				}
 			}
 		]
 	},
 	{
 		path: '/lesson',
 		component: Layout,
+		hidden: true,
 		meta: {
 			i18n: 'router.lessaonManage',
-			roles: [admin, lessonCreater]
+			roles: [admin, lessonCreater, userDesign]
 		},
 		children: [
-			{
-				path: 'record',
-				redirect: '/lesson/record/training/0/null',
-				component: Trainingrecord,
-				meta: {
-					i18n: 'router.trainingRecord'
-				},
-				children: [
-					{
-						path: 'training/:trainingId/:trainingName',
-						component: TrainingrecordManage,
-						hidden: true
-					}
-				]
-			},
-			{
-				path: 'manage/taskManage',
-				component: Taskmanage,
-				meta: {
-					i18n: 'router.taskManage'
-				}
-			},
 			{
 				path: 'manage/trainingRule',
 				component: TrainingRuleList,
@@ -462,186 +595,106 @@ export const asyncRouter = [
 				meta: {
 					i18n: 'router.trainingManage'
 				}
-			},
-			{
-				path: 'edit',
-				component: Lessoncategory,
-				meta: {
-					i18n: 'router.lessonEdit'
-				}
 			}
 		]
 	},
 	{
-		path: '/script',
-		component: Layout,
-		meta: {
-			roles: [admin, lessonCreater, user]
-		},
-		children: [
-			{
-				path: '',
-				redirect: '/script/home',
-				component: Scriptmanage,
-				meta: {
-					i18n: 'router.scriptManage'
-				},
-				children: [
-					{
-						path: 'home',
-						component: ScriptmanageHome,
-						meta: {
-							i18n: 'router.scriptManage'
-						}
-					},
-					{
-						path: 'detail/:scriptId',
-						component: ScriptDetail,
-						hidden: true
-					}
-				]
-			}
-		]
-	},
-	{
-		path: '/teach',
-		component: Layout,
-		meta: {
-			roles: [admin, userLesson, user]
-		},
-		children: [
-			{
-				path: '',
-				redirect: '/teach/home',
-				component: Teach,
-				meta: {
-					i18n: 'router.teachSystem'
-				},
-				children: [
-					{
-						path: 'home',
-						component: TeachHome
-					},
-					{
-						// 课程详情
-						path: 'detail/:lessonId',
-						component: TeachDetail,
-						meta: {
-						},
-						hidden: true
-					},
-					{
-						// 实训详情
-						path: 'practical/:trainingId/:lessonId',
-						component: TeachPractical,
-						meta: {
-						},
-						hidden: true
-					},
-					{
-						path: 'pay/:lessonId',
-						component: Pay,
-						meta: {
-						},
-						hidden: true
-					}
-				]
-			}
-		]
-	},
-	{
-		path: '/exam',
-		component: Layout,
-		meta: {
-			roles: [admin, userExam, user]
-		},
-		children: [
-			{
-				path: '',
-				redirect: '/exam/home',
-				component: Exam,
-				meta: {
-					i18n: 'router.examSystem'
-				},
-				children: [
-					{
-						path: 'home',
-						component: ExamHome
-					},
-					{
-						// 试卷详情
-						path: 'detail/:examId',
-						component: ExamDetail,
-						hidden: true
-					},
-					{
-						path: 'course/:lessonId',
-						component: ExamCourseDetail,
-						hidden: true
-					},
-					{
-						// 规则管理
-						path: 'examRule/manage',
-						component: PublishExamRule,
-						hidden: true
-					},
-					{
-						path: 'examRule/draft/:mode/:ruleId/:lessonId',
-						hidden: true,
-						component: PublishExamRuleDraft
-					},
-					{
-						path: 'pay/:lessonId',
-						component: Pay,
-						hidden: true
-					},
-					{
-						// 开始考试
-						path: 'questionDetail/:examQuestionId',
-						component: ExamQuestionDetail,
-						hidden: true
-					},
-					{
-						// 考试结果
-						path: 'result/:userExamId',
-						component: ExamResult,
-						hidden: true
-					}
-				]
-			}
-		]
-	},
-	{
-		path: '/demonstration',
+		path: '/trainingPlatform',
 		component: Layout,
+		hidden: true,
 		meta: {
 			roles: [admin, userSimulation, user]
 		},
 		children: [
 			{
 				path: '',
-				redirect: '/demonstration/home',
-				component: Demonstration,
+				redirect: '/trainingPlatform/home',
+				component: TrainingPlatform,
 				meta: {
-					i18n: 'router.demonstrationSystem'
 				},
 				children: [
 					{
 						path: 'home',
-						component: DemonstrationHome,
+						redirect: '/trainingPlatform/permission/14',
+						component: TrainingPlatformHome,
 						meta: {
-							i18n: 'router.demonstrationSystem'
-						}
+						},
+						hidden: true
 					},
 					{
-						path: 'detail/:mapId',
+						path: 'detail/:subSystem',
 						component: DemonstrationDetail,
 						hidden: true
 					},
+					{
+						path: 'teachHome/:subSystem',
+						component: TeachHome,
+						hidden: true
+					},
+					{
+						path: 'teach/:subSystem',
+						component: TeachDetail,
+						hidden: true
+					},
+					{
+						path: 'examHome/:subSystem',
+						component: ExamHome,
+						hidden: true
+					},
+					{
+						path: 'exam/:examId',
+						component: ExamDetail,
+						hidden: true
+					},
+					{
+						path: 'practical/:trainingId/:lessonId',
+						component: TeachPractical,
+						hidden: true
+					},
 					{
 						path: 'pay/:lessonId',
 						component: Pay,
 						hidden: true
+					},
+					{
+						path: 'course/:subSystem',
+						component: ExamCourseDetail,
+						hidden: true
+					},
+					{
+						path: 'result/:userExamId',
+						component: ExamResult,
+						hidden: true
+					},
+					{
+						path: 'permission/:mapId',
+						component: Package,
+						hidden: true
+					},
+					{
+						path: 'permission/detail/:id',
+						component: PackageDetail,
+						hidden: true
+					},
+					{
+						path: 'draft',
+						component: PackageDraft,
+						hidden: true
+					},
+					{
+						path: 'examRule/manage',
+						component: PublishExamRule,
+						hidden: true
+					},
+					{
+						path: 'examRule/draft/:mode/:ruleId/:lessonId',
+						component: PublishExamRuleDraft,
+						hidden: true
+					},
+					{
+						path: 'runPlan/manage/:mapId',
+						component: PlanMonitorDetail,
+						hidden: true
 					}
 				]
 			}
@@ -649,6 +702,7 @@ export const asyncRouter = [
 	},
 	{
 		path: '/dp',
+		hidden: true,
 		redirect: '/dp/home',
 		component: ScreenMonitor,
 		meta: {
@@ -675,6 +729,13 @@ export const asyncRouter = [
 			}
 		]
 	},
+	{
+		path: '/plan/usertool',
+		component: PlanMonitorEditUserTool,
+		meta: {
+		},
+		hidden: true
+	},
 	{
 		path: '/plan/tool',
 		component: PlanMonitorEditTool,
@@ -686,8 +747,9 @@ export const asyncRouter = [
 		path: '/plan',
 		redirect: '/plan/home',
 		component: PlanMonitor,
+		hidden: true,
 		meta: {
-			roles: [admin, user]
+			roles: [admin, user, userDesign]
 		},
 		children: [
 			{
@@ -713,8 +775,9 @@ export const asyncRouter = [
 	{
 		path: '/replay',
 		component: Layout,
+		hidden: true,
 		meta: {
-			roles: [admin]
+			roles: [admin, userDesign]
 		},
 		children: [
 			{
@@ -726,38 +789,12 @@ export const asyncRouter = [
 			}
 		]
 	},
-	{
-		path: '/permission',
-		component: Layout,
-		meta: {
-			roles: [admin, user]
-		},
-		children: [
-			{
-				path: 'manage',
-				component: Package,
-				meta: {
-					i18n: 'router.selfPermission'
-				}
-			},
-			{
-				path: 'manage/detail/:id',
-				component: PackageDetail,
-				hidden: true
-			},
-			{
-				path: 'draft',
-				component: PackageDraft,
-				hidden: true
-			}
-		]
-	},
 	{
 		path: '/publish',
 		component: Layout,
 		meta: {
 			i18n: 'router.pulishManage',
-			roles: [admin]
+			roles: [admin, userDesign]
 		},
 		children: [
 			{
@@ -848,7 +885,7 @@ export const asyncRouter = [
 		component: Layout,
 		meta: {
 			i18n: 'router.orderAuthorityManage',
-			roles: [admin]
+			roles: [admin, userDesign]
 		},
 		children: [
 			{
@@ -940,9 +977,28 @@ export const asyncRouter = [
 		component: Layout,
 		meta: {
 			i18n: 'router.systemManage',
-			roles: [admin]
+			roles: [admin, userDesign]
 		},
 		children: [
+			{
+				path: 'skinCode',
+				component: SkinCode,
+				meta: {
+					i18n: 'router.skinManage'
+				}
+			},
+			{
+				path: 'skinCode/draft/:mode/:skinCodeId',
+				hidden: true,
+				component: SkinCodeDraft
+			},
+			{
+				path: 'ibp/edit',
+				component: IbpEdit,
+				meta: {
+					i18n: 'router.ibpDraw'
+				}
+			},
 			{
 				path: 'dictionary',
 				component: Dictionary,
@@ -999,6 +1055,67 @@ export const asyncRouter = [
 				meta: {
 					i18n: 'router.existingSimulation'
 				}
+			},
+			{
+				path: 'systemGenerate',
+				component: SystemGenerate,
+				meta: {
+					i18n: 'router.subsystemGeneration'
+				}
+			},
+			{
+				path: 'product',
+				component: MapProduct,
+				meta: {
+					i18n: 'router.productEdit'
+				}
+			},
+			{
+				path: 'record',
+				redirect: 'record/training/0/null',
+				component: Trainingrecord,
+				meta: {
+					i18n: 'router.trainingRecord'
+				},
+				hidden: !isDev,
+				children: [
+					{
+						path: 'training/:trainingId/:trainingName',
+						component: TrainingrecordManage,
+						hidden: true
+					}
+				]
+			}
+		]
+	},
+	{
+		path: '/apply',
+		component: Layout,
+		meta: {
+			i18n: 'router.releaseApplication',
+			roles: [admin, userDesign]
+		},
+		children: [
+			{
+				path: 'lesson',
+				component: LessonApproval,
+				meta: {
+					i18n: 'router.courseApplication'
+				}
+			},
+			{
+				path: 'script',
+				component: ScriptApproval,
+				meta: {
+					i18n: 'router.scriptReleaseApplication'
+				}
+			},
+			{
+				path: 'runGraph',
+				component: RunPlanApproval,
+				meta: {
+					i18n: 'router.runGraphReleaseApplication'
+				}
 			}
 		]
 	}
@@ -1016,8 +1133,11 @@ router.beforeEach((to, from, next) => {
 	const name = to.fullPath;
 	if (name.includes('/dp/') || name.includes('display/dp')) {
 		document.title = '琏课堂-大屏系统';
-	} else if (name.includes('/plan/') || name.includes('/planEdit/')) {
-		document.title = '琏计划';
+	} else if (name.includes('/trainingPlatform/')) {
+		const project = getSessionStorage('project');
+		document.title = loginTitle[project || 'default'];
+	} else if (name.includes('/design/') || name.includes('/scriptDisplay/') || name.includes('/plan/') || name.includes('/publish/') || name.includes('/orderauthor/') || name.includes('/system/') || name.includes('/display/plan/') || name.includes('/apply/') || name.includes('/display/manage/')) {
+		document.title = '城市轨道交通设计平台';
 	} else {
 		document.title = '琏课堂';
 	}
diff --git a/src/scripts/ConstConfig.js b/src/scripts/ConstConfig.js
index e2065364a..5f3523f75 100644
--- a/src/scripts/ConstConfig.js
+++ b/src/scripts/ConstConfig.js
@@ -97,7 +97,21 @@ export default {
 			{ label: '北京一号线', value: '03'},
 			{ label: '成都三号线', value: '04'},
 			{ label: '北京八通线', value: '05'}
+		],
+		releaseReview: [
+			{ enlabel: 'Unpublished', label: '未发布', value: '0'},
+			{ enlabel: 'Pending review', label: '待审核', value: '1'},
+			{ enlabel: 'Successfully released', label: '发布成功', value: '2'},
+			{ enlabel: 'Overrule', label: '被驳回', value: '3'}
+		],
+		productType: [
+			{ enlabel: 'Lesson System', label: '教学系统', value: 'Lesson'},
+			{ enlabel: 'Exam System', label: '考试系统', value: 'Exam'},
+			{ enlabel: 'Simulation System', label: '仿真系统', value: 'Simulation'},
+			{ enlabel: 'Plan Draw', label: '运行图编制', value: 'Plan'}
+		],
+		customeredProductType: [
+			{ enlabel: 'Plan Draw', label: '运行图编制', value: 'Plan'}
 		]
-
 	}
 };
diff --git a/src/scripts/ConstDic.js b/src/scripts/ConstDic.js
index 74b15dcae..d8153b2e0 100644
--- a/src/scripts/ConstDic.js
+++ b/src/scripts/ConstDic.js
@@ -139,6 +139,10 @@ export const OperationEvent = {
 			menu: {
 				operation: '000',
 				domId: '_Tips-Cancel-Menu'
+			},
+			clearMbm: {
+				operation: '00012',
+				domId: '_Tips-mbm_clear{TOP}'
 			}
 		},
 		// 关闭对话框
@@ -867,7 +871,7 @@ export const OperationEvent = {
 				domId: '_Tips-Signal-Reopen-Confirm'
 			}
 		},
-		// 人解列车进路
+		// 人解列车进路 (总人解)
 		humanTrainRoute: {
 			event: '5',
 			button: {
@@ -950,12 +954,12 @@ export const OperationEvent = {
 				operation: '3084',
 				domId: '_Tips-Signal-Guide-Confirm2'
 			},
-			stop: {
+			stop: { // 福州线 关闭弹窗操作
 				operation: '3085',
 				domId: '_Tips-Signal-Guide-Stop'
 			},
 			choose: {
-				operation: '3085',
+				operation: '3086',
 				domId: '_Tips-Signal-Guide-Choose'
 			}
 		},
@@ -1868,7 +1872,7 @@ export const OperationEvent = {
 		},
 		// 修改列车识别号
 		editTrainId: {
-			event: '2',
+			event: { query: '9', confirm: '2' },
 			menu: {
 				operation: '702',
 				domId: '_Tips-Train-EditTrainId-Menu'
@@ -2192,3 +2196,8 @@ export const IbpOperation = {
 	Down_Hold_Train: {operate: '03', status: 'on'},
 	Down_Cancel_Hold_Train: {operate: '04', status: 'off'}
 };
+
+export const loginTitle = {
+	xty: '西铁院城市轨道交通实训平台',
+	default: '城市轨道交通实训平台'
+};
diff --git a/src/scripts/DeviceTypeDic.js b/src/scripts/DeviceTypeDic.js
deleted file mode 100644
index 68be8bc23..000000000
--- a/src/scripts/DeviceTypeDic.js
+++ /dev/null
@@ -1,26 +0,0 @@
-export default {
-	ConstSelect: {
-		// 剧本录制模块枚举
-		deviceType: [
-			{label: '进路', value: 'Route'},
-			{label: '区段', value: 'Section'},
-			{label: '信号机', value: 'Signal'},
-			{label: '站台', value: 'StationStand'},
-			{label: '集中站', value: 'Station'},
-			{label: '控制模式', value: 'StationControl'},
-			{label: '道岔', value: 'Switch'},
-			{label: '列车', value: 'Train'}
-		],
-		// 行为触发条件类型
-		triggerType: [
-			{label: '对话', value: 'Conversation'},
-			{label: '设备', value: 'DeviceCondition'},
-			{label: '无', value: 'None'}
-		],
-		// 动作类型
-		actionType: [
-			{label: '对话', value: 'Conversation'},
-			{label: '指令', value: 'Command'}
-		]
-	}
-};
diff --git a/src/scripts/GlobalPlugin.js b/src/scripts/GlobalPlugin.js
index ac3383427..8c78dc5fb 100644
--- a/src/scripts/GlobalPlugin.js
+++ b/src/scripts/GlobalPlugin.js
@@ -87,7 +87,7 @@ Vue.prototype.$convertSpecifiedField = function(dataDict, enumList, key, value,
 			});
 		});
 	}
-},
+};
 
 Vue.prototype.$convertList = function(FromList, ToList, checktypeFunction) {
 	if (FromList) {
diff --git a/src/scripts/OperationConfig.js b/src/scripts/OperationConfig.js
index 912992bb6..afea2e812 100644
--- a/src/scripts/OperationConfig.js
+++ b/src/scripts/OperationConfig.js
@@ -6,8 +6,10 @@
 // {id: "5", trainingType: "02", name: "信号机名称"}
 // {id: "6", trainingType: "02", name: "信号机编号"}
 // {id: "7", trainingType: "03", name: "道岔名称"}
+// {id: "17", trainingType: "03", name: "道岔编码"}
 // {id: "8", trainingType: "04", name: "物理区段名称"}
 // {id: "9", trainingType: "04", name: "逻辑区段名称"}
+// {id: "18", trainingType: "04", name: "逻辑区段编码"}
 // {id: "10", trainingType: "05", name: "车站名称"}
 // {id: "11", trainingType: "05", name: "站台行驶方向编号"}
 // {id: "12", trainingType: "05", name: "站台行驶方向"}
@@ -1289,13 +1291,28 @@ export const OperationList = {
 				trainingName: '办理进路({3} 进路)',
 				trainingRemark: '办理进路功能',
 				trainingType: '02',
-				productTypes: ['01,02'],
+				productTypes: ['02'],
 				stepVOList: [
 					{ deviceType: '04', orderNum: 1, operateCode: '301', tip: '鼠标右键菜单选择【办理进路】' },
 					{ deviceType: '04', orderNum: 2, operateCode: '3011', tip: '鼠标左键选择进路名称【{3}】', val: '{4}' },
 					{ deviceType: '04', orderNum: 3, operateCode: '301', tip: '鼠标左键点击【确定】按钮' }
 				]
 			},
+			{
+				maxDuration: 15,
+				minDuration: 8,
+				operateType: '0201',
+				skinCode: '04',
+				trainingName: '办理进路({3} 进路)',
+				trainingRemark: '办理进路功能',
+				trainingType: '02',
+				productTypes: ['01'],
+				stepVOList: [
+					{ deviceType: 'mbm', orderNum: 1, operateCode: '3010', tip: '鼠标左键点击【排列进路】' },
+					{ deviceType: '04', orderNum: 2, operateCode: '3010', tip: '鼠标左键点击【{5}】', val: '{6}' },
+					{ deviceType: '04', orderNum: 3, operateCode: '3010', tip: '鼠标左键点击【{5}】', val: '{6}' }
+				]
+			},
 			{
 				maxDuration: 15,
 				minDuration: 8,
@@ -1304,14 +1321,29 @@ export const OperationList = {
 				trainingName: '办理引导进路({3})',
 				trainingRemark: '进路办理信号引导',
 				trainingType: '02',
-				productTypes: ['01,02'],
+				productTypes: ['02'],
 				stepVOList: [
 					{ deviceType: '04', orderNum: 1, operateCode: '308', tip: '鼠标右键菜单选择【办理引导进路】' },
-					{ deviceType: '04', orderNum: 2, operateCode: '3085', tip: '鼠标左键选择进路名称【{3}】' },
-					{ deviceType: '04', orderNum: 3, operateCode: '308', tip: '鼠标左键点击【确认】按钮' },
-					{ deviceType: '04', orderNum: 4, operateCode: '0012', tip: '鼠标左键点击【确认】按钮' }
+					{ deviceType: '04', orderNum: 2, operateCode: '3086', tip: '鼠标左键选择进路名称【{3}】', val: '{4}' }, // 进路编号值不正确
+					{ deviceType: '04', orderNum: 3, operateCode: '308', tip: '鼠标左键点击【确认】按钮' }
 				]
 			},
+			// {
+			// 	maxDuration: 15,
+			// 	minDuration: 8,
+			// 	operateType: '0207',
+			// 	skinCode: '04',
+			// 	trainingName: '引导进路({3})',
+			// 	trainingRemark: '进路办理信号引导',
+			// 	trainingType: '02',
+			// 	productTypes: ['01'],
+			// 	stepVOList: [
+			// 		{ deviceType: 'mbm', orderNum: 1, operateCode: '3080', tip: '鼠标左键点击【引导进路】' },
+			// 		{ deviceType: '04', orderNum: 2, operateCode: '3080', tip: '鼠标左键点击【{5}】', val: '{6}' }, // 进路编号值不正确
+			// 		{ deviceType: 'mbm', orderNum: 3, operateCode: '0011', tip: '输入密码123456，点击【确定】按钮' },
+			// 		{ deviceType: '04', orderNum: 4, operateCode: '3080', tip: '鼠标左键点击【{5}】', val: '{6}' }
+			// 	]
+			// },
 			{
 				maxDuration: 15,
 				minDuration: 8,
@@ -1320,7 +1352,7 @@ export const OperationList = {
 				trainingName: '取消进路({3} 进路)',
 				trainingRemark: '取消进路功能',
 				trainingType: '02',
-				productTypes: ['01,02'],
+				productTypes: ['02'],
 				stepVOList: [
 					{ deviceType: '04', orderNum: 1, operateCode: '303', tip: '鼠标右键菜单选择【取消进路】' },
 					{ deviceType: '04', orderNum: 2, operateCode: '303', tip: '鼠标左键点击【确定】按钮' }
@@ -1329,18 +1361,47 @@ export const OperationList = {
 			{
 				maxDuration: 15,
 				minDuration: 8,
-				operateType: '0207',
+				operateType: '0202',
+				skinCode: '04',
+				trainingName: '总取消({3} 进路)',
+				trainingRemark: '总取消功能',
+				trainingType: '02',
+				productTypes: ['01'],
+				stepVOList: [
+					{ deviceType: 'mbm', orderNum: 1, operateCode: '3030', tip: '鼠标左键点击【总取消】' },
+					{ deviceType: '04', orderNum: 2, operateCode: '3030', tip: '鼠标左键点击【{5}】按钮', val: '{6}' }
+				]
+			},
+			{
+				maxDuration: 15,
+				minDuration: 8,
+				operateType: '0215', // 新增数据字典code
 				skinCode: '04',
 				trainingName: '总人解({3})',
 				trainingRemark: '总人解',
 				trainingType: '02',
-				productTypes: ['01,02'],
+				productTypes: ['02'],
 				stepVOList: [
 					{ deviceType: '04', orderNum: 1, operateCode: '305', tip: '鼠标右键菜单选择【总人解】' },
 					{ deviceType: '04', orderNum: 2, operateCode: '305', tip: '鼠标左键点击【确定】按钮' },
 					{ deviceType: '04', orderNum: 3, operateCode: '3051', tip: '输入密码123456，点击【确定】按钮' }
 				]
 			},
+			{
+				maxDuration: 15,
+				minDuration: 8,
+				operateType: '0215', // 新增数据字典code
+				skinCode: '04',
+				trainingName: '总人解({3})',
+				trainingRemark: '总人解',
+				trainingType: '02',
+				productTypes: ['01'],
+				stepVOList: [
+					{ deviceType: 'mbm', orderNum: 1, operateCode: '3050', tip: '鼠标左键点击【总人解】' },
+					{ deviceType: 'mbm', orderNum: 2, operateCode: '0011', tip: '输入密码123456，点击【确定】按钮' },
+					{ deviceType: '04', orderNum: 3, operateCode: '3050', tip: '鼠标左键点击【{5}】', val: '{6}' }
+				]
+			},
 			{
 				maxDuration: 8,
 				minDuration: 5,
@@ -1349,7 +1410,7 @@ export const OperationList = {
 				trainingName: '信号重开({3} 进路)',
 				trainingRemark: '信号重开功能',
 				trainingType: '02',
-				productTypes: ['01,02'],
+				productTypes: ['02'],
 				stepVOList: [
 					{ deviceType: '04', orderNum: 1, operateCode: '304', tip: '鼠标右键菜单选择【信号重开】' },
 					{ deviceType: '04', orderNum: 2, operateCode: '304', tip: '鼠标左键点击【确定】按钮' }
@@ -1363,13 +1424,27 @@ export const OperationList = {
 				trainingName: '信号封锁({5})',
 				trainingRemark: '信号封闭',
 				trainingType: '02',
-				productTypes: ['01,02'],
+				productTypes: ['02'],
 				stepVOList: [
 					{ deviceType: '04', orderNum: 1, operateCode: '306', tip: '鼠标右键菜单选择【信号封闭】' },
 					{ deviceType: '04', orderNum: 2, operateCode: '306', tip: '鼠标左键点击【确定】按钮' },
 					{ deviceType: '04', orderNum: 3, operateCode: '3061', tip: '输入密码123456，点击【确定】按钮' }
 				]
 			},
+			{
+				maxDuration: 15,
+				minDuration: 8,
+				operateType: '0203',
+				skinCode: '04',
+				trainingName: '信号封锁({5})',
+				trainingRemark: '信号封锁功能',
+				trainingType: '02',
+				productTypes: ['01'],
+				stepVOList: [
+					{ deviceType: 'mbm', orderNum: 1, operateCode: '2991', tip: '鼠标左键菜单选择【封锁】' },
+					{ deviceType: '04', orderNum: 1, operateCode: '2991', tip: '鼠标左键点击【{5}】', val: '{6}' }
+				]
+			},
 			{
 				maxDuration: 15,
 				minDuration: 8,
@@ -1378,13 +1453,28 @@ export const OperationList = {
 				trainingName: '信号解封({5})',
 				trainingRemark: '信号解封',
 				trainingType: '02',
-				productTypes: ['01,02'],
+				productTypes: ['02'],
 				stepVOList: [
 					{ deviceType: '04', orderNum: 1, operateCode: '307', tip: '鼠标右键菜单选择【信号解封】' },
 					{ deviceType: '04', orderNum: 2, operateCode: '307', tip: '鼠标左键点击【确认】按钮' },
 					{ deviceType: '04', orderNum: 3, operateCode: '3072', tip: '输入密码123456，点击【确认】按钮' }
 				]
 			},
+			{
+				maxDuration: 15,
+				minDuration: 8,
+				operateType: '0204',
+				skinCode: '04',
+				trainingName: '信号解封({5})',
+				trainingRemark: '信号解封功能',
+				trainingType: '02',
+				productTypes: ['01'],
+				stepVOList: [
+					{ deviceType: 'mbm', orderNum: 1, operateCode: '2992', tip: '鼠标左键菜单选择【解封】' },
+					{ deviceType: 'mbm', orderNum: 2, operateCode: '0011', tip: '输入密码123456，点击【确认】按钮' },
+					{ deviceType: '04', orderNum: 3, operateCode: '2992', tip: '鼠标左键点击【{5}】', val: '{6}' }
+				]
+			},
 			{
 				maxDuration: 15,
 				minDuration: 8,
@@ -1393,11 +1483,25 @@ export const OperationList = {
 				trainingName: '进路收人工控({5})',
 				trainingRemark: '进路收人工控',
 				trainingType: '02',
-				productTypes: ['01,02'],
+				productTypes: ['02'],
 				stepVOList: [
-					{ deviceType: '04', orderNum: 1, operateCode: '315', tip: '鼠标右键菜单选择【自排开】' },
-					{ deviceType: '04', orderNum: 2, operateCode: '3151', tip: '鼠标左键选择控制状态为"人工"的进路', val: '{6}' },
-					{ deviceType: '04', orderNum: 3, operateCode: '315', tip: '鼠标左键点击【确定】按钮' }
+					{ deviceType: '04', orderNum: 1, operateCode: '314', tip: '鼠标右键菜单选择【进路收人工控】' },
+					{ deviceType: '04', orderNum: 2, operateCode: '3141', tip: '鼠标左键选择进路名称【{3}】', val: '{4}' },
+					{ deviceType: '04', orderNum: 3, operateCode: '314', tip: '鼠标左键点击【确定】按钮' }
+				]
+			},
+			{
+				maxDuration: 15,
+				minDuration: 8,
+				operateType: '0208',
+				skinCode: '04',
+				trainingName: '人工控({5})',
+				trainingRemark: '人工控',
+				trainingType: '02',
+				productTypes: ['01'],
+				stepVOList: [
+					{ deviceType: 'mbm', orderNum: 1, operateCode: '3140', tip: '鼠标左键点击【人工控】' },
+					{ deviceType: '04', orderNum: 2, operateCode: '3140', tip: '鼠标左键点击【{3}】', val: '{4}' }
 				]
 			},
 			{
@@ -1408,11 +1512,25 @@ export const OperationList = {
 				trainingName: '进路交自动控({5})',
 				trainingRemark: '进路交自动控',
 				trainingType: '02',
-				productTypes: ['01,02'],
+				productTypes: ['02'],
 				stepVOList: [
-					{ deviceType: '04', orderNum: 1, operateCode: '314', tip: '鼠标右键菜单选择【自排关】' },
-					{ deviceType: '04', orderNum: 2, operateCode: '3141', tip: '鼠标左键选择第一条进路', val: '{6}' },
-					{ deviceType: '04', orderNum: 3, operateCode: '314', tip: '鼠标左键点击【确定】按钮' }
+					{ deviceType: '04', orderNum: 1, operateCode: '315', tip: '鼠标右键菜单选择【进路交自动控】' },
+					{ deviceType: '04', orderNum: 2, operateCode: '3151', tip: '鼠标左键选择进路名称【{3}】', val: '{4}' },
+					{ deviceType: '04', orderNum: 3, operateCode: '315', tip: '鼠标左键点击【确定】按钮' }
+				]
+			},
+			{
+				maxDuration: 15,
+				minDuration: 8,
+				operateType: '0209',
+				skinCode: '04',
+				trainingName: '自动控({5})',
+				trainingRemark: '自动控',
+				trainingType: '02',
+				productTypes: ['01'],
+				stepVOList: [
+					{ deviceType: 'mbm', orderNum: 1, operateCode: '3150', tip: '鼠标左键点击【自动控】' },
+					{ deviceType: '04', orderNum: 2, operateCode: '3150', tip: '鼠标左键点击【{3}】', val: '{4}' }
 				]
 			},
 			{
@@ -1433,12 +1551,12 @@ export const OperationList = {
 			{
 				maxDuration: 15,
 				minDuration: 8,
-				operateType: '0305',
+				operateType: '0312', // 0312 新增定位字典
 				skinCode: '04',
 				trainingName: '单操到定位({7})',
 				trainingRemark: '单操到定位({15})',
 				trainingType: '03',
-				productTypes: ['01,02'],
+				productTypes: ['02'],
 				stepVOList: [
 					{ deviceType: '02', orderNum: 1, operateCode: '101', tip: '鼠标右键菜单选择【单操到定位】' },
 					{ deviceType: '02', orderNum: 2, operateCode: '101', tip: '鼠标左键点击【确定】按钮' }
@@ -1447,17 +1565,45 @@ export const OperationList = {
 			{
 				maxDuration: 15,
 				minDuration: 8,
-				operateType: '0305',
+				operateType: '0313',
+				skinCode: '04',
+				trainingName: '单操到定位({7})',
+				trainingRemark: '单操到定位({7})',
+				trainingType: '03',
+				productTypes: ['01'],
+				stepVOList: [
+					{ deviceType: '02', orderNum: 1, operateCode: '1010', tip: '鼠标左键菜单选择【道岔定操】' },
+					{ deviceType: '02', orderNum: 2, operateCode: '1010', tip: '鼠标左键点击【{7}】按钮', val: '{17}' }
+				]
+			},
+			{
+				maxDuration: 15,
+				minDuration: 8,
+				operateType: '0313', // 0313 新增定位字典
 				skinCode: '04',
 				trainingName: '单操到反位({7})',
 				trainingRemark: '单操到反位({7})',
 				trainingType: '03',
-				productTypes: ['01,02'],
+				productTypes: ['02'],
 				stepVOList: [
 					{ deviceType: '02', orderNum: 1, operateCode: '102', tip: '鼠标右键菜单选择【单操到反位】' },
 					{ deviceType: '02', orderNum: 2, operateCode: '102', tip: '鼠标左键点击【确定】按钮' }
 				]
 			},
+			{
+				maxDuration: 15,
+				minDuration: 8,
+				operateType: '0313',
+				skinCode: '04',
+				trainingName: '单操到反位({7})',
+				trainingRemark: '单操到反位({7})',
+				trainingType: '03',
+				productTypes: ['01'],
+				stepVOList: [
+					{ deviceType: '02', orderNum: 1, operateCode: '1020', tip: '鼠标左键菜单选择【道岔反操】' },
+					{ deviceType: '02', orderNum: 2, operateCode: '1020', tip: '鼠标左键点击【{7}】按钮', val: '{17}' }
+				]
+			},
 			{
 				maxDuration: 15,
 				minDuration: 8,
@@ -1466,12 +1612,26 @@ export const OperationList = {
 				trainingName: '道岔单锁({7})',
 				trainingRemark: '道岔单锁功能',
 				trainingType: '03',
-				productTypes: ['01,02'],
+				productTypes: ['02'],
 				stepVOList: [
 					{ deviceType: '02', orderNum: 1, operateCode: '103', tip: '鼠标右键菜单选择【道岔单锁】' },
 					{ deviceType: '02', orderNum: 2, operateCode: '103', tip: '鼠标左键点击【确定】按钮' }
 				]
 			},
+			{
+				maxDuration: 15,
+				minDuration: 8,
+				operateType: '0301',
+				skinCode: '04',
+				trainingName: '道岔单锁({7})',
+				trainingRemark: '道岔单锁功能',
+				trainingType: '03',
+				productTypes: ['01'], // 现地操作
+				stepVOList: [
+					{ deviceType: '02', orderNum: 1, operateCode: '1030', tip: '鼠标左键菜单选择【道岔单锁】' },
+					{ deviceType: '02', orderNum: 2, operateCode: '1030', tip: '鼠标左键点击【{{7}}】', val: '{17}' }
+				]
+			},
 			{
 				maxDuration: 15,
 				minDuration: 8,
@@ -1480,12 +1640,27 @@ export const OperationList = {
 				trainingName: '道岔解锁({7})',
 				trainingRemark: '道岔解锁功能',
 				trainingType: '03',
-				productTypes: ['01,02'],
+				productTypes: ['02'],
 				stepVOList: [
 					{ deviceType: '02', orderNum: 1, operateCode: '104', tip: '鼠标右键菜单选择【道岔解锁】' },
 					{ deviceType: '02', orderNum: 5, operateCode: '104', tip: '鼠标左键点击【确定】按钮' }
 				]
 			},
+			{
+				maxDuration: 15,
+				minDuration: 8,
+				operateType: '0305',
+				skinCode: '04',
+				trainingName: '道岔解锁({7})',
+				trainingRemark: '道岔解锁功能',
+				trainingType: '03',
+				productTypes: ['01'],
+				stepVOList: [
+					{ deviceType: '02', orderNum: 1, operateCode: '1040', tip: '鼠标左键菜单选择【道岔解锁】' },
+					{ deviceType: '02', orderNum: 2, operateCode: '0011', tip: '输入密码123456，点击【确认】按钮' },
+					{ deviceType: '02', orderNum: 3, operateCode: '1040', tip: '鼠标左键点击【{7}】按钮', val: '{17}' }
+				]
+			},
 			{
 				maxDuration: 15,
 				minDuration: 8,
@@ -1494,13 +1669,27 @@ export const OperationList = {
 				trainingName: '道岔封锁({7})',
 				trainingRemark: '道岔封锁功能',
 				trainingType: '03',
-				productTypes: ['01,02'],
+				productTypes: ['02'],
 				stepVOList: [
 					{ deviceType: '02', orderNum: 1, operateCode: '105', tip: '鼠标右键菜单选择【道岔封锁】' },
 					{ deviceType: '02', orderNum: 2, operateCode: '105', tip: '鼠标左键点击【确定】按钮' },
 					{ deviceType: '02', orderNum: 3, operateCode: '1051', tip: '输入密码123456，点击【确定】按钮' }
 				]
 			},
+			{
+				maxDuration: 15,
+				minDuration: 8,
+				operateType: '0305',
+				skinCode: '04',
+				trainingName: '道岔封锁({7})',
+				trainingRemark: '道岔封锁功能',
+				trainingType: '03',
+				productTypes: ['01'],
+				stepVOList: [
+					{ deviceType: '02', orderNum: 1, operateCode: '2991', tip: '鼠标左键菜单选择【封锁】' },
+					{ deviceType: '02', orderNum: 2, operateCode: '2991', tip: '鼠标左键点击【{7}】按钮', val: '{17}' }
+				]
+			},
 			{
 				maxDuration: 15,
 				minDuration: 8,
@@ -1509,13 +1698,28 @@ export const OperationList = {
 				trainingName: '道岔解封({7})',
 				trainingRemark: '道岔解封功能',
 				trainingType: '03',
-				productTypes: ['01,02'],
+				productTypes: ['02'],
 				stepVOList: [
 					{ deviceType: '02', orderNum: 1, operateCode: '106', tip: '鼠标右键菜单选择【道岔解封】' },
 					{ deviceType: '02', orderNum: 2, operateCode: '106', tip: '鼠标左键点击【确认】按钮' },
 					{ deviceType: '02', orderNum: 3, operateCode: '1062', tip: '输入密码123456，点击【确认】按钮' }
 				]
 			},
+			{
+				maxDuration: 15,
+				minDuration: 8,
+				operateType: '0305',
+				skinCode: '04',
+				trainingName: '道岔解封({7})',
+				trainingRemark: '道岔解封功能',
+				trainingType: '03',
+				productTypes: ['01'],
+				stepVOList: [
+					{ deviceType: '02', orderNum: 1, operateCode: '2992', tip: '鼠标左键菜单选择【解封】' },
+					{ deviceType: '02', orderNum: 2, operateCode: '0011', tip: '输入密码123456，点击【确认】按钮' },
+					{ deviceType: '02', orderNum: 3, operateCode: '2992', tip: '鼠标左键点击【{7}】按钮', val: '{17}' }
+				]
+			},
 			{
 				maxDuration: 20,
 				minDuration: 10,
@@ -1540,7 +1744,7 @@ export const OperationList = {
 				trainingName: '区故解({8}{9})',
 				trainingRemark: '故障解锁功能',
 				trainingType: '04',
-				productTypes: ['01,02'],
+				productTypes: ['02'],
 				stepVOList: [
 					{ deviceType: '03', orderNum: 1, operateCode: '402', tip: '鼠标右键菜单选择【区故解】' },
 					{ deviceType: '03', orderNum: 2, operateCode: '402', tip: '鼠标左键点击【确认】按钮' },
@@ -1550,6 +1754,22 @@ export const OperationList = {
 			{
 				maxDuration: 15,
 				minDuration: 8,
+				operateType: '0401',
+				skinCode: '04',
+				trainingName: '区故解({9})',
+				trainingRemark: '故障解锁功能',
+				trainingType: '04',
+				productTypes: ['01'],
+				stepVOList: [
+					{ deviceType: 'mbm', orderNum: 1, operateCode: '4020', tip: '鼠标右键菜单选择【区故解】' },
+					{ deviceType: 'mbm', orderNum: 2, operateCode: '0011', tip: '输入密码123456，点击【确认】按钮' },
+					{ deviceType: '03', orderNum: 3, operateCode: '4020', tip: '鼠标左键点击【{9}】', val: '{18}' },
+					{ deviceType: 'mbm', orderNum: 4, operateCode: '00012', tip: '鼠标左键点击【清除】' }
+				]
+			},
+			{
+				maxDuration: 15, // 自动生成实训失败
+				minDuration: 8,
 				operateType: '0409',
 				skinCode: '04',
 				trainingName: '属性({8}{9})',
@@ -1728,7 +1948,7 @@ export const OperationList = {
 				]
 			},
 			{
-				maxDuration: 8,
+				maxDuration: 8, // 自动生成实训失败
 				minDuration: 5,
 				operateType: '0507',
 				skinCode: '04',
@@ -1738,7 +1958,7 @@ export const OperationList = {
 				productTypes: ['02'],
 				stepVOList: [
 					{ deviceType: '06', orderNum: 1, operateCode: '507', tip: '鼠标右键菜单选择【属性】' },
-					{ deviceType: '06', orderNum: 2, operateCode: '0012', tip: '鼠标左键点击【确定】按钮' }
+					{ deviceType: '06', orderNum: 2, operateCode: '0012', tip: '鼠标左键点击【退出】按钮' }
 				]
 			}
 		]
@@ -1750,18 +1970,18 @@ export const OperationList = {
 				minDuration: 15,
 				operateType: '0103',
 				skinCode: '05',
-				trainingName: 'To control({1})',
-				trainingRemark: 'Control permission conversion, station control to central control',
+				trainingName: 'Switch to station control({1})',
+				trainingRemark: 'Control permission conversion, switch central control to station control ',
 				trainingType: '01',
 				productTypes: ['02'],
 				stepVOList: [
-					{ deviceType: 'bar', orderNum: 1, operateCode: '0024', tip: 'Click the top menu bar with the left mouse button' },
-					{ deviceType: 'bar', orderNum: 2, operateCode: '2041', tip: 'Click [turn to central control] with the left mouse button' },
-					{ deviceType: '05', orderNum: 3, operateCode: '2042', tip: 'The left mouse button selects the control area to be converted【{1}】', val: '{2}' },
-					{ deviceType: '05', orderNum: 4, operateCode: '204', tip: 'Click [request central control] with the left mouse button', val: '{2}' },
-					{ deviceType: '05', orderNum: 5, operateCode: '2043', tip: 'Click the [ok] button with the left mouse button', val: '{2}' },
-					{ deviceType: '05', orderNum: 6, operateCode: '0013', tip: 'Click the [ok] button with the left mouse button' },
-					{ deviceType: 'bar', orderNum: 7, operateCode: '000', tip: 'Click the [close] button with the left mouse button' }
+					{ deviceType: 'bar', orderNum: 1, operateCode: '0024', tip: 'Left click the menu bar [control mode conversion]on the top' },
+					{ deviceType: 'bar', orderNum: 2, operateCode: '2041', tip: 'Left click [switch to central control] ' },
+					{ deviceType: '05', orderNum: 3, operateCode: '2042', tip: 'Left click to select the control area to be converted【{1}】', val: '{2}' },
+					{ deviceType: '05', orderNum: 4, operateCode: '204', tip: 'Left click [request to central control] ', val: '{2}' },
+					{ deviceType: '05', orderNum: 5, operateCode: '2043', tip: 'Left click [ok]', val: '{2}' },
+					{ deviceType: '05', orderNum: 6, operateCode: '0013', tip: 'Left click [ok]' },
+					{ deviceType: 'bar', orderNum: 7, operateCode: '000', tip: 'Left click [close] ' }
 				]
 			},
 			{
@@ -1769,18 +1989,18 @@ export const OperationList = {
 				minDuration: 8,
 				operateType: '0101',
 				skinCode: '05',
-				trainingName: 'To stand accused of({1})',
-				trainingRemark: 'Control permission conversion, central control transfer station control',
+				trainingName: 'Switch to station control{1})',
+				trainingRemark: 'Control permission conversion, Force to station control',
 				trainingType: '01',
 				productTypes: ['01'],
 				stepVOList: [
-					{ deviceType: 'bar', orderNum: 1, operateCode: '0024', tip: 'Click the top menu bar with the left mouse button' },
-					{ deviceType: 'bar', orderNum: 2, operateCode: '2021', tip: 'Click the left mouse button [turn to station control]' },
-					{ deviceType: '05', orderNum: 3, operateCode: '2022', tip: 'The left mouse button selects the control area to be converted【{1}】', val: '{2}' },
-					{ deviceType: '05', orderNum: 4, operateCode: '202', tip: 'Click [request station control] with the left mouse button', val: '{2}' },
-					{ deviceType: '05', orderNum: 5, operateCode: '2023', tip: 'Click the [ok] button with the left mouse button', val: '{2}' },
-					{ deviceType: '05', orderNum: 6, operateCode: '0013', tip: 'Click the [ok] button with the left mouse button' },
-					{ deviceType: 'bar', orderNum: 7, operateCode: '000', tip: 'Click the [close] button with the left mouse button' }
+					{ deviceType: 'bar', orderNum: 1, operateCode: '0024', tip: 'Left click the menu bar [control mode conversion]on the top' },
+					{ deviceType: 'bar', orderNum: 2, operateCode: '2021', tip: 'Left click [force to station control' },
+					{ deviceType: '05', orderNum: 3, operateCode: '2022', tip: 'Left click to select the control area to be converted【{1}】', val: '{2}' },
+					{ deviceType: '05', orderNum: 4, operateCode: '202', tip: 'Left click [request to station control', val: '{2}' },
+					{ deviceType: '05', orderNum: 5, operateCode: '2023', tip: 'Left click [ok] ', val: '{2}' },
+					{ deviceType: '05', orderNum: 6, operateCode: '0013', tip: 'Left click [ok] ' },
+					{ deviceType: 'bar', orderNum: 7, operateCode: '000', tip: 'Left click [close] ' }
 				]
 			},
 			{
@@ -1788,19 +2008,19 @@ export const OperationList = {
 				minDuration: 8,
 				operateType: '0102',
 				skinCode: '05',
-				trainingName: 'Forced to stand accused of({1})',
-				trainingRemark: 'Control permission conversion, mandatory station control',
+				trainingName: 'Force to station control({1})',
+				trainingRemark: 'Control permission conversion,Force to station control',
 				trainingType: '01',
 				productTypes: ['01'],
 				stepVOList: [
-					{ deviceType: 'bar', orderNum: 1, operateCode: '0024', tip: 'Click the top menu bar with the left mouse button' },
-					{ deviceType: 'bar', orderNum: 2, operateCode: '2034', tip: 'Click [mandatory station control] with the left mouse button' },
-					{ deviceType: 'bar', orderNum: 3, operateCode: '2035', tip: 'After entering the default password [123456] with the left mouse button, click the "ok" button' },
-					{ deviceType: '05', orderNum: 4, operateCode: '2032', tip: 'The left mouse button selects the control area to be converted【{1}】', val: '{2}' },
-					{ deviceType: '05', orderNum: 5, operateCode: '203', tip: 'Click [mandatory station control] with the left mouse button', val: '{2}' },
-					{ deviceType: '05', orderNum: 6, operateCode: '2033', tip: 'Click the [ok] button with the left mouse button', val: '{2}' },
-					{ deviceType: '05', orderNum: 7, operateCode: '0013', tip: 'Click the [ok] button with the left mouse button' },
-					{ deviceType: 'bar', orderNum: 8, operateCode: '000', tip: 'Click the [close] button with the left mouse button' }
+					{ deviceType: 'bar', orderNum: 1, operateCode: '0024', tip: 'Left click the menu bar [control mode conversion]on the top' },
+					{ deviceType: 'bar', orderNum: 2, operateCode: '2034', tip: 'Left click[Force to station control]' },
+					{ deviceType: 'bar', orderNum: 3, operateCode: '2035', tip: 'Left click to input the password [123456],then left click the [OK]' },
+					{ deviceType: '05', orderNum: 4, operateCode: '2032', tip: 'Left click to select the control area to be converted【{1}】', val: '{2}' },
+					{ deviceType: '05', orderNum: 5, operateCode: '203', tip: 'Left click [Foece to station control', val: '{2}' },
+					{ deviceType: '05', orderNum: 6, operateCode: '2033', tip: 'Left click [ok] ', val: '{2}' },
+					{ deviceType: '05', orderNum: 7, operateCode: '0013', tip: 'Left click [ok] ' },
+					{ deviceType: 'bar', orderNum: 8, operateCode: '000', tip: 'Left click [close] ' }
 				]
 			},
 			{
@@ -1808,13 +2028,13 @@ export const OperationList = {
 				minDuration: 8,
 				operateType: '0501',
 				skinCode: '05',
-				trainingName: 'The platform car buckle({10}-{12}station)',
-				trainingRemark: 'Set the button function',
+				trainingName: ' Train detaining({10}-{12}station)',
+				trainingRemark: 'Set the detaining function',
 				trainingType: '05',
 				productTypes: ['01,02'],
 				stepVOList: [
-					{ deviceType: '06', orderNum: 1, operateCode: '504', tip: 'Right mouse button menu select [button car]' },
-					{ deviceType: '06', orderNum: 2, operateCode: '504', tip: 'Click the [ok] button with the left mouse button' }
+					{ deviceType: '06', orderNum: 1, operateCode: '504', tip: 'Right click to select  [train detaining]' },
+					{ deviceType: '06', orderNum: 2, operateCode: '504', tip: 'Left click  [ok] ' }
 				]
 			},
 			{
@@ -1822,13 +2042,13 @@ export const OperationList = {
 				minDuration: 8,
 				operateType: '0502',
 				skinCode: '05',
-				trainingName: 'Stop at platform({10}-{12}The platform)',
-				trainingRemark: 'Set unbutton function',
+				trainingName: 'Cancel  train detaining({10}-{12}The platform)',
+				trainingRemark: 'Set cancelling detaining function',
 				trainingType: '05',
 				productTypes: ['01,02'],
 				stepVOList: [
-					{ deviceType: '06', orderNum: 1, operateCode: '505', tip: 'Right mouse button menu select [cancel car button]' },
-					{ deviceType: '06', orderNum: 2, operateCode: '505', tip: 'Click the [ok] button with the left mouse button' }
+					{ deviceType: '06', orderNum: 1, operateCode: '505', tip: 'Right click to select  [cancel train detaining]]' },
+					{ deviceType: '06', orderNum: 2, operateCode: '505', tip: 'Left click [ok] ' }
 				]
 			},
 			{
@@ -1836,13 +2056,13 @@ export const OperationList = {
 				minDuration: 8,
 				operateType: '0503',
 				skinCode: '05',
-				trainingName: 'Compulsory cancellation of car seizure({10}-{12}The platform)',
-				trainingRemark: 'Force to cancel the car button function',
+				trainingName: 'Force to cancel  train detaining({10}-{12}The platform)',
+				trainingRemark: 'Force to cancel  train detaining function',
 				trainingType: '05',
 				productTypes: ['01'],
 				stepVOList: [
-					{ deviceType: '06', orderNum: 1, operateCode: '506', tip: 'Right mouse button menu select [forced cancel car button]' },
-					{ deviceType: '06', orderNum: 2, operateCode: '506', tip: 'Click the [ok] button with the left mouse button' }
+					{ deviceType: '06', orderNum: 1, operateCode: '506', tip: 'Right click to select [Force to cancel  train detaining]' },
+					{ deviceType: '06', orderNum: 2, operateCode: '506', tip: 'Left click  [ok] ' }
 				]
 			},
 			{
@@ -1850,13 +2070,13 @@ export const OperationList = {
 				minDuration: 8,
 				operateType: '0504',
 				skinCode: '05',
-				trainingName: 'Cancel all stops({10}-{12}The platform)',
-				trainingRemark: 'Cancel button function across the board (default uplink across the board/downlink across the board, no choice)',
+				trainingName: 'Cancel  train detaining along the whole line({10}-{12}The platform)',
+				trainingRemark: 'Cancel  train detaining along the whole line (default the whole uplink and downlink )',
 				trainingType: '05',
 				productTypes: ['02'],
 				stepVOList: [
-					{ deviceType: '06', orderNum: 1, operateCode: '508', tip: 'Right mouse button menu select [cancel car button across the board]' },
-					{ deviceType: '06', orderNum: 2, operateCode: '508', tip: 'Click the [ok] button with the left mouse button', val: '{11}' }
+					{ deviceType: '06', orderNum: 1, operateCode: '508', tip: 'Right click to select [Cancel  train detaining along the whole line]' },
+					{ deviceType: '06', orderNum: 2, operateCode: '508', tip: 'Left click [ok] ', val: '{11}' }
 				]
 			},
 			{
@@ -1864,14 +2084,14 @@ export const OperationList = {
 				minDuration: 8,
 				operateType: '0504',
 				skinCode: '05',
-				trainingName: 'Cancel all stops({10}-{12}The platform)',
-				trainingRemark: 'Cancel button function on all lines (select all lines up/down)',
+				trainingName: 'Cancel  train detaining along the whole line({10}-{12}The platform)',
+				trainingRemark: 'Cancel  train detaining along the whole line (select the uplink or downlink ))',
 				trainingType: '05',
 				productTypes: ['02'],
 				stepVOList: [
-					{ deviceType: '06', orderNum: 1, operateCode: '508', tip: 'Right mouse button menu select [cancel car button across the board]' },
-					{ deviceType: '06', orderNum: 2, operateCode: '5081', tip: 'Right mouse button menu selection【{14}Across the board】', val: '{13}' },
-					{ deviceType: '06', orderNum: 3, operateCode: '508', tip: 'Click the [ok] button with the left mouse button', val: '{13}' }
+					{ deviceType: '06', orderNum: 1, operateCode: '508', tip: 'Right click to select  [Cancel  train detaining along the whole line]' },
+					{ deviceType: '06', orderNum: 2, operateCode: '5081', tip: 'Right click to select[{14}the whole line', val: '{13}' },
+					{ deviceType: '06', orderNum: 3, operateCode: '508', tip: 'Left click [ok]', val: '{13}' }
 				]
 			},
 			{
@@ -1879,13 +2099,13 @@ export const OperationList = {
 				minDuration: 8,
 				operateType: '0505',
 				skinCode: '05',
-				trainingName: 'The platform jump stop({10}-{12}The platform)',
-				trainingRemark: 'Set the jump stop function',
+				trainingName: 'Skip to continue moving({10}-{12}The platform)',
+				trainingRemark: 'Set the skip to continue moving function',
 				trainingType: '05',
 				productTypes: ['01,02'],
 				stepVOList: [
-					{ deviceType: '06', orderNum: 1, operateCode: '502', tip: 'Right mouse button menu selection [jump stop]' },
-					{ deviceType: '06', orderNum: 2, operateCode: '502', tip: 'Click the [ok] button with the left mouse button', val: '{11}' }
+					{ deviceType: '06', orderNum: 1, operateCode: '502', tip: 'Right click to select [Skip to continue moving]' },
+					{ deviceType: '06', orderNum: 2, operateCode: '502', tip: 'Left click [ok]', val: '{11}' }
 				]
 			},
 			{
@@ -1893,13 +2113,13 @@ export const OperationList = {
 				minDuration: 8,
 				operateType: '0506',
 				skinCode: '05',
-				trainingName: 'Cancel out({10}-{12}The platform)',
-				trainingRemark: 'Set to cancel jump stop function',
+				trainingName: 'Cancel skiping ({10}-{12}The platform)',
+				trainingRemark: 'Set cancelling skiping function',
 				trainingType: '05',
 				productTypes: ['01,02'],
 				stepVOList: [
-					{ deviceType: '06', orderNum: 1, operateCode: '503', tip: 'Right mouse button menu select [cancel jump stop]' },
-					{ deviceType: '06', orderNum: 2, operateCode: '503', tip: 'Click the [ok] button with the left mouse button', val: '{11}' }
+					{ deviceType: '06', orderNum: 1, operateCode: '503', tip: 'Right click to select [Cancel skiping]' },
+					{ deviceType: '06', orderNum: 2, operateCode: '503', tip: 'Left click [ok]', val: '{11}' }
 				]
 			},
 			{
@@ -1907,13 +2127,13 @@ export const OperationList = {
 				minDuration: 5,
 				operateType: '0507',
 				skinCode: '05',
-				trainingName: 'Query platform status({10}-{12}The platform)',
-				trainingRemark: 'Query platform status function',
+				trainingName: ' Platform status query({10}-{12}The platform)',
+				trainingRemark: 'Query platform status  function',
 				trainingType: '05',
 				productTypes: ['01,02'],
 				stepVOList: [
-					{ deviceType: '06', orderNum: 1, operateCode: '507', tip: 'Right mouse button menu selection [query platform status]' },
-					{ deviceType: '06', orderNum: 2, operateCode: '0012', tip: 'Click the [ok] button with the left mouse button' }
+					{ deviceType: '06', orderNum: 1, operateCode: '507', tip: 'Right click to select [Platform status query]' },
+					{ deviceType: '06', orderNum: 2, operateCode: '0012', tip: 'Left click [ok] ' }
 				]
 			},
 			{
@@ -1922,14 +2142,14 @@ export const OperationList = {
 				operateType: '0508',
 				skinCode: '05',
 				trainingName: 'Set the stop time({10}-{12}The platform)',
-				trainingRemark: 'Set stop time (automatic, always in effect)',
+				trainingRemark: 'Set the stop time (auto, permanent validity)',
 				trainingType: '05',
 				productTypes: ['02'],
 				stepVOList: [
-					{ deviceType: '06', orderNum: 1, operateCode: '509', tip: 'Right mouse button menu select [set stop time]' },
-					{ deviceType: '06', orderNum: 2, operateCode: '5092', tip: 'Click the left mouse button and select [auto]', val: '01' },
-					{ deviceType: '06', orderNum: 3, operateCode: '509', tip: 'Click the [ok] button with the left mouse button', val: '01::20::true' },
-					{ deviceType: '06', orderNum: 4, operateCode: '5091', tip: 'Click the [ok] button with the left mouse button', val: '01::20::true' }
+					{ deviceType: '06', orderNum: 1, operateCode: '509', tip: 'Right click to select [Set the stop time]' },
+					{ deviceType: '06', orderNum: 2, operateCode: '5092', tip: 'Left click to select [auto]', val: '01' },
+					{ deviceType: '06', orderNum: 3, operateCode: '509', tip: 'Left click [ok] ', val: '01::20::true' },
+					{ deviceType: '06', orderNum: 4, operateCode: '5091', tip: 'Left click [ok] ', val: '01::20::true' }
 				]
 			},
 			{
@@ -1938,15 +2158,15 @@ export const OperationList = {
 				operateType: '0508',
 				skinCode: '05',
 				trainingName: 'Set the stop time({10}-{12}The platform)',
-				trainingRemark: 'Set stop time (manual, 20 seconds, always valid)',
+				trainingRemark: 'Set the stop time (manual, 20 seconds, permanent validity)',
 				trainingType: '05',
 				productTypes: ['02'],
 				stepVOList: [
-					{ deviceType: '06', orderNum: 1, operateCode: '509', tip: 'Right mouse button menu select [set stop time]' },
-					{ deviceType: '06', orderNum: 2, operateCode: '5092', tip: 'Click the left mouse button and select [manual]', val: '02' },
-					{ deviceType: '06', orderNum: 3, operateCode: '5094', tip: 'Input or mouse click, adjust to [20]', val: '20' },
-					{ deviceType: '06', orderNum: 4, operateCode: '509', tip: 'Click the [ok] button with the left mouse button', val: '02::20::true' },
-					{ deviceType: '06', orderNum: 5, operateCode: '5091', tip: 'Click the [ok] button with the left mouse button', val: '02::20::true' }
+					{ deviceType: '06', orderNum: 1, operateCode: '509', tip: 'Right click to select [Set the stop time]' },
+					{ deviceType: '06', orderNum: 2, operateCode: '5092', tip: 'Left click to select  [manual]', val: '02' },
+					{ deviceType: '06', orderNum: 3, operateCode: '5094', tip: 'Set time  [20]', val: '20' },
+					{ deviceType: '06', orderNum: 4, operateCode: '509', tip: 'Left click  [ok] ', val: '02::20::true' },
+					{ deviceType: '06', orderNum: 5, operateCode: '5091', tip: 'Left click  [ok]', val: '02::20::true' }
 				]
 			},
 			{
@@ -1955,16 +2175,16 @@ export const OperationList = {
 				operateType: '0508',
 				skinCode: '05',
 				trainingName: 'Set the stop time({10}-{12}The platform)',
-				trainingRemark: 'Set stop time (manual, 20 seconds, valid once)',
+				trainingRemark: 'Set the stop time (manual, 20 seconds, once valid )',
 				trainingType: '05',
 				productTypes: ['02'],
 				stepVOList: [
-					{ deviceType: '06', orderNum: 1, operateCode: '509', tip: 'Right mouse button menu select [set stop time]' },
-					{ deviceType: '06', orderNum: 2, operateCode: '5092', tip: 'Click the left mouse button and select [manual]', val: '02' },
-					{ deviceType: '06', orderNum: 3, operateCode: '5094', tip: 'Input or mouse click, adjust to [20]', val: '20' },
-					{ deviceType: '06', orderNum: 4, operateCode: '5093', tip: 'Click the left mouse button and select "valid once".', val: 'false' },
-					{ deviceType: '06', orderNum: 5, operateCode: '509', tip: 'Click the [ok] button with the left mouse button', val: '02::20::false' },
-					{ deviceType: '06', orderNum: 6, operateCode: '5091', tip: 'Click the [ok] button with the left mouse button', val: '02::20::false' }
+					{ deviceType: '06', orderNum: 1, operateCode: '509', tip: 'Right click to select [Set the stop time]' },
+					{ deviceType: '06', orderNum: 2, operateCode: '5092', tip: 'Left click to select  [manual]', val: '02' },
+					{ deviceType: '06', orderNum: 3, operateCode: '5094', tip: 'Set time  [20]', val: '20' },
+					{ deviceType: '06', orderNum: 4, operateCode: '5093', tip: 'Left click to select "once valid ".', val: 'false' },
+					{ deviceType: '06', orderNum: 5, operateCode: '509', tip: 'Left click  [ok] ', val: '02::20::false' },
+					{ deviceType: '06', orderNum: 6, operateCode: '5091', tip: 'Left click  [ok] ', val: '02::20::false' }
 				]
 			},
 			{
@@ -1972,15 +2192,15 @@ export const OperationList = {
 				minDuration: 8,
 				operateType: '0509',
 				skinCode: '05',
-				trainingName: 'Set operation level({10}-{12}The platform)',
-				trainingRemark: 'Set the running level (set the interval running time to 60, which is always valid)',
+				trainingName: 'Set the operation mode({10}-{12}The platform)',
+				trainingRemark: 'Set the operation mode(set the interval running time to 60, permanent validity)',
 				trainingType: '05',
 				productTypes: ['02'],
 				stepVOList: [
-					{ deviceType: '06', orderNum: 1, operateCode: '510', tip: 'Right mouse button menu selection [set operation level]' },
-					{ deviceType: '06', orderNum: 2, operateCode: '5101', tip: 'Click the left mouse button and select [60]', val: '60' },
-					{ deviceType: '06', orderNum: 3, operateCode: '510', tip: 'Click the [ok] button with the left mouse button', val: '60::true' },
-					{ deviceType: '06', orderNum: 4, operateCode: '5102', tip: 'Click the [ok] button with the left mouse button', val: '60::true' }
+					{ deviceType: '06', orderNum: 1, operateCode: '510', tip: 'Right click to select [Set the operation mode]' },
+					{ deviceType: '06', orderNum: 2, operateCode: '5101', tip: 'Left click to select [60]', val: '60' },
+					{ deviceType: '06', orderNum: 3, operateCode: '510', tip: 'Left click [ok] ', val: '60::true' },
+					{ deviceType: '06', orderNum: 4, operateCode: '5102', tip: 'Left click [ok] ', val: '60::true' }
 				]
 			},
 			{
@@ -1988,16 +2208,16 @@ export const OperationList = {
 				minDuration: 8,
 				operateType: '0509',
 				skinCode: '05',
-				trainingName: 'Set operation level({10}-{12}The platform)',
-				trainingRemark: 'Set the running level (set the interval running time to 60, valid once)',
+				trainingName: 'Set operation mode({10}-{12}The platform)',
+				trainingRemark: 'Set operation mode (set the interval running time to 60, once valid )',
 				trainingType: '05',
 				productTypes: ['02'],
 				stepVOList: [
-					{ deviceType: '06', orderNum: 1, operateCode: '510', tip: 'Right mouse button menu selection [set operation level]' },
-					{ deviceType: '06', orderNum: 2, operateCode: '5101', tip: 'Click the left mouse button and select [60]', val: '60' },
-					{ deviceType: '06', orderNum: 3, operateCode: '5103', tip: 'Click the left mouse button to deselect.', val: 'false' },
-					{ deviceType: '06', orderNum: 4, operateCode: '510', tip: 'Click the [ok] button with the left mouse button', val: '60::false' },
-					{ deviceType: '06', orderNum: 5, operateCode: '5102', tip: 'Click the [ok] button with the left mouse button', val: '60::false' }
+					{ deviceType: '06', orderNum: 1, operateCode: '510', tip: 'Right click to select [Set the operation mode]' },
+					{ deviceType: '06', orderNum: 2, operateCode: '5101', tip: 'Left click to select [60]', val: '60' },
+					{ deviceType: '06', orderNum: 3, operateCode: '5103', tip: 'Left click to cancel [permanent validity].', val: 'false' },
+					{ deviceType: '06', orderNum: 4, operateCode: '510', tip: 'Left click [ok] ', val: '60::false' },
+					{ deviceType: '06', orderNum: 5, operateCode: '5102', tip: 'Left click [ok] ', val: '60::false' }
 				]
 			},
 			{
@@ -2005,13 +2225,13 @@ export const OperationList = {
 				minDuration: 8,
 				operateType: '0510',
 				skinCode: '05',
-				trainingName: 'Set early departure({10}-{12}The platform)',
-				trainingRemark: 'Set the early departure function',
+				trainingName: 'Set departure inadvance({10}-{12}The platform)',
+				trainingRemark: 'Set  departure inadvance function',
 				trainingType: '05',
 				productTypes: ['02'],
 				stepVOList: [
-					{ deviceType: '06', orderNum: 1, operateCode: '501', tip: 'Right mouse button menu select [set early departure]' },
-					{ deviceType: '06', orderNum: 2, operateCode: '501', tip: 'Click the [ok] button with the left mouse button' }
+					{ deviceType: '06', orderNum: 1, operateCode: '501', tip: 'Right click to select [Set departure inadvance]' },
+					{ deviceType: '06', orderNum: 2, operateCode: '501', tip: 'Left click [ok] ' }
 				]
 			},
 			{
@@ -2019,14 +2239,14 @@ export const OperationList = {
 				minDuration: 8,
 				operateType: '0511',
 				skinCode: '05',
-				trainingName: 'Manual return policy setting({10}-{12}The platform)',
-				trainingRemark: 'Manual return policy setting function',
+				trainingName: 'Manual return strategy setting({10}-{12}The platform)',
+				trainingRemark: 'Manual return strategy setting function',
 				trainingType: '05',
 				productTypes: ['02'],
 				stepVOList: [
-					{ deviceType: '06', orderNum: 1, operateCode: '511', tip: 'Right mouse button menu selection [manual return strategy setting]' },
-					{ deviceType: '06', orderNum: 2, operateCode: '5111', tip: 'Click the left mouse button and select "no return".', val: '01' },
-					{ deviceType: '06', orderNum: 3, operateCode: '511', tip: 'Click the [ok] button with the left mouse button', val: '01' }
+					{ deviceType: '06', orderNum: 1, operateCode: '511', tip: 'Right click to select [Manual return strategy setting]' },
+					{ deviceType: '06', orderNum: 2, operateCode: '5111', tip: 'Left click to select [No return]".', val: '01' },
+					{ deviceType: '06', orderNum: 3, operateCode: '511', tip: 'Left click [ok] ', val: '01' }
 				]
 			},
 
@@ -2040,11 +2260,11 @@ export const OperationList = {
 				trainingType: '04',
 				productTypes: ['01,02'],
 				stepVOList: [
-					{ deviceType: '03', orderNum: 1, operateCode: '402', tip: 'Select "section fault unlocking" from the right mouse button menu' },
-					{ deviceType: '03', orderNum: 2, operateCode: '4026', tip: 'Click the [down] button with the left mouse button' },
-					{ deviceType: '03', orderNum: 3, operateCode: '4024', tip: 'Click the [confirm 1] button with the left mouse button' },
-					{ deviceType: '03', orderNum: 4, operateCode: '4025', tip: 'Click the [confirm 2] button with the left mouse button' },
-					{ deviceType: '03', orderNum: 5, operateCode: '001', tip: 'Click the [close] button with the left mouse button' }
+					{ deviceType: '03', orderNum: 1, operateCode: '402', tip: 'Right click to select "Section fault unlocking" ' },
+					{ deviceType: '03', orderNum: 2, operateCode: '4026', tip: 'Left click  [Execute] ' },
+					{ deviceType: '03', orderNum: 3, operateCode: '4024', tip: 'Left click [ok 1] ' },
+					{ deviceType: '03', orderNum: 4, operateCode: '4025', tip: 'Left click [ok 2] ' },
+					{ deviceType: '03', orderNum: 5, operateCode: '001', tip: 'Left click [close] ' }
 				]
 			},
 			{
@@ -2052,13 +2272,13 @@ export const OperationList = {
 				minDuration: 8,
 				operateType: '0402',
 				skinCode: '05',
-				trainingName: 'Segment resection({8}{9})',
-				trainingRemark: 'Segment resection',
+				trainingName: 'Section resection({8}{9})',
+				trainingRemark: 'Section resection',
 				trainingType: '04',
 				productTypes: ['01,02'],
 				stepVOList: [
-					{ deviceType: '03', orderNum: 1, operateCode: '405', tip: 'Right mouse button menu select [segment cut]' },
-					{ deviceType: '03', orderNum: 2, operateCode: '405', tip: 'Click the [ok] button with the left mouse button' }
+					{ deviceType: '03', orderNum: 1, operateCode: '405', tip: 'Right click to select  [Section resection]' },
+					{ deviceType: '03', orderNum: 2, operateCode: '405', tip: 'Left click  [ok] ' }
 				]
 			},
 			{
@@ -2066,13 +2286,13 @@ export const OperationList = {
 				minDuration: 8,
 				operateType: '0403',
 				skinCode: '05',
-				trainingName: 'Section to activate({8}{9})',
+				trainingName: 'Section  activation({8}{9})',
 				trainingRemark: 'Section activation function',
 				trainingType: '04',
 				productTypes: ['01,02'],
 				stepVOList: [
-					{ deviceType: '03', orderNum: 1, operateCode: '406', tip: 'Right mouse button menu selection [section activation]' },
-					{ deviceType: '03', orderNum: 2, operateCode: '406', tip: 'Click the [ok] button with the left mouse button' }
+					{ deviceType: '03', orderNum: 1, operateCode: '406', tip: 'Right click to select [Section  activation]' },
+					{ deviceType: '03', orderNum: 2, operateCode: '406', tip: 'Left click [ok]' }
 				]
 			},
 			{
@@ -2085,11 +2305,11 @@ export const OperationList = {
 				trainingType: '04',
 				productTypes: ['01'],
 				stepVOList: [
-					{ deviceType: '03', orderNum: 1, operateCode: '409', tip: 'Select from the right mouse button menu [segment-axis pre-reset]' },
-					{ deviceType: '03', orderNum: 2, operateCode: '4091', tip: 'Click the [down] button with the left mouse button' },
-					{ deviceType: '03', orderNum: 3, operateCode: '4093', tip: 'Click the [confirm 1] button with the left mouse button' },
-					{ deviceType: '03', orderNum: 4, operateCode: '4094', tip: 'Click the [confirm 2] button with the left mouse button' },
-					{ deviceType: '03', orderNum: 5, operateCode: '001', tip: 'Click the [close] button with the left mouse button' }
+					{ deviceType: '03', orderNum: 1, operateCode: '409', tip: 'Right click to select  [Axis pre-reset]' },
+					{ deviceType: '03', orderNum: 2, operateCode: '4091', tip: 'Left click  [Execute]' },
+					{ deviceType: '03', orderNum: 3, operateCode: '4093', tip: 'Left click [ok1]' },
+					{ deviceType: '03', orderNum: 4, operateCode: '4094', tip: 'Left click [ok2]' },
+					{ deviceType: '03', orderNum: 5, operateCode: '001', tip: 'Left click [close]' }
 				]
 			},
 			{
@@ -2097,13 +2317,13 @@ export const OperationList = {
 				minDuration: 8,
 				operateType: '0405',
 				skinCode: '05',
-				trainingName: 'Section block({8}{9})',
-				trainingRemark: 'Block blocking function',
+				trainingName: 'Section blockade({8}{9})',
+				trainingRemark: 'Section blockade function',
 				trainingType: '04',
 				productTypes: ['01,02'],
 				stepVOList: [
-					{ deviceType: '03', orderNum: 1, operateCode: '403', tip: 'Right mouse button menu selection [block]' },
-					{ deviceType: '03', orderNum: 2, operateCode: '403', tip: 'Click the [ok] button with the left mouse button' }
+					{ deviceType: '03', orderNum: 1, operateCode: '403', tip: 'Right click to select  [Section blockade]' },
+					{ deviceType: '03', orderNum: 2, operateCode: '403', tip: 'Left click  [ok] ' }
 				]
 			},
 			{
@@ -2111,16 +2331,16 @@ export const OperationList = {
 				minDuration: 8,
 				operateType: '0406',
 				skinCode: '05',
-				trainingName: 'Section unlock({8}{9})',
-				trainingRemark: 'Section unsealing function',
+				trainingName: 'Section unblockade({8}{9})',
+				trainingRemark: 'Section unblockade function',
 				trainingType: '04',
 				productTypes: ['01,02'],
 				stepVOList: [
-					{ deviceType: '03', orderNum: 1, operateCode: '404', tip: 'Right mouse button menu selection [section unsealing]' },
-					{ deviceType: '03', orderNum: 2, operateCode: '4041', tip: 'Click the [down] button with the left mouse button' },
-					{ deviceType: '03', orderNum: 3, operateCode: '4043', tip: 'Click the [confirm 1] button with the left mouse button' },
-					{ deviceType: '03', orderNum: 4, operateCode: '4044', tip: 'Click the [confirm 2] button with the left mouse button' },
-					{ deviceType: '03', orderNum: 5, operateCode: '001', tip: 'Click the [close] button with the left mouse button' }
+					{ deviceType: '03', orderNum: 1, operateCode: '404', tip: 'Right click to select  [Section unblockade]' },
+					{ deviceType: '03', orderNum: 2, operateCode: '4041', tip: 'Left click  [Execute]' },
+					{ deviceType: '03', orderNum: 3, operateCode: '4043', tip: 'Left click [ok1]' },
+					{ deviceType: '03', orderNum: 4, operateCode: '4044', tip: 'Left click [ok2]' },
+					{ deviceType: '03', orderNum: 5, operateCode: '001', tip: 'Left click [close]' }
 				]
 			},
 			{
@@ -2128,18 +2348,18 @@ export const OperationList = {
 				minDuration: 8,
 				operateType: '0407',
 				skinCode: '05',
-				trainingName: 'Section sets speed limit({8}{9})',
-				trainingRemark: 'Section setting speed limit function (speed limit value: 5)',
+				trainingName: 'Set speed limit on the section({8}{9})',
+				trainingRemark: 'Set speed limit on the section (speed limit value: 5)',
 				trainingType: '04',
 				productTypes: ['01,02'],
 				stepVOList: [
-					{ deviceType: '03', orderNum: 1, operateCode: '407', tip: 'Right mouse button menu selection [section to set speed limit]' },
-					{ deviceType: '03', orderNum: 2, operateCode: '4076', tip: 'Select [speed limit value 5] with the left mouse button', val: '5' },
-					{ deviceType: '03', orderNum: 3, operateCode: '4071', tip: 'Click the [down] button with the left mouse button' },
-					{ deviceType: '03', orderNum: 4, operateCode: '4072', tip: 'Click the [ok] button with the left mouse button' },
-					{ deviceType: '03', orderNum: 5, operateCode: '4073', tip: 'Click the [confirm 1] button with the left mouse button' },
-					{ deviceType: '03', orderNum: 6, operateCode: '4074', tip: 'Click the [confirm 2] button with the left mouse button', val: '5' },
-					{ deviceType: '03', orderNum: 7, operateCode: '001', tip: 'Click the [close] button with the left mouse button' }
+					{ deviceType: '03', orderNum: 1, operateCode: '407', tip: 'Right click to select [Set speed limit on the section]' },
+					{ deviceType: '03', orderNum: 2, operateCode: '4076', tip: 'Left click to select  [speed limit  5] ', val: '5' },
+					{ deviceType: '03', orderNum: 3, operateCode: '4071', tip: 'Left click  [Execute]' },
+					{ deviceType: '03', orderNum: 4, operateCode: '4072', tip: 'Left click [ok]' },
+					{ deviceType: '03', orderNum: 5, operateCode: '4073', tip: 'Left click [ok1]' },
+					{ deviceType: '03', orderNum: 6, operateCode: '4074', tip: 'Left click [ok2]', val: '5' },
+					{ deviceType: '03', orderNum: 7, operateCode: '001', tip: 'Left click [close]' }
 				]
 			},
 			{
@@ -2147,17 +2367,17 @@ export const OperationList = {
 				minDuration: 8,
 				operateType: '0408',
 				skinCode: '05',
-				trainingName: 'Section cancels speed limit({8}{9})',
-				trainingRemark: 'Section cancels speed limit',
+				trainingName: 'Cancel speed limit on the section({8}{9})',
+				trainingRemark: 'Cancel speed limit on the section',
 				trainingType: '04',
 				productTypes: ['01,02'],
 				stepVOList: [
-					{ deviceType: '03', orderNum: 1, operateCode: '408', tip: 'Right mouse button menu select [section cancel speed limit]' },
-					{ deviceType: '03', orderNum: 2, operateCode: '4081', tip: 'Click the [down] button with the left mouse button' },
-					{ deviceType: '03', orderNum: 3, operateCode: '4082', tip: 'Click the [ok] button with the left mouse button' },
-					{ deviceType: '03', orderNum: 4, operateCode: '4083', tip: 'Click the [confirm 1] button with the left mouse button' },
-					{ deviceType: '03', orderNum: 5, operateCode: '4084', tip: 'Click the [confirm 2] button with the left mouse button', val: '5' },
-					{ deviceType: '03', orderNum: 6, operateCode: '001', tip: 'Click the [close] button with the left mouse button' }
+					{ deviceType: '03', orderNum: 1, operateCode: '408', tip: 'Right click to select [Cancel speed limit on the section]' },
+					{ deviceType: '03', orderNum: 2, operateCode: '4081', tip: 'Left click  [Execute]' },
+					{ deviceType: '03', orderNum: 3, operateCode: '4082', tip: 'Left click [ok] ' },
+					{ deviceType: '03', orderNum: 4, operateCode: '4083', tip: 'Left click [ok1]' },
+					{ deviceType: '03', orderNum: 5, operateCode: '4084', tip: 'Left click [ok2]', val: '5' },
+					{ deviceType: '03', orderNum: 6, operateCode: '001', tip: 'Left click [close]' }
 				]
 			},
 
@@ -2166,13 +2386,13 @@ export const OperationList = {
 				minDuration: 8,
 				operateType: '0301',
 				skinCode: '05',
-				trainingName: 'Switch monolock({7})',
-				trainingRemark: 'Switch single lock function',
+				trainingName: 'Turnout single lock({7})',
+				trainingRemark: 'Turnout single lock function',
 				trainingType: '03',
 				productTypes: ['01,02'],
 				stepVOList: [
-					{ deviceType: '02', orderNum: 1, operateCode: '103', tip: 'Right mouse button menu select 【 switch single lock 】' },
-					{ deviceType: '02', orderNum: 2, operateCode: '103', tip: 'Click the [ok] button with the left mouse button' }
+					{ deviceType: '02', orderNum: 1, operateCode: '103', tip: 'Right click to select [Turnout single lock]' },
+					{ deviceType: '02', orderNum: 2, operateCode: '103', tip: 'Left click  [ok] ' }
 				]
 			},
 			{
@@ -2180,16 +2400,16 @@ export const OperationList = {
 				minDuration: 8,
 				operateType: '0302',
 				skinCode: '05',
-				trainingName: 'Switch single solution({7})',
-				trainingRemark: 'Switch single solution function',
+				trainingName: 'Turnout single release({7})',
+				trainingRemark: 'Turnout single release function',
 				trainingType: '03',
 				productTypes: ['01,02'],
 				stepVOList: [
-					{ deviceType: '02', orderNum: 1, operateCode: '104', tip: 'Right mouse button menu selection 【 switch single solution 】' },
-					{ deviceType: '02', orderNum: 2, operateCode: '1041', tip: 'Click the [down] button with the left mouse button' },
-					{ deviceType: '02', orderNum: 3, operateCode: '1043', tip: 'Click the [confirm 1] button with the left mouse button' },
-					{ deviceType: '02', orderNum: 4, operateCode: '1044', tip: 'Click the [confirm 2] button with the left mouse button' },
-					{ deviceType: '02', orderNum: 5, operateCode: '001', tip: 'Click the [close] button with the left mouse button' }
+					{ deviceType: '02', orderNum: 1, operateCode: '104', tip: 'Right click to select [Turnout single release]' },
+					{ deviceType: '02', orderNum: 2, operateCode: '1041', tip: 'Left click  [Execute]' },
+					{ deviceType: '02', orderNum: 3, operateCode: '1043', tip: 'Left click [ok1] ' },
+					{ deviceType: '02', orderNum: 4, operateCode: '1044', tip: 'Left click [ok2] ' },
+					{ deviceType: '02', orderNum: 5, operateCode: '001', tip: 'Left click [close] '}
 				]
 			},
 			{
@@ -2197,13 +2417,13 @@ export const OperationList = {
 				minDuration: 8,
 				operateType: '0303',
 				skinCode: '05',
-				trainingName: 'The turnout section is closed({7})',
-				trainingRemark: 'Switch section closure function',
+				trainingName: 'Turnout section closure({7})',
+				trainingRemark: 'Turnout section closure ',
 				trainingType: '03',
 				productTypes: ['01,02'],
 				stepVOList: [
-					{ deviceType: '02', orderNum: 1, operateCode: '105', tip: 'Right mouse button menu selection [switch section closed]' },
-					{ deviceType: '02', orderNum: 2, operateCode: '105', tip: 'Click the [ok] button with the left mouse button' }
+					{ deviceType: '02', orderNum: 1, operateCode: '105', tip: 'Right click to select  [Turnout section closure]' },
+					{ deviceType: '02', orderNum: 2, operateCode: '105', tip: 'Left click [ok] ' }
 				]
 			},
 			{
@@ -2211,16 +2431,16 @@ export const OperationList = {
 				minDuration: 8,
 				operateType: '0304',
 				skinCode: '05',
-				trainingName: 'Switch section unsealed({7})',
-				trainingRemark: 'Switch section unsealing function',
+				trainingName: 'Turnout section unsealing({7})',
+				trainingRemark: 'Turnout section unsealing function',
 				trainingType: '03',
 				productTypes: ['01,02'],
 				stepVOList: [
-					{ deviceType: '02', orderNum: 1, operateCode: '106', tip: 'Right mouse button menu select 【 switch section unseal 】' },
-					{ deviceType: '02', orderNum: 2, operateCode: '1061', tip: 'Click the [down] button with the left mouse button' },
-					{ deviceType: '02', orderNum: 3, operateCode: '1063', tip: 'Click the [confirm 1] button with the left mouse button' },
-					{ deviceType: '02', orderNum: 4, operateCode: '1064', tip: 'Click the [confirm 2] button with the left mouse button' },
-					{ deviceType: '02', orderNum: 5, operateCode: '001', tip: 'Click the [close] button with the left mouse button' }
+					{ deviceType: '02', orderNum: 1, operateCode: '106', tip: 'Right click to select [Turnout section unsealing]' },
+					{ deviceType: '02', orderNum: 2, operateCode: '1061', tip: 'Left click  [Execute]' },
+					{ deviceType: '02', orderNum: 3, operateCode: '1063', tip: 'Left click [ok1]' },
+					{ deviceType: '02', orderNum: 4, operateCode: '1064', tip: 'Left click [ok2]' },
+					{ deviceType: '02', orderNum: 5, operateCode: '001', tip: 'Left click [close]' }
 				]
 			},
 			{
@@ -2228,13 +2448,13 @@ export const OperationList = {
 				minDuration: 8,
 				operateType: '0305',
 				skinCode: '05',
-				trainingName: 'Switch the rotation({7})',
-				trainingRemark: 'Switch rotation function({15}turn{16})',
+				trainingName: 'Switch rotation({7})',
+				trainingRemark: 'Switch rotation({15}turn{16})',
 				trainingType: '03',
 				productTypes: ['01,02'],
 				stepVOList: [
-					{ deviceType: '02', orderNum: 1, operateCode: '107', tip: 'Right mouse button menu selection [switch rotation]' },
-					{ deviceType: '02', orderNum: 2, operateCode: '107', tip: 'Click the [ok] button with the left mouse button' }
+					{ deviceType: '02', orderNum: 1, operateCode: '107', tip: 'Right click to select  [Switch rotation]' },
+					{ deviceType: '02', orderNum: 2, operateCode: '107', tip: 'Left click  [ok] ' }
 				]
 			},
 			{
@@ -2242,16 +2462,16 @@ export const OperationList = {
 				minDuration: 10,
 				operateType: '0306',
 				skinCode: '05',
-				trainingName: 'Fault unlocking of switch section({7})',
+				trainingName: 'Switch section fault unlocking({7})',
 				trainingRemark: 'Switch section fault unlocking function',
 				trainingType: '03',
 				productTypes: ['01,02'],
 				stepVOList: [
-					{ deviceType: '02', orderNum: 1, operateCode: '109', tip: 'Right mouse button menu to select "switch section fault unlock"' },
-					{ deviceType: '02', orderNum: 2, operateCode: '1091', tip: 'Click the [down] button with the left mouse button' },
-					{ deviceType: '02', orderNum: 3, operateCode: '1093', tip: 'Click the [confirm 1] button with the left mouse button' },
-					{ deviceType: '02', orderNum: 4, operateCode: '1094', tip: 'Click the [confirm 2] button with the left mouse button' },
-					{ deviceType: '02', orderNum: 5, operateCode: '001', tip: 'Click the [close] button with the left mouse button' }
+					{ deviceType: '02', orderNum: 1, operateCode: '109', tip: 'Right click to select [switch section fault unlocking]' },
+					{ deviceType: '02', orderNum: 2, operateCode: '1091', tip: 'Left click  [Execute]' },
+					{ deviceType: '02', orderNum: 3, operateCode: '1093', tip: 'Left click [ok1]' },
+					{ deviceType: '02', orderNum: 4, operateCode: '1094', tip: 'Left click [ok2]' },
+					{ deviceType: '02', orderNum: 5, operateCode: '001', tip: 'Left click [close]' }
 				]
 			},
 			{
@@ -2259,16 +2479,16 @@ export const OperationList = {
 				minDuration: 8,
 				operateType: '0307',
 				skinCode: '05',
-				trainingName: 'The turnout section is pre-reset by axle counting({7})',
-				trainingRemark: 'Switch section axis pre-reset function',
+				trainingName: 'Turnout section axile pre reset({7})',
+				trainingRemark: 'Turnout section axile pre reset function',
 				trainingType: '03',
 				productTypes: ['01'],
 				stepVOList: [
-					{ deviceType: '02', orderNum: 1, operateCode: '110', tip: 'Select from the right mouse button menu [switch section axis count pre-reset]' },
-					{ deviceType: '02', orderNum: 2, operateCode: '1101', tip: 'Click the [down] button with the left mouse button' },
-					{ deviceType: '02', orderNum: 3, operateCode: '1103', tip: 'Click the [confirm 1] button with the left mouse button' },
-					{ deviceType: '02', orderNum: 4, operateCode: '1104', tip: 'Click the [confirm 2] button with the left mouse button' },
-					{ deviceType: '02', orderNum: 5, operateCode: '001', tip: 'Click the [close] button with the left mouse button' }
+					{ deviceType: '02', orderNum: 1, operateCode: '110', tip: 'Right click to select [Turnout section axile pre reset]' },
+					{ deviceType: '02', orderNum: 2, operateCode: '1101', tip: 'Left click  [Execute]' },
+					{ deviceType: '02', orderNum: 3, operateCode: '1103', tip: 'Left click [ok1]' },
+					{ deviceType: '02', orderNum: 4, operateCode: '1104', tip: 'Left click [ok2]' },
+					{ deviceType: '02', orderNum: 5, operateCode: '001', tip: 'Left click [close]' }
 				]
 			},
 			{
@@ -2276,13 +2496,13 @@ export const OperationList = {
 				minDuration: 8,
 				operateType: '0308',
 				skinCode: '05',
-				trainingName: 'Segment resection({7})',
-				trainingRemark: 'Segment resection',
+				trainingName: 'Section resection({7})',
+				trainingRemark: 'Section resection',
 				trainingType: '03',
 				productTypes: ['01,02'],
 				stepVOList: [
-					{ deviceType: '02', orderNum: 1, operateCode: '111', tip: 'Right mouse button menu select [segment cut]' },
-					{ deviceType: '02', orderNum: 2, operateCode: '111', tip: 'Click the [ok] button with the left mouse button' }
+					{ deviceType: '02', orderNum: 1, operateCode: '111', tip: 'Right click to select [Section resection]' },
+					{ deviceType: '02', orderNum: 2, operateCode: '111', tip: 'Left click [ok]' }
 				]
 			},
 			{
@@ -2290,13 +2510,13 @@ export const OperationList = {
 				minDuration: 8,
 				operateType: '0309',
 				skinCode: '05',
-				trainingName: 'Section to activate({7})',
+				trainingName: 'Section activation({7})',
 				trainingRemark: 'Section activation function',
 				trainingType: '03',
 				productTypes: ['01,02'],
 				stepVOList: [
-					{ deviceType: '02', orderNum: 1, operateCode: '112', tip: 'Right mouse button menu selection [section activation]' },
-					{ deviceType: '02', orderNum: 2, operateCode: '112', tip: 'Click the [ok] button with the left mouse button' }
+					{ deviceType: '02', orderNum: 1, operateCode: '112', tip: 'Right click to select  [Section activation]' },
+					{ deviceType: '02', orderNum: 2, operateCode: '112', tip: 'Left click [ok] ' }
 				]
 			},
 			{
@@ -2304,18 +2524,18 @@ export const OperationList = {
 				minDuration: 8,
 				operateType: '0310',
 				skinCode: '05',
-				trainingName: 'Speed limit is set at switch section({7})',
-				trainingRemark: 'Switch section setting speed limit function (speed limit value: 5)',
+				trainingName: 'Set speed limit on the section({7})',
+				trainingRemark: 'Set speed limit on the section (speed limit value: 5)',
 				trainingType: '03',
 				productTypes: ['01,02'],
 				stepVOList: [
-					{ deviceType: '02', orderNum: 1, operateCode: '113', tip: 'Right mouse button menu selection 【 turnout section setting speed limit 】' },
-					{ deviceType: '02', orderNum: 2, operateCode: '1136', tip: 'Select [speed limit value 5] with the left mouse button', val: '5' },
-					{ deviceType: '02', orderNum: 3, operateCode: '1131', tip: 'Click the [down] button with the left mouse button' },
-					{ deviceType: '02', orderNum: 4, operateCode: '1132', tip: 'Click the [ok] button with the left mouse button' },
-					{ deviceType: '02', orderNum: 5, operateCode: '1133', tip: 'Click the [confirm 1] button with the left mouse button' },
-					{ deviceType: '02', orderNum: 6, operateCode: '1134', tip: 'Click the [confirm 2] button with the left mouse button', val: '5' },
-					{ deviceType: '02', orderNum: 7, operateCode: '001', tip: 'Click the [close] button with the left mouse button' }
+					{ deviceType: '02', orderNum: 1, operateCode: '113', tip: 'Right click to select [Set speed limit on the section]' },
+					{ deviceType: '02', orderNum: 2, operateCode: '1136', tip: 'Left click to select  [speed limit  5] ', val: '5' },
+					{ deviceType: '02', orderNum: 3, operateCode: '1131', tip: 'Left click  [Execute]' },
+					{ deviceType: '02', orderNum: 4, operateCode: '1132', tip: 'Left click [ok]' },
+					{ deviceType: '02', orderNum: 5, operateCode: '1133', tip: 'Left click [ok1]' },
+					{ deviceType: '02', orderNum: 6, operateCode: '1134', tip: 'Left click [ok2]', val: '5' },
+					{ deviceType: '02', orderNum: 7, operateCode: '001', tip: 'Left click [close]' }
 				]
 			},
 			{
@@ -2323,17 +2543,17 @@ export const OperationList = {
 				minDuration: 8,
 				operateType: '0311',
 				skinCode: '05',
-				trainingName: 'Remove speed limit in switch section({7})',
-				trainingRemark: 'Switch section cancel speed limit function',
+				trainingName: 'Cancel speed limit on the section({7})',
+				trainingRemark: 'Cancel speed limit on the section',
 				trainingType: '03',
 				productTypes: ['01,02'],
 				stepVOList: [
-					{ deviceType: '02', orderNum: 1, operateCode: '114', tip: 'Right mouse button menu select 【 switch section cancel speed limit 】' },
-					{ deviceType: '02', orderNum: 2, operateCode: '1141', tip: 'Click the [down] button with the left mouse button' },
-					{ deviceType: '02', orderNum: 3, operateCode: '1142', tip: 'Click the [ok] button with the left mouse button' },
-					{ deviceType: '02', orderNum: 4, operateCode: '1143', tip: 'Click the [confirm 1] button with the left mouse button' },
-					{ deviceType: '02', orderNum: 5, operateCode: '1144', tip: 'Click the [confirm 2] button with the left mouse button', val: '5' },
-					{ deviceType: '02', orderNum: 6, operateCode: '001', tip: 'Click the [close] button with the left mouse button' }
+					{ deviceType: '02', orderNum: 1, operateCode: '114', tip: 'Right click to select [Cancel speed limit on the section]' },
+					{ deviceType: '02', orderNum: 2, operateCode: '1141', tip: 'Left click  [Execute]' },
+					{ deviceType: '02', orderNum: 3, operateCode: '1142', tip: 'Left click [ok] ' },
+					{ deviceType: '02', orderNum: 4, operateCode: '1143', tip: 'Left click [ok1]' },
+					{ deviceType: '02', orderNum: 5, operateCode: '1144', tip: 'Left click [ok2]', val: '5' },
+					{ deviceType: '02', orderNum: 6, operateCode: '001', tip: 'Left click [close]' }
 				]
 			},
 
@@ -2342,15 +2562,15 @@ export const OperationList = {
 				minDuration: 8,
 				operateType: '0201',
 				skinCode: '05',
-				trainingName: 'Route selected row({3})',
-				trainingRemark: 'Select alignment approach',
+				trainingName: 'Route selection({3})',
+				trainingRemark: 'Route selection',
 				trainingType: '02',
 				productTypes: ['01,02'],
 				stepVOList: [
-					{ deviceType: '04', orderNum: 1, operateCode: '301', tip: 'Right mouse button menu selection [enter road select row]' },
-					{ deviceType: '04', orderNum: 2, operateCode: '3011', tip: 'The left mouse button selects the path name【{3}】', val: '{4}' },
-					{ deviceType: '04', orderNum: 3, operateCode: '301', tip: 'Click the [ok] button with the left mouse button' },
-					{ deviceType: '04', orderNum: 4, operateCode: '3012', tip: 'Click the [ok] button with the left mouse button' }
+					{ deviceType: '04', orderNum: 1, operateCode: '301', tip: 'Right click to select [Route selection]' },
+					{ deviceType: '04', orderNum: 2, operateCode: '3011', tip: 'Left click to select the route name【{3}】', val: '{4}' },
+					{ deviceType: '04', orderNum: 3, operateCode: '301', tip: 'Left click  [ok] ' },
+					{ deviceType: '04', orderNum: 4, operateCode: '3012', tip: 'Left click [ok] ' }
 				]
 			},
 			{
@@ -2358,14 +2578,14 @@ export const OperationList = {
 				minDuration: 8,
 				operateType: '0202',
 				skinCode: '05',
-				trainingName: 'Approach to cancel({3})',
-				trainingRemark: 'Approach to cancel',
+				trainingName: 'Cancel the route({3})',
+				trainingRemark: 'Cancel the route',
 				trainingType: '02',
 				productTypes: ['02'],
 				stepVOList: [
-					{ deviceType: '04', orderNum: 1, operateCode: '303', tip: 'Right mouse button menu select [enter path cancel]' },
-					{ deviceType: '04', orderNum: 2, operateCode: '303', tip: 'Click the [ok] button with the left mouse button' },
-					{ deviceType: '04', orderNum: 3, operateCode: '3031', tip: 'Click the [ok] button with the left mouse button' }
+					{ deviceType: '04', orderNum: 1, operateCode: '303', tip: 'Right click to select [Cancel the route]' },
+					{ deviceType: '04', orderNum: 2, operateCode: '303', tip: 'Left click  [ok] ' },
+					{ deviceType: '04', orderNum: 3, operateCode: '3031', tip: 'Left click  [ok]' }
 				]
 			},
 			{
@@ -2373,13 +2593,13 @@ export const OperationList = {
 				minDuration: 8,
 				operateType: '0202',
 				skinCode: '05',
-				trainingName: 'Approach to cancel({3})',
-				trainingRemark: 'Approach to cancel',
+				trainingName: 'Cancel the route({3})',
+				trainingRemark: 'Cancel the route',
 				trainingType: '02',
 				productTypes: ['01'],
 				stepVOList: [
-					{ deviceType: '04', orderNum: 1, operateCode: '303', tip: 'Right mouse button menu select [enter path cancel]' },
-					{ deviceType: '04', orderNum: 2, operateCode: '303', tip: 'Click the [ok] button with the left mouse button' }
+					{ deviceType: '04', orderNum: 1, operateCode: '303', tip: 'Right click to select [Cancel the route]' },
+					{ deviceType: '04', orderNum: 2, operateCode: '303', tip: 'Left click [ok]' }
 				]
 			},
 			{
@@ -2387,13 +2607,13 @@ export const OperationList = {
 				minDuration: 8,
 				operateType: '0203',
 				skinCode: '05',
-				trainingName: 'Signal is closed({5})',
-				trainingRemark: 'Signal is closed',
+				trainingName: 'Signal closure({5})',
+				trainingRemark: 'Signal closure',
 				trainingType: '02',
 				productTypes: ['01,02'],
 				stepVOList: [
-					{ deviceType: '04', orderNum: 1, operateCode: '306', tip: 'Right mouse button menu select [signal closed]' },
-					{ deviceType: '04', orderNum: 2, operateCode: '306', tip: 'Click the [ok] button with the left mouse button' }
+					{ deviceType: '04', orderNum: 1, operateCode: '306', tip: 'Right click to select [Signal closure]' },
+					{ deviceType: '04', orderNum: 2, operateCode: '306', tip: 'Left click [ok] ' }
 				]
 			},
 			{
@@ -2401,17 +2621,17 @@ export const OperationList = {
 				minDuration: 8,
 				operateType: '0204',
 				skinCode: '05',
-				trainingName: 'Signal to unlock({5})',
-				trainingRemark: 'Signal to unlock',
+				trainingName: 'Signal unsealing({5})',
+				trainingRemark: 'Signal unsealing',
 				trainingType: '02',
 				productTypes: ['01,02'],
 				stepVOList: [
-					{ deviceType: '04', orderNum: 1, operateCode: '307', tip: 'Right mouse button menu selection [signal unsealing]' },
-					{ deviceType: '04', orderNum: 2, operateCode: '3071', tip: 'Click the [down] button with the left mouse button' },
-					{ deviceType: '04', orderNum: 3, operateCode: '3072', tip: 'Click the [ok] button with the left mouse button' },
-					{ deviceType: '04', orderNum: 4, operateCode: '3073', tip: 'Click the [confirm 1] button with the left mouse button' },
-					{ deviceType: '04', orderNum: 5, operateCode: '3074', tip: 'Click the [confirm 2] button with the left mouse button' },
-					{ deviceType: '04', orderNum: 6, operateCode: '001', tip: 'Click the [close] button with the left mouse button' }
+					{ deviceType: '04', orderNum: 1, operateCode: '307', tip: 'Right click to select [Signal unsealing]' },
+					{ deviceType: '04', orderNum: 2, operateCode: '3071', tip: 'Left click  [Execute]' },
+					{ deviceType: '04', orderNum: 3, operateCode: '3072', tip: 'Left click [ok]' },
+					{ deviceType: '04', orderNum: 4, operateCode: '3073', tip: 'Left click [ok1]' },
+					{ deviceType: '04', orderNum: 5, operateCode: '3074', tip: 'Left click [ok2]' },
+					{ deviceType: '04', orderNum: 6, operateCode: '001', tip: 'Left click [close]' }
 				]
 			},
 			{
@@ -2419,14 +2639,14 @@ export const OperationList = {
 				minDuration: 8,
 				operateType: '0205',
 				skinCode: '05',
-				trainingName: 'Signal to turn off the lights({3})',
-				trainingRemark: 'Signal to turn off the lights',
+				trainingName: 'The signal light turns red({3})',
+				trainingRemark: 'The signal light turns red',
 				trainingType: '02',
 				productTypes: ['01,02'],
 				stepVOList: [
-					{ deviceType: '04', orderNum: 1, operateCode: '313', tip: 'Right mouse button menu select [signal off light]' },
-					{ deviceType: '04', orderNum: 2, operateCode: '313', tip: 'Click the [ok] button with the left mouse button' },
-					{ deviceType: '04', orderNum: 3, operateCode: '3131', tip: 'Click the [ok] button with the left mouse button' }
+					{ deviceType: '04', orderNum: 1, operateCode: '313', tip: 'Right click to select [The signal light turns red]' },
+					{ deviceType: '04', orderNum: 2, operateCode: '313', tip: 'Left click [ok]' },
+					{ deviceType: '04', orderNum: 3, operateCode: '3131', tip: 'Left click [ok]' }
 				]
 			},
 			{
@@ -2434,14 +2654,14 @@ export const OperationList = {
 				minDuration: 8,
 				operateType: '0206',
 				skinCode: '05',
-				trainingName: 'Signal to restart({3})',
-				trainingRemark: 'Signal to restart',
+				trainingName: 'Signal reopen({3})',
+				trainingRemark: 'Signal reopen',
 				trainingType: '02',
 				productTypes: ['01,02'],
 				stepVOList: [
-					{ deviceType: '04', orderNum: 1, operateCode: '304', tip: 'Right mouse button menu selection [signal reopen]' },
-					{ deviceType: '04', orderNum: 2, operateCode: '304', tip: 'Click the [ok] button with the left mouse button' },
-					{ deviceType: '04', orderNum: 3, operateCode: '3041', tip: 'Click the [ok] button with the left mouse button' }
+					{ deviceType: '04', orderNum: 1, operateCode: '304', tip: 'Right click to select [Signal reopen]' },
+					{ deviceType: '04', orderNum: 2, operateCode: '304', tip: 'Left click [ok]' },
+					{ deviceType: '04', orderNum: 3, operateCode: '3041', tip: 'Left click [ok]' }
 				]
 			},
 			{
@@ -2449,16 +2669,16 @@ export const OperationList = {
 				minDuration: 8,
 				operateType: '0207',
 				skinCode: '05',
-				trainingName: 'Guide the road handling({3})',
-				trainingRemark: 'Incoming road handling signal guidance',
+				trainingName: 'Guide route handling({3})',
+				trainingRemark: 'Guide route handling',
 				trainingType: '02',
 				productTypes: ['01'],
 				stepVOList: [
-					{ deviceType: '04', orderNum: 1, operateCode: '308', tip: 'Right mouse button menu [Guide the road handling]' },
-					{ deviceType: '04', orderNum: 2, operateCode: '3081', tip: 'Click the [down] button with the left mouse button' },
-					{ deviceType: '04', orderNum: 3, operateCode: '3083', tip: 'Click the [confirm 1] button with the left mouse button' },
-					{ deviceType: '04', orderNum: 4, operateCode: '3084', tip: 'Click the [confirm 2] button with the left mouse button' },
-					{ deviceType: '04', orderNum: 5, operateCode: '001', tip: 'Click the [close] button with the left mouse button' }
+					{ deviceType: '04', orderNum: 1, operateCode: '308', tip: 'Right click to select [Guide route handling]' },
+					{ deviceType: '04', orderNum: 2, operateCode: '3081', tip: 'Left click  [Execute]' },
+					{ deviceType: '04', orderNum: 3, operateCode: '3083', tip: 'Left click [ok1]' },
+					{ deviceType: '04', orderNum: 4, operateCode: '3084', tip: 'Left click [ok2]' },
+					{ deviceType: '04', orderNum: 5, operateCode: '001', tip: 'Left click [close]' }
 				]
 			},
 			{
@@ -2466,14 +2686,14 @@ export const OperationList = {
 				minDuration: 8,
 				operateType: '0208',
 				skinCode: '05',
-				trainingName: 'Since the lined({5})',
-				trainingRemark: 'Automatic alignment access open',
+				trainingName: 'Start automatic routing({5})',
+				trainingRemark: 'Start automatic routing',
 				trainingType: '02',
 				productTypes: ['02'],
 				stepVOList: [
-					{ deviceType: '04', orderNum: 1, operateCode: '315', tip: 'Right mouse button menu [Since the lined]' },
-					{ deviceType: '04', orderNum: 2, operateCode: '3151', tip: 'The left mouse button selects the control state as "artificial" path', val: '{6}' },
-					{ deviceType: '04', orderNum: 3, operateCode: '315', tip: 'Click the [ok] button with the left mouse button' }
+					{ deviceType: '04', orderNum: 1, operateCode: '315', tip: 'Right click to select [Start automatic routing]' },
+					{ deviceType: '04', orderNum: 2, operateCode: '3151', tip: 'Left click to select the route based on the manual control state', val: '{6}' },
+					{ deviceType: '04', orderNum: 3, operateCode: '315', tip: 'Left click [ok] ' }
 				]
 			},
 			{
@@ -2481,14 +2701,14 @@ export const OperationList = {
 				minDuration: 8,
 				operateType: '0209',
 				skinCode: '05',
-				trainingName: 'Since the row off({5})',
-				trainingRemark: 'Automatic alignment approach closed',
+				trainingName: 'Close automatic routing({5})',
+				trainingRemark: 'Close automatic routing',
 				trainingType: '02',
 				productTypes: ['02'],
 				stepVOList: [
-					{ deviceType: '04', orderNum: 1, operateCode: '314', tip: 'Right mouse button menu [Since the row off]' },
-					{ deviceType: '04', orderNum: 2, operateCode: '3141', tip: 'The left mouse button selects the first approach', val: '{6}' },
-					{ deviceType: '04', orderNum: 3, operateCode: '314', tip: 'Click the [ok] button with the left mouse button' }
+					{ deviceType: '04', orderNum: 1, operateCode: '314', tip: 'Right click to select [Close automatic routing]' },
+					{ deviceType: '04', orderNum: 2, operateCode: '3141', tip: 'Left click to select the first route', val: '{6}' },
+					{ deviceType: '04', orderNum: 3, operateCode: '314', tip: 'Left click [ok]' }
 				]
 			},
 			{
@@ -2496,13 +2716,13 @@ export const OperationList = {
 				minDuration: 8,
 				operateType: '0210',
 				skinCode: '05',
-				trainingName: 'Query the incoming control status({5})',
-				trainingRemark: 'Query the incoming control status',
+				trainingName: 'Route control status query({5})',
+				trainingRemark: 'Query the route control status ',
 				trainingType: '02',
 				productTypes: ['02'],
 				stepVOList: [
-					{ deviceType: '04', orderNum: 1, operateCode: '316', tip: 'Right mouse button menu [Query the incoming control status]' },
-					{ deviceType: '04', orderNum: 2, operateCode: '316', tip: 'Click the [ok] button with the left mouse button' }
+					{ deviceType: '04', orderNum: 1, operateCode: '316', tip: 'Right click to select [Route control status query]' },
+					{ deviceType: '04', orderNum: 2, operateCode: '316', tip: 'Left click [ok] ' }
 				]
 			},
 			{
@@ -2510,13 +2730,13 @@ export const OperationList = {
 				minDuration: 8,
 				operateType: '0211',
 				skinCode: '05',
-				trainingName: 'Set interlock automatic access({5})',
-				trainingRemark: 'Set interlock automatic access',
+				trainingName: 'Set interlock automatic route({5})',
+				trainingRemark: 'Set interlock automatic route',
 				trainingType: '02',
 				productTypes: ['01'],
 				stepVOList: [
-					{ deviceType: '04', orderNum: 1, operateCode: '309', tip: 'Select from the right mouse button menu [set the automatic interlocking approach]' },
-					{ deviceType: '04', orderNum: 2, operateCode: '309', tip: 'Click the [ok] button with the left mouse button' }
+					{ deviceType: '04', orderNum: 1, operateCode: '309', tip: 'Right click to select  [Set interlock automatic route]' },
+					{ deviceType: '04', orderNum: 2, operateCode: '309', tip: 'Left click [ok]' }
 				]
 			},
 			{
@@ -2524,13 +2744,13 @@ export const OperationList = {
 				minDuration: 8,
 				operateType: '0212',
 				skinCode: '05',
-				trainingName: 'Cancel the interlock automatic access({5})',
-				trainingRemark: 'Cancel the interlock automatic access',
+				trainingName: 'Cancel interlock automatic route({5})',
+				trainingRemark: 'Cancel interlock automatic route',
 				trainingType: '02',
 				productTypes: ['01'],
 				stepVOList: [
-					{ deviceType: '04', orderNum: 1, operateCode: '310', tip: 'Select from the right mouse button menu [cancel interlocking automatic access]' },
-					{ deviceType: '04', orderNum: 2, operateCode: '310', tip: 'Click the [ok] button with the left mouse button' }
+					{ deviceType: '04', orderNum: 1, operateCode: '310', tip: 'Right click to select  [Cancel interlock automatic route]' },
+					{ deviceType: '04', orderNum: 2, operateCode: '310', tip: 'Left click [ok]' }
 				]
 			},
 			{
@@ -2538,13 +2758,13 @@ export const OperationList = {
 				minDuration: 8,
 				operateType: '0213',
 				skinCode: '05',
-				trainingName: 'Set the interlock to trigger automatically({5})',
-				trainingRemark: 'Set the interlock to trigger automatically',
+				trainingName: 'Set interlock to trigger automatically({5})',
+				trainingRemark: 'Set interlock to trigger automatically',
 				trainingType: '02',
 				productTypes: ['01'],
 				stepVOList: [
-					{ deviceType: '04', orderNum: 1, operateCode: '311', tip: 'Select from the menu of right mouse button [set automatic interlocking trigger]' },
-					{ deviceType: '04', orderNum: 2, operateCode: '311', tip: 'Click the [ok] button with the left mouse button' }
+					{ deviceType: '04', orderNum: 1, operateCode: '311', tip: 'Right click to select [Set interlock to trigger automatically]' },
+					{ deviceType: '04', orderNum: 2, operateCode: '311', tip: 'Left click [ok]' }
 				]
 			},
 			{
@@ -2552,13 +2772,13 @@ export const OperationList = {
 				minDuration: 8,
 				operateType: '0214',
 				skinCode: '05',
-				trainingName: 'Cancel interlock automatic trigger({5})',
-				trainingRemark: 'Cancel interlock automatic trigger',
+				trainingName: "Cancel interlock's automatica triggering({5})",
+				trainingRemark: "Cancel interlock's automatica triggering",
 				trainingType: '02',
 				productTypes: ['01'],
 				stepVOList: [
-					{ deviceType: '04', orderNum: 1, operateCode: '312', tip: 'Select from the right mouse button menu [cancel interlock automatic trigger]' },
-					{ deviceType: '04', orderNum: 2, operateCode: '312', tip: 'Click the [ok] button with the left mouse button' }
+					{ deviceType: '04', orderNum: 1, operateCode: '312', tip: "Right click to select[Cancel interlock's automatica triggering]" },
+					{ deviceType: '04', orderNum: 2, operateCode: '312', tip: 'Left click [ok]' }
 				]
 			}
 		]
diff --git a/src/scripts/plugin/converter/SectionOperationConverter.js b/src/scripts/plugin/converter/SectionOperationConverter.js
index afe0f63ba..7c1f8bcbd 100644
--- a/src/scripts/plugin/converter/SectionOperationConverter.js
+++ b/src/scripts/plugin/converter/SectionOperationConverter.js
@@ -407,7 +407,7 @@ function handleButtonFault(operates) {
 			return {
 				type: operate.type,
 				code: operate.code,
-				over: true,
+				// over: true,
 				operation: SectionOperation.fault.event
 			};
 		}
diff --git a/src/scripts/plugin/converter/SignalRouteOperationConverter.js b/src/scripts/plugin/converter/SignalRouteOperationConverter.js
index 4c29b472a..33e85c4e9 100644
--- a/src/scripts/plugin/converter/SignalRouteOperationConverter.js
+++ b/src/scripts/plugin/converter/SignalRouteOperationConverter.js
@@ -105,22 +105,19 @@ export default {
 function handleButtonArrangementRoute(operates) {
 	if (operates.length === 2) {
 		const operate = operates[1];
-		if (operate.type === SignalType && operate.code &&
-            operate.model && operate.model._viewVal) {
+		if (operate.type == SignalType && operate.code) {
 			return {
 				type: operate.type,
 				code: operate.code,
-				operation: SignalOperation.arrangementRoute.event.query,
-				val: operate.model._viewVal
+				operation: SignalOperation.arrangementRoute.event.query
+				// val: operate.model._viewVal
 			};
 		}
 		return { error: true };
 	} else if (operates.length >= 3) {
-		const operateBeg = operates[1];
-		const operateEnd = operates[operates.length - 1];
-		if (operateEnd.type === SignalType && operateEnd.code &&
-            operateEnd.model && operateBeg.val === operateEnd.model._viewVal &&
-            operateEnd.tempData && operateEnd.tempData.length) {
+		const operateBeg = operates[1]; // 起始信号灯
+		const operateEnd = operates[operates.length - 1]; // 终端信号灯
+		if (operateEnd.type == SignalType && operateEnd.code && operateEnd.tempData && operateEnd.tempData.length) {
 			for (let i = 0; i < operateEnd.tempData.length; i++) {
 				const elem = operateEnd.tempData[i];
 				if (elem.startSignalCode === operateBeg.code && elem.endSignalCode == operateEnd.code) {
@@ -128,8 +125,8 @@ function handleButtonArrangementRoute(operates) {
 						type: operateEnd.type,
 						code: operateEnd.code,
 						over: true,
-						operation: SignalOperation.arrangementRoute.event.confirm,
-						val: elem.code
+						operation: SignalOperation.arrangementRoute.event.confirm
+						// val: elem.code
 					};
 				}
 			}
@@ -139,6 +136,38 @@ function handleButtonArrangementRoute(operates) {
 	return null;
 }
 
+/**
+ * 处理右键菜单 排列进路 操作
+ * @param {*} operates
+ */
+function handleMenuArrangementRoute(operates) {
+	if (operates.length == 1) {
+		const operate = operates[0];
+		if (operate.type === SignalType && operate.code) {
+			return {
+				type: operate.type,
+				code: operate.code,
+				operation: SignalOperation.arrangementRoute.event.query
+			};
+		}
+		return { error: true };
+	} else if (operates.length >= 3) {
+		const operate = operates[operates.length - 1];
+		if (operate.type === SignalType && operates[0].code && (operates[operates.length - 2].val || operates[operates.length - 3].val)) {
+			return {
+				over: true,
+				type: operate.type,
+				code: operates[0].code,
+				operation: SignalOperation.arrangementRoute.event.confirm,
+				val: operates[operates.length - 2].val || operates[operates.length - 3].val
+			};
+		}
+		return { error: true };
+	}
+
+	return null;
+}
+
 /**
  * 处理点击按钮 取消进路 操作
  * @param {*} operates
@@ -184,6 +213,7 @@ function handleButtonReopenSignal(operates) {
  * @param {*} operates
  */
 function handleButtonHumanTrainRoute(operates) {
+	debugger;
 	if (operates.length >= 2) {
 		const operate = operates[operates.length - 1];
 		if (operate.type === SignalType && operate.code) {
@@ -245,38 +275,6 @@ function handleMenuStoppage(operates) {
 	return null;
 }
 
-/**
- * 处理右键菜单 排列进路 操作
- * @param {*} operates
- */
-function handleMenuArrangementRoute(operates) {
-	if (operates.length == 1) {
-		const operate = operates[0];
-		if (operate.type === SignalType && operate.code) {
-			return {
-				type: operate.type,
-				code: operate.code,
-				operation: SignalOperation.arrangementRoute.event.query
-			};
-		}
-		return { error: true };
-	} else if (operates.length >= 3) {
-		const operate = operates[operates.length - 1];
-		if (operate.type === SignalType && operates[0].code && (operates[operates.length - 2].val || operates[operates.length - 3].val)) {
-			return {
-				over: true,
-				type: operate.type,
-				code: operates[0].code,
-				operation: SignalOperation.arrangementRoute.event.confirm,
-				val: operates[operates.length - 2].val || operates[operates.length - 3].val
-			};
-		}
-		return { error: true };
-	}
-
-	return null;
-}
-
 /**
  * 处理右键菜单 取消进路 操作
  * @param {*} operates
@@ -661,17 +659,33 @@ function handleButtonSetAutoInterlock(operates) {
  * @param {*} operates
  */
 function handleButtonGuideRoute(operates) {
-	if (operates.length >= 2) {
+	if (operates.length == 2) {
 		const operate = operates[operates.length - 1];
 		if (operate.type === SignalType && operate.code) {
 			return {
 				type: operate.type,
 				code: operate.code,
-				over: true,
 				operation: SignalOperation.guide.event.confirm
 			};
 		}
 		return { error: true };
+	} else if (operates.length >= 3) {
+		const operateBeg = operates[1];
+		const operateEnd = operates[operates.length - 1];
+		if (operateEnd.type === SignalType && operateEnd.code && operateEnd.tempData && operateEnd.tempData.length) {
+			for (let i = 0; i < operateEnd.tempData.length; i++) {
+				const elem = operateEnd.tempData[i];
+				if (elem.startSignalCode === operateBeg.code && elem.endSignalCode == operateEnd.code) {
+					return {
+						type: operateEnd.type,
+						code: operateEnd.code,
+						over: true,
+						operation: SignalOperation.guide.event.confirm
+					};
+				}
+			}
+		}
+		return { error: true };
 	}
 	return null;
 }
diff --git a/src/scripts/plugin/converter/TrainOperationConverter.js b/src/scripts/plugin/converter/TrainOperationConverter.js
index 64dceefa8..f16069f7a 100644
--- a/src/scripts/plugin/converter/TrainOperationConverter.js
+++ b/src/scripts/plugin/converter/TrainOperationConverter.js
@@ -5,214 +5,224 @@ const TrainOperation = OperationEvent.Train;
 const TrainType = MapDeviceType.Train.type;
 
 export default {
-    test: function (operates) {
-        let operateType = getOperateTypeBy('Train', operates[0].operation);
-        if (operateType) {
-            return true;
-        } else {
-            return false;
-        }
-    },
-    convert: function (operates) {
-        if (operates && operates.length) {
-            let operation = operates[0].operation;
-            switch (operation) {
-                case TrainOperation.cancelStoppage.menu.operation: return handleMenuCancelStopPage(operates);
+	test: function (operates) {
+		const operateType = getOperateTypeBy('Train', operates[0].operation);
+		if (operateType) {
+			return true;
+		} else {
+			return false;
+		}
+	},
+	convert: function (operates) {
+		if (operates && operates.length) {
+			const operation = operates[0].operation;
+			switch (operation) {
+			case TrainOperation.cancelStoppage.menu.operation: return handleMenuCancelStopPage(operates);
 
-                case TrainOperation.stoppage.menu.operation: return handleMenuStoppage(operates);
+			case TrainOperation.stoppage.menu.operation: return handleMenuStoppage(operates);
 
-                case TrainOperation.addTrainId.menu.operation: return handleMenuAddTrainId(operates);
+			case TrainOperation.addTrainId.menu.operation: return handleMenuAddTrainId(operates);
 
-                case TrainOperation.editTrainId.menu.operation: return handleMenuEditTrainId(operates);
+			case TrainOperation.editTrainId.menu.operation: return handleMenuEditTrainId(operates);
 
-                case TrainOperation.delTrainId.menu.operation: return handleMenuDelTrainId(operates);
+			case TrainOperation.delTrainId.menu.operation: return handleMenuDelTrainId(operates);
 
-                case TrainOperation.moveTrainId.menu.operation: return handleMenuMoveTrainId(operates);
+			case TrainOperation.moveTrainId.menu.operation: return handleMenuMoveTrainId(operates);
 
-                case TrainOperation.switchTrainId.menu.operation: return handleMenuSwitchTrainId(operates);
+			case TrainOperation.switchTrainId.menu.operation: return handleMenuSwitchTrainId(operates);
 
-                case TrainOperation.editTrainNo.menu.operation: return handleMenuEditTrainNo(operates);
+			case TrainOperation.editTrainNo.menu.operation: return handleMenuEditTrainNo(operates);
 
-                case TrainOperation.limitSpeed.menu.operation: return handleMenuLimitSpeed(operates);
+			case TrainOperation.limitSpeed.menu.operation: return handleMenuLimitSpeed(operates);
 
-                case TrainOperation.setPlanTrainId.menu.operation: return handleMenuSetPlanTrainId(operates);
+			case TrainOperation.setPlanTrainId.menu.operation: return handleMenuSetPlanTrainId(operates);
 
-                case TrainOperation.addPlanTrainId.menu.operation: return handleMenuAddPlanTrainId(operates);
+			case TrainOperation.addPlanTrainId.menu.operation: return handleMenuAddPlanTrainId(operates);
 
-                case TrainOperation.moveEventlyTrainId.menu.operation: return handleMenuMoveEventlyTrainId(operates);
+			case TrainOperation.moveEventlyTrainId.menu.operation: return handleMenuMoveEventlyTrainId(operates);
 
-                case TrainOperation.deletePlanTrainId.menu.operation: return handleMenuDeletePlanTrainId(operates);
+			case TrainOperation.deletePlanTrainId.menu.operation: return handleMenuDeletePlanTrainId(operates);
 
-            }
-        }
-    }
+			}
+		}
+	}
 };
 
 /**
  * 处理右键菜单 取消故障 操作
- * @param {*} operates 
+ * @param {*} operates
  */
 function handleMenuCancelStopPage(operates) {
-    if (operates.length >= 1) {
-        let operate = operates[0];
-        if (operate.type === TrainType && operate.code) {
-            return {
-                type: operate.type,
-                code: operate.code,
-                over: true,
-                operation: TrainOperation.cancelStoppage.event
-            };
-        }
-        return { error: true };
-    }
-    return null;
+	if (operates.length >= 1) {
+		const operate = operates[0];
+		if (operate.type === TrainType && operate.code) {
+			return {
+				type: operate.type,
+				code: operate.code,
+				over: true,
+				operation: TrainOperation.cancelStoppage.event
+			};
+		}
+		return { error: true };
+	}
+	return null;
 }
 
 /**
  * 处理右键菜单 设置故障 操作
- * @param {*} operates 
+ * @param {*} operates
  */
 function handleMenuStoppage(operates) {
-    if (operates.length >= 1) {
-        let operate = operates[0];
-        if (operate.type === TrainType && operate.code) {
-            return {
-                type: operate.type,
-                code: operate.code,
-                over: true,
-                operation: TrainOperation.stoppage.event
-            };
-        }
-        return { error: true };
-    }
-    return null;
+	if (operates.length >= 1) {
+		const operate = operates[0];
+		if (operate.type === TrainType && operate.code) {
+			return {
+				type: operate.type,
+				code: operate.code,
+				over: true,
+				operation: TrainOperation.stoppage.event
+			};
+		}
+		return { error: true };
+	}
+	return null;
 }
 
-
 /**
  * 处理右键菜单 添加列车识别号 操作
- * @param {*} operates 
+ * @param {*} operates
  */
 function handleMenuAddTrainId(operates) {
-    if (operates.length >= 1) {
-        let operate = operates[operates.length - 1];
-        if (operate.type === TrainType && operate.val) {
-            return {
-                type: operate.type,
-                code: operates[0].code,
-                over: true,
-                operation: TrainOperation.addTrainId.event,
-                val: operate.val,
-            };
-        }
-        return { error: true };
-    }
-    return null;
+	if (operates.length >= 1) {
+		const operate = operates[operates.length - 1];
+		if (operate.type === TrainType && operate.val) {
+			return {
+				type: operate.type,
+				code: operates[0].code,
+				over: true,
+				operation: TrainOperation.addTrainId.event,
+				val: operate.val
+			};
+		}
+		return { error: true };
+	}
+	return null;
 }
 
 /**
  * 处理右键菜单 修改列车识别号 操作
- * @param {*} operates 
+ * @param {*} operates
  */
 function handleMenuEditTrainId(operates) {
-    if (operates.length >= 1) {
-        let operate = operates[operates.length - 1];
-        if (operate.type === TrainType && operate.val) {
-            return {
-                type: operate.type,
-                code: operates[0].code,
-                over: true,
-                operation: TrainOperation.editTrainId.event,
-                val: operate.val
-            };
-        }
-        return { error: true };
-    }
-    return null;
+	if (operates.length == 2) {
+		const operate = operates[operates.length - 1];
+		if (operate.type === TrainType && operate.val) {
+			return {
+				type: operate.type,
+				code: operates[0].code,
+				operation: TrainOperation.editTrainId.event.query,
+				val: operate.val
+			};
+		}
+		return { error: true };
+	} else if (operates.length > 2) {
+		const operate = operates[operates.length - 1];
+		if (operate.type === TrainType && operate.val) {
+			return {
+				type: operate.type,
+				code: operates[0].code,
+				over: true,
+				operation: TrainOperation.editTrainId.event.confirm,
+				val: operate.val
+			};
+		}
+		return { error: true };
+	}
+	return null;
 }
 
 /**
  * 处理右键菜单 删除列车识别号 操作
- * @param {*} operates 
+ * @param {*} operates
  */
 function handleMenuDelTrainId(operates) {
-    if (operates.length >= 1) {
-        let operate = operates[operates.length - 1];
-        if (operate.type === TrainType && operate.val) {
-            return {
-                type: operate.type,
-                code: operates[0].code,
-                over: true,
-                operation: TrainOperation.delTrainId.event,
-                val: operate.val
-            };
-        }
-        return { error: true };
-    }
-    return null;
+	if (operates.length >= 1) {
+		const operate = operates[operates.length - 1];
+		if (operate.type === TrainType && operate.val) {
+			return {
+				type: operate.type,
+				code: operates[0].code,
+				over: true,
+				operation: TrainOperation.delTrainId.event,
+				val: operate.val
+			};
+		}
+		return { error: true };
+	}
+	return null;
 }
 
 /**
  * 处理右键菜单 移动列车识别号 操作
- * @param {*} operates 
+ * @param {*} operates
  */
 function handleMenuMoveTrainId(operates) {
-    if (operates.length >= 1) {
-        let operate = operates[operates.length - 1];
-        if (operate.type === TrainType && operate.val) {
-            return {
-                type: operate.type,
-                code: operates[0].code,
-                over: true,
-                operation: TrainOperation.moveTrainId.event,
-                val: operate.val
-            };
-        }
-        return { error: true };
-    }
-    return null;
+	if (operates.length >= 1) {
+		const operate = operates[operates.length - 1];
+		if (operate.type === TrainType && operate.val) {
+			return {
+				type: operate.type,
+				code: operates[0].code,
+				over: true,
+				operation: TrainOperation.moveTrainId.event,
+				val: operate.val
+			};
+		}
+		return { error: true };
+	}
+	return null;
 }
 
 /**
  * 处理右键菜单 交换列车识别号 操作
- * @param {*} operates 
+ * @param {*} operates
  */
 function handleMenuSwitchTrainId(operates) {
-    if (operates.length >= 1) {
-        let operate = operates[operates.length - 1];
-        if (operate.type === TrainType && operate.val) {
-            return {
-                type: operate.type,
-                code: operates[0].code,
-                over: true,
-                operation: TrainOperation.switchTrainId.event,
-                val: operate.val
-            };
-        }
-        return { error: true };
-    }
-    return null;
+	if (operates.length >= 1) {
+		const operate = operates[operates.length - 1];
+		if (operate.type === TrainType && operate.val) {
+			return {
+				type: operate.type,
+				code: operates[0].code,
+				over: true,
+				operation: TrainOperation.switchTrainId.event,
+				val: operate.val
+			};
+		}
+		return { error: true };
+	}
+	return null;
 }
 
 /**
  * 处理右键菜单 修改车组号 操作
- * @param {*} operates 
+ * @param {*} operates
  */
 function handleMenuEditTrainNo(operates) {
-    if (operates.length >= 1) {
-        let operate = operates[operates.length - 1];
-        if (operate.type === TrainType && operate.val) {
-            return {
-                type: operate.type,
-                code: operate[0].code,
-                over: true,
-                operation: TrainOperation.editTrainNo.event,
-                val: operate.val
-            };
-        }
-        return { error: true };
-    }
-    return null;
+	if (operates.length >= 1) {
+		const operate = operates[operates.length - 1];
+		if (operate.type === TrainType && operate.val) {
+			return {
+				type: operate.type,
+				code: operate[0].code,
+				over: true,
+				operation: TrainOperation.editTrainNo.event,
+				val: operate.val
+			};
+		}
+		return { error: true };
+	}
+	return null;
 }
 
 /**
@@ -221,86 +231,85 @@ function handleMenuEditTrainNo(operates) {
  */
 
 function handleMenuLimitSpeed(operates) {
-    if (operates.length > 0) {
-        let operate = operates[0];
-        if (operate.type === TrainType && operate.code) {
-            return {
-                type: operate.type,
-                code: operate.code,
-                over: true,
-                operation: TrainOperation.limitSpeed.event,
-            };
-        }
-        return { error: true };
-    }
-    return null;
+	if (operates.length > 0) {
+		const operate = operates[0];
+		if (operate.type === TrainType && operate.code) {
+			return {
+				type: operate.type,
+				code: operate.code,
+				over: true,
+				operation: TrainOperation.limitSpeed.event
+			};
+		}
+		return { error: true };
+	}
+	return null;
 }
 
-
 /**
  * 处理右键菜单 设置计划车
  * @param {*} operates
  */
 
 function handleMenuSetPlanTrainId(operates) {
-    if (operates.length > 0) {
-        let operate = operates[0];
-        if (operate.type === TrainType && operate.code) {
-            return {
-                type: operate.type,
-                code: operate.code,
-                over: true,
-                operation: TrainOperation.setPlanTrainId.event,
-            };
-        }
-        return { error: true };
-    }
-    return null;
+	if (operates.length > 0) {
+		const operate = operates[0];
+		if (operate.type === TrainType && operate.code) {
+			return {
+				type: operate.type,
+				code: operate.code,
+				over: true,
+				operation: TrainOperation.setPlanTrainId.event
+			};
+		}
+		return { error: true };
+	}
+	return null;
 }
 
 function handleMenuAddPlanTrainId(operates) {
-    if (operates.length > 0) {
-        let operate = operates[0];
-        if (operate.type === TrainType && operate.code) {
-            return {
-                type: operate.type,
-                code: operate.code,
-                over: true,
-                operation: TrainOperation.addPlanTrainId.event,
-            };
-        }
-        return { error: true };
-    }
-    return null;
+	if (operates.length > 0) {
+		const operate = operates[0];
+		if (operate.type === TrainType && operate.code) {
+			return {
+				type: operate.type,
+				code: operate.code,
+				over: true,
+				operation: TrainOperation.addPlanTrainId.event
+			};
+		}
+		return { error: true };
+	}
+	return null;
 }
 
 function handleMenuMoveEventlyTrainId(operates) {
-    if (operates.length > 0) {
-        let operate = operates[0];
-        if (operate.type === TrainType && operate.code) {
-            return {
-                type: operate.type,
-                code: operate.code,
-                over: true,
-                operation: TrainOperation.moveEventlyTrainId.event,
-            };
-        }
-        return { error: true };
-    }
-    return null;
+	if (operates.length > 0) {
+		const operate = operates[0];
+		if (operate.type === TrainType && operate.code) {
+			return {
+				type: operate.type,
+				code: operate.code,
+				over: true,
+				operation: TrainOperation.moveEventlyTrainId.event
+			};
+		}
+		return { error: true };
+	}
+	return null;
 }
 function handleMenuDeletePlanTrainId(operates) {
-    if (operates.length > 0) {
-        let operate = operates[0];
-        if (operate.type === TrainType && operate.code) {
-            return {
-                type: operate.type,
-                code: operate.code,
-                over: true,
-                operation: TrainOperation.deletePlanTrainId.event,
-            };
-        }
-        return { error: true };
-    }
-    return null;
-}
\ No newline at end of file
+	if (operates.length > 0) {
+		const operate = operates[0];
+		if (operate.type === TrainType && operate.code) {
+			return {
+				type: operate.type,
+				code: operate.code,
+				over: true,
+				operation: TrainOperation.deletePlanTrainId.event
+			};
+		}
+		return { error: true };
+	}
+	return null;
+}
diff --git a/src/scripts/plugin/trainingOperateHandler.js b/src/scripts/plugin/trainingOperateHandler.js
index fca6fbdbe..0283e06b5 100644
--- a/src/scripts/plugin/trainingOperateHandler.js
+++ b/src/scripts/plugin/trainingOperateHandler.js
@@ -14,6 +14,10 @@ OperateHandler.prototype = {
 	/** 操作组 */
 	operates: [],
 
+	backStep: function(num) {
+		this.operates = this.operates.slice(0, num);
+	},
+
 	/** 清空操作组 */
 	cleanOperates: function () {
 		this.operates.splice(0, this.operates.length);
@@ -29,7 +33,7 @@ OperateHandler.prototype = {
 		if (order >= steps) {
 			return valid;
 		}
-
+		// debugger;
 		const standard = steps[order];
 		if (operate && standard && operate.code == standard.code && operate.type == standard.type &&
 			operate.operation == standard.operation &&
diff --git a/src/store/modules/permission.js b/src/store/modules/permission.js
index cd75fad78..9dac93ba1 100644
--- a/src/store/modules/permission.js
+++ b/src/store/modules/permission.js
@@ -1,6 +1,7 @@
-import { asyncRouter, constantRoutes, user, userLesson, userExam, userSimulation, userScreen, userPlan, superAdmin, admin } from '@/router';
+import { asyncRouter, constantRoutes, user, userLesson, userExam, userSimulation, userScreen, userPlan, superAdmin, admin, userDesign } from '@/router';
 import { PermissionType } from '@/utils/PermissionType';
 import { UrlConfig } from '@/router/index';
+import { getSessionStorage } from '@/utils/auth';
 
 function setHonePagePath(route, roles) {
 	if (roles && roles.length === 2 && roles.indexOf(user) >= 0 && (route.path === '/' || route.path === 'dashboard')) {
@@ -27,7 +28,38 @@ function hasPermission(roles, route, parentsRoles) {
 	setHonePagePath(route, roles);
 	if (route.meta && route.meta.roles) {
 		// 如果存在本级路由，则使用自己的roles过滤
-		return roles.some(role => route.meta.roles.indexOf(role) >= 0);
+		// debugger;
+		// if (getSessionStorage('design')) {
+		// 	if (route.meta.roles.indexOf(userDesign)===-1) {
+		// 		route.hidden = true;
+		// 	} else {
+		// 		if ((route.meta.roles.indexOf(admin)>=0 && roles.indexOf(admin)>=0)) {
+		// 			route.hidden = false;
+		// 		} else if (route.meta.roles.indexOf(user)>=0 && roles.indexOf(user)>=0) {
+		// 			route.hidden = false;
+		// 		} else {
+		// 			route.hidden = true;
+		// 		}
+		// 	}
+
+		// } else {
+		// 	if (route.meta.roles.indexOf(userDesign)>0) {
+		// 		route.hidden = true;
+		// 	}
+		// }
+		// return roles.some(role => route.meta.roles.indexOf(role) >= 0);
+		if (getSessionStorage('design')) {
+			roles= roles.filter(function (role) {
+				return route.meta.roles.indexOf(role) >= 0;
+			});
+			const result=roles.every(role => route.meta.roles.indexOf(role) >= 0);
+			return result && ((roles.indexOf(admin)>=0 && route.meta.roles.indexOf(admin)>=0) || (roles.indexOf(user)>=0 && route.meta.roles.indexOf(user)>=0 ));
+		} else {
+			roles= roles.filter(function (role) {
+				return route.meta.roles.indexOf(role) >= 0;
+			});
+			return roles.some(role => route.meta.roles.indexOf(role) >= 0) && route.meta.roles.indexOf(userDesign)<0;
+		}
 	} else if (parentsRoles) {
 		// 如果没有本级路由，有父级路由，则使用父级路由过滤
 		return roles.some(role => parentsRoles.indexOf(role) >= 0);
@@ -93,12 +125,15 @@ const permission = {
 			return new Promise(resolve => {
 				const { roles } = convertRouterRoles(data);
 				let accessedRouters;
-				if (roles.indexOf(superAdmin) >= 0) {
-					accessedRouters = asyncRouter;
-				} else {
-					accessedRouters = filterAsyncRouter(asyncRouter, roles);
+				if (roles.indexOf(superAdmin) >= 0 && roles.indexOf(admin) < 0) {
+					roles.push(admin);
 				}
-
+				// if (roles.indexOf(superAdmin) >= 0) {
+				// 	accessedRouters = asyncRouter;
+				// } else {
+				// eslint-disable-next-line prefer-const
+				accessedRouters = filterAsyncRouter(asyncRouter, roles);
+				// }
 				commit('SET_ROUTERS', accessedRouters);
 				resolve();
 			});
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index 3297633a9..dddc1bdf3 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -1,15 +1,17 @@
-import { setSessionStorage } from '@/utils/auth';
+import { setSessionStorage, removeSessionStorage } from '@/utils/auth';
 import { login, logout, getInfo } from '@/api/login';
-import { getToken, setToken, removeToken, removeScreenToken, setScreenToken, getScreenToken, setPlanToken, getPlanToken, removePlanToken, handleToken, handleRemoveToken } from '@/utils/auth';
+import { getToken, setToken, removeToken, removeScreenToken, setScreenToken, getScreenToken, setPlanToken, getDesignToken, setDesignToken, getPlanToken, removeDesignToken, removePlanToken, handleToken, handleRemoveToken } from '@/utils/auth';
 import { getUserConfigInfo } from '@/api/management/user';
 import { LoginParams } from '@/utils/login';
 import { creatSubscribe, perpetualTopic } from '@/utils/stomp';
+import Cookies from 'js-cookie';
 
 const user = {
 	state: {
 		token: getToken(),
 		tokenScreen: getScreenToken(),
 		tokenPlan: getPlanToken(),
+		tokenDesign: getDesignToken(),
 		name: '',
 		nickname: '',
 		nationcode: '',
@@ -17,7 +19,8 @@ const user = {
 		id: '',
 		admin: false,
 		wxId: '',
-		wxUnionId: ''
+		wxUnionId: '',
+		account: ''
 	},
 
 	mutations: {
@@ -27,6 +30,9 @@ const user = {
 		SET_TOKENSCREEN: (state, token) => {
 			state.tokenScreen = token;
 		},
+		SET_TOKENDESIGN: (state, token) => {
+			state.tokenDesign = token;
+		},
 		SET_TOKENPLAN: (state, token) => {
 			state.tokenPlan = token;
 		},
@@ -50,6 +56,9 @@ const user = {
 		},
 		SET_WXUNIONID: (state, wxUnionId) => {
 			state.wxUnionId = wxUnionId;
+		},
+		SET_ACCOUNT: (state, account) => {
+			state.account = account;
 		}
 	},
 
@@ -69,12 +78,22 @@ const user = {
 						const header = { group: '', 'X-Token': getScreenToken() };
 						creatSubscribe(perpetualTopic, header);
 					};
-				} else if (userInfo.type == 'plan') {
-					params = Object.assign({ account: username, password }, LoginParams.LianJiHua);
+				}
+				// else if (userInfo.type == 'plan') {
+				// 	params = Object.assign({ account: username, password }, LoginParams.LianJiHua);
+				// 	execFc = (token) => {
+				// 		setPlanToken(token);
+				// 		commit('SET_TOKENPLAN', token);
+				// 		const header = { group: '', 'X-Token': getPlanToken() };
+				// 		creatSubscribe(perpetualTopic, header);
+				// 	};
+				// }
+				else if (userInfo.type == 'design') {
+					params = Object.assign({ account: username, password }, LoginParams.Design);
 					execFc = (token) => {
-						setPlanToken(token);
-						commit('SET_TOKENPLAN', token);
-						const header = { group: '', 'X-Token': getPlanToken() };
+						setDesignToken(token);
+						commit('SET_TOKENDESIGN', token);
+						const header = { group: '', 'X-Token': getDesignToken() };
 						creatSubscribe(perpetualTopic, header);
 					};
 				} else {
@@ -82,6 +101,7 @@ const user = {
 					execFc = (token) => {
 						setToken(token);
 						commit('SET_TOKEN', token);
+						setSessionStorage('project', userInfo.project||'');
 						const header = { group: '', 'X-Token': getToken() };
 						creatSubscribe(perpetualTopic, header);
 					};
@@ -89,6 +109,12 @@ const user = {
 
 				// 登录系统
 				login(params).then(resp => {
+					if (userInfo.type == 'design') {
+						removeSessionStorage('design');
+						setSessionStorage('design', true);
+					} else {
+						removeSessionStorage('design');
+					}
 					execFc(resp.data);
 					resolve();
 				}).catch(error => { reject(error); });
@@ -151,10 +177,15 @@ const user = {
 				if (clientId == LoginParams.DaPing.clientId) {
 					commit('SET_TOKENSCREEN', '');
 					removeScreenToken();
-				} else if (clientId == LoginParams.LianJiHua.clientId) {
-					commit('SET_TOKENPLAN', '');
-					removePlanToken();
-				} else {
+				} else if (clientId == LoginParams.Design.clientId) {
+					commit('SET_TOKENDESIGN', '');
+					removeDesignToken();
+				}
+				// else if (clientId == LoginParams.LianJiHua.clientId) {
+				// 	commit('SET_TOKENPLAN', '');
+				// 	removePlanToken();
+				// }
+				else {
 					commit('SET_TOKEN', '');
 					removeToken();
 				}
@@ -170,12 +201,21 @@ const user = {
 					commit('SET_TOKEN', '');
 					commit('SET_ROLES', []);
 					commit('SET_ID', '');
+					removeSessionStorage('design');
+					Cookies.remove('UserDesignName');
+					Cookies.remove('UserDesignToken');
+					Cookies.remove('UserName');
+					Cookies.remove('UserToken');
 					handleRemoveToken();
 					resolve();
 				}).catch(error => {
 					reject(error);
 				});
 			});
+		},
+
+		SetAccount({ commit }, account) {
+			commit('SET_ACCOUNT', account);
 		}
 	}
 };
diff --git a/src/utils/auth.js b/src/utils/auth.js
index 0e120f462..f05e40be3 100644
--- a/src/utils/auth.js
+++ b/src/utils/auth.js
@@ -7,6 +7,8 @@ const TokenScreenKey = 'Screen-Token';
 
 const TokenPlanKey = 'Plan-Token';
 
+const TokenDesignKey='Design-Token';
+
 // 设置教学，实训，仿真系统token
 export function getToken() {
 	return SessionStorage.getItem(TokenKey);
@@ -28,6 +30,17 @@ export function removeScreenToken() {
 	return SessionStorage.removeItem(TokenScreenKey);
 }
 
+// 设置城市轨道交通设计平台token
+export function getDesignToken() {
+	return SessionStorage.getItem(TokenDesignKey);
+}
+export function setDesignToken(token) {
+	return SessionStorage.setItem(TokenDesignKey, token);
+}
+export function removeDesignToken() {
+	return SessionStorage.removeItem(TokenDesignKey);
+}
+
 // 设置琏计划token
 export function getPlanToken() {
 	return SessionStorage.getItem(TokenPlanKey);
@@ -54,8 +67,10 @@ export function handleToken() {
 	const path = window.location.href;
 	if (path.includes('/dp/') || path.includes('/display/dp')) {
 		return getScreenToken();
+	} else if (path.includes('/design') || path.includes('/scriptDisplay') || path.includes('/publish') || path.includes('/orderauthor') || path.includes('/system') || path.includes('/display/manage') || path.includes('/apply/')) {
+		return getDesignToken();
 	} else if (path.includes('/plan') || path.includes('/display/plan')) {
-		return getPlanToken();
+		return getDesignToken() || getToken();
 	} else {
 		return getToken();
 	}
@@ -66,8 +81,8 @@ export function handleRemoveToken() {
 	const path = window.location.href;
 	if (path.includes('/dp/') || path.includes('/display/dp')) {
 		return removeScreenToken();
-	} else if (path.includes('/plan') || path.includes('/display/plan')) {
-		return removePlanToken();
+	} else if (path.includes('/design') || path.includes('/scriptDisplay') || path.includes('/plan') || path.includes('/publish') || path.includes('/orderauthor') || path.includes('/system') || path.includes('/display/plan') || path.includes('/display/manage') || path.includes('/apply/')) {
+		return removeDesignToken();
 	} else {
 		return removeToken();
 	}
@@ -79,8 +94,12 @@ export function gainClientId() {
 	let clientId = null;
 	if (path.includes('/dp/') || path.includes('/display/dp')) {
 		clientId = LoginParams.DaPing.clientId;
-	} else if (path.includes('/plan') || path.includes('/display/plan')) {
-		clientId = LoginParams.LianJiHua.clientId;
+	}
+	// else if (path.includes('/plan') || path.includes('/display/plan')) {
+	// 	clientId = LoginParams.LianJiHua.clientId;
+	// }
+	else if (path.includes('/design') || path.includes('/scriptDisplay') || path.includes('/plan') || path.includes('/publish') || path.includes('/orderauthor') || path.includes('/system') || path.includes('/display/plan') || path.includes('/display/manage') || path.includes('/apply/')) {
+		clientId = LoginParams.Design.clientId;
 	}
 
 	return clientId;
diff --git a/src/utils/login.js b/src/utils/login.js
index cbb2a2270..7697c4cfa 100644
--- a/src/utils/login.js
+++ b/src/utils/login.js
@@ -4,5 +4,6 @@ export const LoginParams = {
 	LianKeTang: { clientId: '1', secret: 'joylink' }, 		// "琏课堂"
 	DaPing: { clientId: '2', secret: 'bigscreen' }, 		// "大屏系统"
 	LianJiHua: { clientId: '3', secret: 'linkplan' }, 		// "琏计划"
-	Assistant: { clientId: '4', secret: 'linkassistant' } 	// "琏课堂助手"
+	Assistant: { clientId: '4', secret: 'linkassistant' },	// "琏课堂助手"
+	Design: { clientId: '6', secret: 'design' } 	// "城市轨道交通设计平台"
 };
diff --git a/src/utils/sock.js b/src/utils/sock.js
index f7654975c..4c3e465b5 100644
--- a/src/utils/sock.js
+++ b/src/utils/sock.js
@@ -214,6 +214,9 @@ StompClient.prototype = {
 	// 发送消息
 	send(url, msg) {
 		if (this.status) {
+			if(msg) {
+        msg = JSON.stringify(msg);
+      }
 			try {
 				this.clientIns.send(url, {}, msg);
 			} catch (err) {
diff --git a/src/views/approval/lesson/detail.vue b/src/views/approval/lesson/detail.vue
new file mode 100644
index 000000000..f17d8e1b8
--- /dev/null
+++ b/src/views/approval/lesson/detail.vue
@@ -0,0 +1,101 @@
+<template>
+  <el-dialog
+    :title="this.$t('approval.courseDetails')"
+    :visible.sync="showDetail"
+    top="20px"
+    width="90%"
+    :before-do-close="doClose"
+    :close-on-click-modal="false"
+  >
+    <div>
+      <el-card v-loading="loading">
+        <div slot="header" style="text-align: center;">
+          <b>{{ $t('global.courseName') }}: {{ lessonName }}</b>
+        </div>
+        <div style="margin:50px">
+          <p style="font-size: 14px; margin-bottom: 20px"> {{ $t('approval.courseDescription') }}:
+            <span style="color: #808080 !important;">{{ lessonRemark }}</span>
+          </p>
+        </div>
+      </el-card>
+      <el-card v-loading="loading">
+        <el-scrollbar wrap-class="scrollbar-wrapper" :style="{height: height -60 + 'px'}">
+          <el-table
+            :data="tableData"
+            row-key="id"
+            border
+            default-expand-all
+            :tree-props="{children: 'children', hasChildren: 'hasChildren'}"
+          >
+            <el-table-column
+              prop="name"
+              border
+              :label="this.$t('approval.chapterTrainingName')"
+            />
+            <el-table-column
+              prop="remarks"
+              border
+              :label="this.$t('approval.instructions')"
+            />
+          </el-table>
+        </el-scrollbar>
+      </el-card>
+    </div>
+  </el-dialog>
+
+</template>
+
+<script>
+import {reviewLessonDetail} from '@/api/designPlatform';
+
+export default {
+	name: 'LessonApprovalDetail',
+	components: {
+
+	},
+	data() {
+		return {
+			loading: false,
+			tableData: [],
+			lessonName: '',
+			lessonRemark: '',
+			showDetail: false
+		};
+	},
+	computed: {
+		height() {
+			return this.$store.state.app.height - 260;
+		}
+	},
+	watch: {
+
+	},
+	created() {
+	},
+	mounted() {
+		// this.loadInitData();
+	},
+	beforeDestroy() {
+
+	},
+	methods: {
+		show(lessonId) {
+			this.showDetail = true;
+			this.loadInitData(lessonId);
+		},
+		loadInitData(lessonId) {
+			this.loading =true;
+			reviewLessonDetail(lessonId).then(response =>{
+				this.tableData = response.data[0].children;
+				this.lessonName = response.data[0].name;
+				this.lessonRemark = response.data[0].remarks;
+				this.loading = false;
+			}).catch(()=>{
+				this.$messageBox(this.$t('approval.failedToGetCourseData'));
+			});
+		},
+		doClose() {
+		}
+	}
+};
+</script>
diff --git a/src/views/approval/lesson/index.vue b/src/views/approval/lesson/index.vue
new file mode 100644
index 000000000..3739350cd
--- /dev/null
+++ b/src/views/approval/lesson/index.vue
@@ -0,0 +1,214 @@
+<template>
+    <div>
+        <QueryListPage ref="queryListPage" :pager-config="pagerConfig" :query-form="queryForm" :query-list="queryList"></QueryListPage>
+        <el-dialog :title="this.$t('approval.explanation')" :visible.sync="dialogFormVisible" v-dialogDrag>
+            <!--<el-input type="textarea"
+                      :rows="2"
+                      :placeholder="this.$t('rules.enterRejectReason')"
+                      @focus="inputFocus"
+                      @blur="inputBlur"
+                      v-model="textarea"></el-input>
+            <span v-show="needReason" style="color: red">{{'*'+$t('rules.enterRejectReason')}}</span>-->
+            <data-form ref="dataform" :form="form" :form-model="formModel" :rules="rules" />
+            <div slot="footer" class="dialog-footer">
+                <el-button @click="rejectCancel">{{$t('global.cancel')}}</el-button>
+                <el-button type="primary" @click="rejectConfirm">{{$t('global.confirm')}}</el-button>
+            </div>
+        </el-dialog>
+        <lesson-detail ref="lessonDetail"></lesson-detail>
+    </div>
+</template>
+
+<script>
+    import {adminPublishLesson,rejectedLessonRelease,reviewLessonList} from '@/api/designPlatform';
+    import { listPublishMap } from '@/api/jmap/map';
+    import LessonDetail from './detail';
+
+    export default {
+        name: 'LessonApproval',
+        components: {
+            LessonDetail
+        },
+        data() {
+            return{
+                dialogFormVisible: false,
+                rejectId: '',
+                formModel: {
+                    explanation: ''
+                },
+                mapList: [],
+                pagerConfig: {
+                    pageSize: 'pageSize',
+                    pageIndex: 'pageNum'
+                },
+                queryForm: {
+                    labelWidth: '120px',
+                    reset: true,
+                    queryObject: {
+                        mapId: {
+                            type: 'select',
+                            label: this.$t('approval.map')+this.$t('global.colon'),
+                            config: {
+                                data: []
+                            }
+                        },
+                        lessonName: {
+                            type: 'text',
+                            label: this.$t('lesson.courseName')
+                        },
+                        userName: {
+                            type: 'text',
+                            label: this.$t('approval.applicant')+this.$t('global.colon'),
+                        }
+                    }
+                },
+                queryList: {
+                    query: reviewLessonList,
+                    selectCheckShow: false,
+                    indexShow: true,
+                    columns: [
+                        {
+                            title: this.$t('lesson.courseName'),
+                            prop: 'name'
+                        },
+                        {
+                            title: this.$t('approval.map'),
+                            prop: 'mapId ',
+                            type: 'tag',
+                            columnValue: (row) => { return this.$convertField(row.mapId , this.mapList, ['value', 'label']); },
+                            tagType: (row) => { return ''; }
+                        },
+                        {
+                            title: this.$t('approval.courseDescription'),
+                            prop: 'remarks'
+                        },
+                        {
+                            title: this.$t('approval.applicant'),
+                            prop: 'userName'
+                        },
+                        {
+                            title: this.$t('approval.applyTime'),
+                            prop: 'uploadTime',
+                            type: 'tag',
+                            columnValue: (row) => { return this.handleTime(row.uploadTime)},
+                            tagType: (row) => { return ''; }
+                        },
+                        {
+                            type: 'button',
+                            title: this.$t('global.operate'),
+                            width: '250',
+                            buttons: [
+                                {
+                                    name: this.$t('approval.lookOver'),
+                                    handleClick: this.goDetail,
+                                    type: ''
+                                },
+                                {
+                                    name: this.$t('approval.applyPassed'),
+                                    handleClick: this.pass,
+                                    type: ''
+                                },
+                                {
+                                    name: this.$t('approval.applyReject'),
+                                    handleClick: this.noPass,
+                                    type: ''
+                                }
+                            ]
+                        }
+                    ]
+                },
+                form :{
+                    labelWidth: '150px',
+                    items: [
+                        { prop: 'explanation', label: this.$t('approval.explanation'), type: 'textarea', required: true},
+                    ]
+                },
+                rules :{
+                    explanation: [
+                        { required: true, message: this.$t('rules.enterRejectReason'), trigger: 'blur' }
+                    ]
+                }
+            }
+        },
+        created(){
+            listPublishMap().then(response=>{
+                response.data.forEach(elem => {
+                    this.mapList.push({ value: elem.id, label: elem.name });
+                });
+               this.queryForm.queryObject.mapId.config.data = this.mapList;
+            });
+        },
+        mounted(){
+
+        },
+        beforeDestroy(){
+
+        },
+        watch: {
+
+        },
+        methods: {
+            goDetail(index,row) {
+                this.$refs.lessonDetail.show(row.id);
+            },
+            pass(index,row) {
+                this.$confirm(this.$t('tip.publishTheCourseHint'), this.$t('global.tips'), {
+                    confirmButtonText: this.$t('global.confirm'),
+                    cancelButtonText: this.$t('global.cancel'),
+                    type: 'warning'
+                }).then(() => {
+                    const params = {
+                        cityCode: row.cityCode,
+                        mapId: row.mapId,
+                        name: row.name,
+                        prdCode: row.prdCode
+                    };
+                    adminPublishLesson(params,row.id).then(response => {
+                        this.loading = false;
+                        this.$message.success(this.$t('tip.coursePublishSuccessful'));
+                        this.doClose();
+                    }).catch(error => {
+                        this.loading = false;
+                        this.$messageBox(this.$t('tip.coursePublishFailed'));
+                    })
+                });
+            },
+            noPass(index,row) {
+                this.dialogFormVisible = true;
+                this.rejectId = row.id;
+            },
+            handleTime(time) {
+                let timeList = time.split("T");
+                return timeList[0] + ' ' +timeList[1];
+            },
+            doClose() {
+                this.$refs.queryListPage.refresh(true);
+            },
+            rejectConfirm() {
+                this.$refs.dataform.validateForm(() => {
+                    if (this.rejectId){
+                        rejectedLessonRelease(this.formModel,this.rejectId).then(resp =>{
+                            this.loading = false;
+                            this.$message.success(this.$t('tip.rejectedCourseReleaseApplicationSuccessful'));
+                            this.dialogFormVisible = false;
+                            this.rejectId = '';
+                            this.doClose();
+                        }).catch(error => {
+                            this.loading = false;
+                            this.$messageBox(this.$t('tip.rejectedCourseReleaseApplicationSuccessful'));
+                            this.dialogFormVisible = false;
+                            this.rejectId = '';
+                            this.doClose();
+                        })
+                    }
+                });
+            },
+
+            rejectCancel() {
+                this.dialogFormVisible = false;
+                this.rejectId = '';
+                this.textarea = '';
+            }
+        }
+    }
+</script>
diff --git a/src/views/approval/runPlan/index.vue b/src/views/approval/runPlan/index.vue
new file mode 100644
index 000000000..9e4bfde48
--- /dev/null
+++ b/src/views/approval/runPlan/index.vue
@@ -0,0 +1,180 @@
+<template>
+    <div>
+        <QueryListPage ref="queryListPage" :pager-config="pagerConfig" :query-form="queryForm" :query-list="queryList" />
+        <run-plan-operate ref='applyPassed' @reloadTable="reloadTable" @create="handleConfirmPass" :title="$t('approval.passedRunPlan')" type="applyPassed">
+        </run-plan-operate>
+        <run-plan-operate ref='applyReject' @reloadTable="reloadTable" @create="handleConfirmReject" :title="$t('approval.rejectRunPlan')" type="applyReject">
+        </run-plan-operate>
+    </div>
+</template>
+<script>
+    import RunPlanOperate from './operate';
+    import { reviewRunPlanList,publishRunPlan,rejectRunPlan,previewRunPlan } from '@/api/designPlatform';
+    import { listPublishMap } from '@/api/jmap/map';
+    import { launchFullscreen } from '@/utils/screen';
+    import { UrlConfig } from '@/router/index';
+    export default {
+        name: 'ScriptApproval',
+        components: {
+            RunPlanOperate
+        },
+        data() {
+            return{
+                pagerConfig: {
+                    pageSize: 'pageSize',
+                    pageIndex: 'pageNum'
+                },
+                queryForm: {
+                    labelWidth: '100px',
+                    reset: true,
+                    queryObject: {
+                        mapId: {
+                            type: 'select',
+                            label: this.$t('approval.map'),
+                            config: {
+                                data: []
+                            }
+                        },
+                        'scriptName':{
+                            type: 'text',
+                            label: this.$t('approval.runPlanName')
+                        },
+                        'userName': {
+                            type: 'text',
+                            label: this.$t('approval.applicant')
+                        }
+
+                    }
+                },
+                queryList: {
+                    query: this.queryFunction,
+                    selectCheckShow: false,
+                    indexShow: true,
+                    columns: [
+                        {
+                            title: this.$t('approval.runPlanName'),
+                            width:250,
+                            prop: 'name'
+                        },
+                        {
+                            title: this.$t('approval.map'),
+                            prop: 'mapId ',
+                            width:250,
+                            type: 'tag',
+                            columnValue: (row) => { return this.$convertField(row.mapId , this.mapList, ['value', 'label']); },
+                            tagType: (row) => { return ''; }
+                        },
+                        {
+                            title: this.$t('approval.applicant'),
+                            prop: 'userName'
+                        },
+                        {
+                            title: this.$t('approval.applyTime'),
+                            prop: 'uploadTime',
+                            type: 'tag',
+                            columnValue: (row) => { return row.uploadTime.replace("T"," ")},
+                            tagType: (row) => { return ''; }
+                        },
+                        {
+                            type: 'button',
+                            title: this.$t('global.operate'),
+                            width: '450',
+                            buttons: [
+                                {
+                                    name: this.$t('approval.applyPassed'),
+                                    handleClick: this.applyPassed,
+                                    type: ''
+                                },
+                                {
+                                    name: this.$t('approval.applyReject'),
+                                    handleClick: this.applyReject,
+                                    type: ''
+                                },
+                                {
+                                    name: this.$t('approval.runPlanPreview'),
+                                    handleClick: this.runPlanPreview,
+                                    type: ''
+                                }
+                            ]
+                        }
+                    ]
+                }
+            }
+        },
+        created(){
+        },
+        mounted(){
+            this.loadInitData();
+        },
+        beforeDestroy(){
+
+        },
+        watch: {
+
+        },
+        methods: {
+            reloadTable() {
+                if (this.queryList && this.queryList.reload) {
+                    this.queryList.reload();
+                }
+            },
+            goDetail() {
+                this.$router.push({path:``});
+            },
+            async loadInitData() {
+                try {
+                    // 获取地图
+                    this.mapList = [];
+                    const res = await listPublishMap();
+                    res.data.forEach(elem => {
+                        this.queryForm.queryObject.mapId.config.data.push({ value: elem.id, label: elem.name });
+                        this.mapList.push({ value: elem.id, label: elem.name });
+                    });
+                } catch (error) {
+                    console.error(error, '获取发布地图');
+                }
+            },
+            queryFunction(params) {
+                return reviewRunPlanList(params);
+            },
+            applyPassed(index,row){
+                this.$refs.applyPassed.doShow(row);
+            },
+            applyReject(index,row){
+                this.$refs.applyReject.doShow(row);
+            },
+            runPlanPreview(index,row){
+                previewRunPlan(row.id).then(resp => {
+                    const query = {
+                        skinCode: row.skinCode, prdType: '01', group: resp.data, mapId: row.mapId, planId: row.id,from:''
+                    };
+                    this.$router.push({ path: `${UrlConfig.display}/plan`, query: query });
+                    launchFullscreen();
+                }).catch(error => {
+                    this.$messageBox(this.$t('tip.createSimulationFaild')+this.$t('global.colon')+error.message);
+                });
+            },
+            handleConfirmPass(data){
+                publishRunPlan(data.id,data).then(resp => {
+                    if(resp.data.length<=0){
+                        this.$message.success(this.$t('approval.passedScriptSuccess'));
+                    }
+                    else{
+                        this.$messageBox(`${this.$t('approval.passedScriptFailed')}: ${resp.data[0]}`);
+                    }
+                    this.reloadTable();
+                }).catch(error => {
+                    this.$messageBox(`${this.$t('approval.passedScriptFailed')}: ${error.message}`);
+                })
+            },
+            handleConfirmReject(data){
+                rejectRunPlan(data.id,data).then(resp => {
+                    this.reloadTable();
+                    this.$message.success(this.$t('approval.rejectScriptSuccess'));
+                }).catch(error => {
+                    this.$messageBox(`${this.$t('approval.rejectScriptFailed')}: ${error.message}`);
+                })
+            },
+        }
+    }
+</script>
diff --git a/src/views/approval/runPlan/operate.vue b/src/views/approval/runPlan/operate.vue
new file mode 100644
index 000000000..f2bcb9c37
--- /dev/null
+++ b/src/views/approval/runPlan/operate.vue
@@ -0,0 +1,98 @@
+<template>
+    <div>
+        <el-dialog :title="title" :visible.sync="dialogVisible" width="500px" :before-close="doClose" center>
+            <data-form ref="dataform" :form="form" :formModel="formModel" :rules="rules"></data-form>
+            <span slot="footer" class="dialog-footer">
+                <el-button type="primary" @click="doCreate">{{$t('global.confirm')}}</el-button>
+                <el-button @click="doClose">{{$t('global.cancel')}}</el-button>
+            </span>
+        </el-dialog>
+    </div>
+</template>
+<script>
+    export default {
+        name: 'ScriptOperate',
+        data() {
+            return {
+                dialogVisible: false,
+                formModel:{
+                    runPlanName:'',
+                    id:'',
+                    explanation:'',
+                },
+                isShow: false,
+            }
+        },
+        props: {
+            title: String,
+            type:String,
+        },
+        computed: {
+            form() {
+                let form={};
+                if(this.type=="applyPassed"){
+                    form = {
+                        labelWidth: '150px',
+                        items: [
+                            { prop: 'runPlanName', label: this.$t('approval.runPlanName'), type: 'text', required: true},
+                        ]
+                    }
+                }
+                else{
+                    form = {
+                        labelWidth: '150px',
+                        items: [
+                            
+                            { prop: 'explanation', label: this.$t('approval.explanation'), type: 'textarea', required: true},
+                        ]
+                    }
+                }
+                return form
+            },
+            rules() {
+                let crules ={};
+                if(this.type=="applyPassed"){
+                    crules={
+                        runPlanName: [
+                            { required: true, message: this.$t('approval.inputRunPlanName'), trigger: 'blur' },
+                        ]
+                    }
+                }
+                else{
+                    crules={
+                        explanation:[
+                            { required: true, message: this.$t('approval.inputRejectExplanation'), trigger: 'blur',max:200 },
+                        ]
+                    }
+                }
+                return crules
+            },
+        },
+        methods: {
+            doShow(row) {
+                if(this.type=="applyPassed"){
+                    this.formModel.runPlanName=row.name;
+                }
+                this.formModel.id=row.id;
+                this.dialogVisible = true   
+            },
+            doCreate() {
+                let self = this
+                this.$refs.dataform.validateForm(() => {
+                    self.$emit('create', Object.assign({}, this.formModel));
+                    self.doClose()
+                })
+            },
+            doClose() {
+                this.$refs.dataform.resetForm();
+                this.isShow = false;
+                this.dialogVisible = false
+            }
+        }
+    };
+</script>
+<style lang="scss" scoped>
+/deep/ .el-dialog--center .el-dialog__body{
+    padding: 15px 65px 10px 10px;
+}
+</style>
diff --git a/src/views/approval/script/index.vue b/src/views/approval/script/index.vue
new file mode 100644
index 000000000..b4920e46c
--- /dev/null
+++ b/src/views/approval/script/index.vue
@@ -0,0 +1,173 @@
+<template>
+    <div>
+        <QueryListPage ref="queryListPage" :pager-config="pagerConfig" :query-form="queryForm" :query-list="queryList" />
+        <!-- <script-operate ref='applyPassed' @reloadTable="reloadTable" @create="handleConfirmPass" :title="$t('approval.passedScript')" type="applyPassed">
+        </script-operate> -->
+        <script-operate ref='applyReject' @reloadTable="reloadTable" @create="handleConfirmReject" :title="$t('approval.rejectScript')">
+        </script-operate>
+    </div>
+</template>
+<script>
+    import { launchFullscreen } from '@/utils/screen';
+    import { UrlConfig } from '@/router/index';
+    import { scriptRecordNotify } from '@/api/simulation';
+    import ScriptOperate from './operate';
+    import { reviewScriptList,publishScript,rejectScript } from '@/api/designPlatform';
+    import { listPublishMap } from '@/api/jmap/map';
+    export default {
+        name: 'ScriptApproval',
+        components: {
+            ScriptOperate
+        },
+        data() {
+            return{
+                allMapList:[],
+                pagerConfig: {
+                    pageSize: 'pageSize',
+                    pageIndex: 'pageNum'
+                },
+                queryForm: {
+                    labelWidth: '100px',
+                    reset: true,
+                    queryObject: {
+                        mapId: {
+                            type: 'select',
+                            label: this.$t('approval.map'),
+                            config: {
+                                data: []
+                            }
+                        },
+                        'scriptName':{
+                            type: 'text',
+                            label: this.$t('approval.scriptName')
+                        },
+                        'creatorName': {
+                            type: 'text',
+                            label: this.$t('approval.applicant')
+                        }
+                        
+                    }
+                },
+                queryList: {
+                    query: this.queryFunction,
+                    selectCheckShow: false,
+                    indexShow: true,
+                    columns: [
+                        {
+                            title: this.$t('approval.scriptName'),
+                            width:250,
+                            prop: 'name'
+                        },
+                        {
+                            title: this.$t('approval.map'),
+                            prop: 'mapId ',
+                            width:250,
+                            type: 'tag',
+                            columnValue: (row) => { return this.$convertField(row.mapId , this.mapList, ['value', 'label']); },
+                            tagType: (row) => { return ''; }
+                        },
+                        {
+                            title: this.$t('approval.scriptDescription'),
+                            prop: 'description'
+                        },
+                        {
+                            title: this.$t('approval.applicant'),
+                            prop: 'creatorName'
+                        },
+                        {
+                            title: this.$t('approval.applyTime'),
+                            prop: 'uploadTime',
+                            type: 'tag',
+                            columnValue: (row) => { return row.uploadTime.replace("T"," ")},
+                            tagType: (row) => { return ''; }
+                        },
+                        {
+                            type: 'button',
+                            title: this.$t('global.operate'),
+                            width: '450',
+                            buttons: [
+                                {
+                                    name: this.$t('approval.applyPassed'),
+                                    handleClick: this.applyPassed,
+                                    type: ''
+                                },
+                                {
+                                    name: this.$t('approval.applyReject'),
+                                    handleClick: this.applyReject,
+                                    type: ''
+                                },
+                                {
+                                    name: this.$t('approval.scriptPreview'),
+                                    handleClick: this.scriptPreview,
+                                    type: ''
+                                }
+                            ]
+                        }
+                    ]
+                }
+            }
+        },
+        created(){
+        },
+        mounted(){
+            this.loadInitData();
+        },
+        beforeDestroy(){
+
+        },
+        watch: {
+
+        },
+        methods: {
+            reloadTable() {
+                if (this.queryList && this.queryList.reload) {
+                    this.queryList.reload();
+                }
+            },
+            goDetail() {
+                this.$router.push({path:``});
+            },
+            async loadInitData() {
+                try {
+                    // 获取地图
+                    this.mapList = [];
+                    const res = await listPublishMap();
+                    this.allMapList=res.data;
+                    res.data.forEach(elem => {
+                        this.queryForm.queryObject.mapId.config.data.push({ value: elem.id, label: elem.name });
+                        this.mapList.push({ value: elem.id, label: elem.name });
+                    });
+                } catch (error) {
+                    console.error(error, '获取发布地图');
+                }
+            },
+            queryFunction(params) {
+                return reviewScriptList(params);
+            },
+            applyPassed(index,row){
+                this.handleConfirmPass(row);
+            },
+            applyReject(index,row){
+                this.$refs.applyReject.doShow(row);
+            },
+            scriptPreview(index,row){
+                let mapInfo=this.allMapList.find(elem=>{return elem.id==row.mapId});
+                scriptRecordNotify(row.id).then(resp => {
+                    const query = { mapId: row.mapId, group: resp.data, scriptId: row.id,skinCode:mapInfo.skinCode,try:0};
+                    this.$router.push({ path: `${UrlConfig.design.display}/demon`, query });
+                    launchFullscreen();
+                }).catch(error => {
+                    this.$messageBox(`${this.$t('scriptRecord.createSimulationFail')}: ${error.message}`);
+                });
+            },
+            handleConfirmReject(data){
+                rejectScript(data.id,data).then(resp => {
+                    this.reloadTable();
+                    this.$message.success(this.$t('approval.rejectScriptSuccess'));
+                }).catch(error => {
+                    this.$messageBox(`${this.$t('approval.rejectScriptFailed')}: ${error.message}`);
+                })
+            },
+        }
+    }
+</script>
\ No newline at end of file
diff --git a/src/views/approval/script/operate.vue b/src/views/approval/script/operate.vue
new file mode 100644
index 000000000..2d777ef0e
--- /dev/null
+++ b/src/views/approval/script/operate.vue
@@ -0,0 +1,71 @@
+<template>
+    <div>
+        <el-dialog :title="title" :visible.sync="dialogVisible" width="500px" :before-close="doClose" center>
+            <data-form ref="dataform" :form="form" :formModel="formModel" :rules="rules"></data-form>
+            <span slot="footer" class="dialog-footer">
+                <el-button type="primary" @click="doCreate">{{$t('global.confirm')}}</el-button>
+                <el-button @click="doClose">{{$t('global.cancel')}}</el-button>
+            </span>
+        </el-dialog>
+    </div>
+</template>
+<script>
+    export default {
+        name: 'ScriptOperate',
+        data() {
+            return {
+                dialogVisible: false,
+                formModel:{
+                    id:'',
+                    explanation:'',
+                }
+            }
+        },
+        props: {
+            title: String,
+            type:String,
+        },
+        computed: {
+            form() {
+                let form={
+                    labelWidth: '150px',
+                    items: [
+                        
+                        { prop: 'explanation', label: this.$t('approval.explanation'), type: 'textarea', required: true},
+                    ]
+                }
+                return form
+            },
+            rules() {
+                let crules ={
+                    explanation:[
+                        { required: true, message: this.$t('approval.inputRejectExplanation'), trigger: 'blur',max:200 },
+                    ]
+                }
+                return crules
+            },
+        },
+        methods: {
+            doShow(row) {
+                this.formModel.id=row.id;
+                this.dialogVisible = true   
+            },
+            doCreate() {
+                let self = this
+                this.$refs.dataform.validateForm(() => {
+                    self.$emit('create', Object.assign({}, this.formModel));
+                    self.doClose()
+                })
+            },
+            doClose() {
+                this.$refs.dataform.resetForm();
+                this.dialogVisible = false
+            }
+        }
+    };
+</script>
+<style lang="scss" scoped>
+/deep/ .el-dialog--center .el-dialog__body{
+    padding: 15px 65px 10px 10px;
+}
+</style>
diff --git a/src/views/components/drapUp/index.vue b/src/views/components/drapUp/index.vue
new file mode 100644
index 000000000..7fb219cc9
--- /dev/null
+++ b/src/views/components/drapUp/index.vue
@@ -0,0 +1,104 @@
+<template>
+  <div
+    ref="drapBox"
+    class="drapHeight"
+    :style="{width: width + 'px', height: height + 'px', top: heightUp +'px'}"
+    @mousedown="mousedown"
+  />
+</template>
+
+<script>
+import localStore from 'storejs';
+
+export default {
+	name: 'DrapUp',
+	props: {
+        heightUp: {
+			type: Number,
+			required: true
+		},
+		isSave: {
+			type: Boolean,
+			default: true
+		},
+		max: {
+			type: Number,
+			default: 0
+		},
+		min: {
+			type: Number,
+			default: 0
+		},
+		width: {
+			type: Number,
+			default: 0
+		},
+        height: {
+            type: Number,
+            default: 36
+        }
+	},
+	data() {
+		return {
+            heightUps: 0
+		};
+	},
+    computed: {
+        heightTotol() {
+            return this.$store.state.app.height - 50;
+        },
+    },
+	mounted() {
+		const oDiv = this.$refs.drapBox;
+		oDiv.onmousedown = () => {
+			return false;
+		};
+	},
+	methods: {
+		mousedown(e) {
+			const oDiv = this.$refs.drapBox;
+			const maxNum = this.max || this.heightTotol-200;
+			const minNum = this.min || 150;
+			oDiv.onmousedown = function() {
+				return false;
+			};
+			e.stopPropagation();
+			window.event.cancelBubble = true;
+			const odiv = e.target;
+			const disY = e.clientY - odiv.offsetTop ;
+			document.onmousemove = (e) => {
+				let top = e.clientY - disY;
+				if (top > maxNum) {
+					top = maxNum;
+				} else if (top < minNum) {
+					top = minNum;
+				}
+				odiv.style.top = top + 'px';
+				this.$emit('drapHeight', top);
+				this.heightUps = top;
+			};
+			document.onmouseup = (e) => {
+				if (this.isSave) {
+					if (this.heightUps > minNum) {
+						localStore('upHeight', JSON.stringify(this.heightUps));
+					}
+				}
+				document.onmousemove = null;
+				document.onmouseup = null;
+			};
+		}
+	}
+};
+</script>
+<style>
+    .drapHeight {
+        float: left;
+        width: 16px;
+        background: red;
+        opacity: 0;
+        cursor: n-resize;
+        position: absolute;
+        top: 0;
+        z-index: 9999;
+    }
+</style>
diff --git a/src/views/components/filterCity/index.vue b/src/views/components/filterCity/index.vue
index 7272b10f5..c9c9b7162 100644
--- a/src/views/components/filterCity/index.vue
+++ b/src/views/components/filterCity/index.vue
@@ -1,16 +1,6 @@
 <template>
   <div class="filter">
-    <template v-if="isCascader">
-      <el-cascader
-        v-model="filterSelect"
-        :size="size"
-        popper-class="cascader"
-        :options="filterOptions"
-        :placeholder="$t('global.chooseCityAndRoute')"
-        @change="filterSelectChange"
-      />
-    </template>
-    <template v-else>
+    <template>
       <el-select v-model="filterSelect" :size="size" popper-class="select" @change="filterSelectChange">
         <el-option v-for="item in filterOptions" :key="item.code" :label="item.name" :value="item.code" />
       </el-select>
@@ -21,7 +11,9 @@
 <script>
 import { setUserConfigInfo } from '@/api/management/user';
 import { listPublishMap } from '@/api/jmap/map';
+import {getUserMapTree,publisMapCityList} from '@/api/designPlatform';
 import { getPublishMapTree } from '@/api/management/mapprd';
+
 import localStore from 'storejs';
 
 export default {
@@ -33,12 +25,6 @@ export default {
 				return 'medium';
 			}
 		},
-		isCascader: {
-			type: Boolean,
-			default() {
-				return false;
-			}
-		},
 		filterEmpty: {
 			type: Boolean,
 			default() {
@@ -48,7 +34,11 @@ export default {
 		queryFunction: {
 			type: Function,
 			required: true
-		}
+        },
+        localParamName:{
+            type:String,
+            required: true
+        }
 	},
 	data() {
 		return {
@@ -60,144 +50,26 @@ export default {
 		this.loadInitData();
 	},
 	methods: {
-		loadFirstLevelFilterOptions(cityList, mapDict) {
-			this.filterSelect = '000000';
-
-			// 根据mapDict过滤filterOptions
-			cityList.forEach(elem => {
-				if (this.filterEmpty && (mapDict[elem.code] || elem.code === this.filterSelect)) {
-					// 如果需要过滤，则过滤掉mapDict不存在的数据，特殊保存'000000'
-					this.filterOptions.push({ code: elem.code, name: elem.name });
-				} else if (!this.filterEmpty) {
-					// 如果不需要过滤，则直接添加filterOptions
-					this.filterOptions.push({ code: elem.code, name: elem.name });
-				}
-			});
-
-			if (this.filterEmpty && mapDict[localStore.get('_cityCode')] || !this.filterEmpty && localStore.get('_cityCode')) {
-				this.filterSelect = localStore.get('_cityCode');
-			} else if (this.filterEmpty && mapDict[localStore.get('cityCode')] || !this.filterEmpty && localStore.get('cityCode')) {
-				this.filterSelect = localStore.get('cityCode');
-			}
-
-			this.$emit('filterSelectChange', this.filterSelect);
-		},
-		loadSecondLevelFilterOptions(cityList, mapDict, nodeList) {
-			this.filterSelect = ['000000', ''];
-
-			if (nodeList && nodeList.length > 0) {
-				cityList.forEach(city => {
-					// 构造联动子选项
-					const cityNode = {
-						value: city.code,
-						label: city.name,
-						children: []
-					};
-
-					nodeList.forEach(node => {
-						if (this.filterEmpty && mapDict[node.id] || !this.filterEmpty) {
-							if (node.cityCode === city.code) {
-								cityNode.children.push({ value: node.id, label: node.name });
-							}
-
-							if (!this.filterSelect[1] && node.cityCode === this.filterSelect[0]) {
-								this.filterSelect[1] = node.id;
-							}
-						}
-					});
-
-					if (this.filterEmpty && cityNode.children.length > 0 || !this.filterEmpty) {
-						this.filterOptions.push(cityNode);
-					}
-				});
-			}
-
-			if (localStore.get('cityCode') && localStore.get('mapId')) {
-				this.filterSelect = [localStore.get('cityCode'), localStore.get('mapId')];
-			}
-
-			this.$emit('filterSelectChange', this.filterSelect);
-		},
 		async loadInitData() {
 			// 获取城市列表
-			const resp = await this.$Dictionary.cityType();
+			this.filterOptions=[];
+
+            let resp = this.$route.fullPath.includes('design/userlist')?await this.$Dictionary.cityType():await publisMapCityList('city_type');
+            resp=this.$route.fullPath.includes('design/userlist')?resp:resp.data;
 			const cityList = resp.sort((a, b) => {
 				return a.code.localeCompare(b.code);
 			});
 
-			if (this.isCascader) {
-				//  设置二级联动组件
-				const mapDict = {};
-				const response = await listPublishMap();
-				const nodeList = response.data;
-				if (nodeList && nodeList.length > 0) {
-					//  如果需要过滤的处理
-					if (this.filterEmpty && this.queryFunction) {
-						// 根据mapDict过滤filterOptions
-						for (var j = 0; j < nodeList.length; j++) {
-							const response = await this.queryFunction({ mapId: nodeList[j].id } || '');
-							const mapList = response.data;
-							if (mapList && mapList.length > 0) {
-								mapDict[nodeList[j].id] = true;
-							}
-						}
-					}
-				}
+            this.filterOptions=cityList;
+            this.filterSelect = localStore.get(this.localParamName) || cityList[0].code;
 
-				this.loadSecondLevelFilterOptions(cityList, mapDict, nodeList);
-			} else {
-				// 设置一级选择组件
-				const mapDict = {};
-				if (this.filterEmpty && this.queryFunction) {
-					if (this.queryFunction === getPublishMapTree) {
-						// 查询同一种类citycode的mapList
-						for (var i = 0; i < cityList.length; i++) {
-							const response = await this.queryFunction(cityList[i].code);
-							const mapList = response.data;
-							if (mapList && mapList.length > 0) {
-								mapDict[cityList[i].code] = true;
-							}
-						}
-					} else {
-						// 查询所有citycode的mapList
-						const response = await this.queryFunction();
-						const mapList = response.data;
-						if (mapList && mapList.length > 0) {
-							mapList.forEach(elem => {
-								mapDict[elem.cityCode] = true;
-							});
-						}
-					}
-				}
-
-				// 根据mapDict构建一级filterSelect
-				this.loadFirstLevelFilterOptions(cityList, mapDict);
-			}
+            this.$emit('filterSelectChange', this.filterSelect);
 		},
 		filterSelectChange(filterSelect) {
-			if (this.isCascader) {
-				// 设置二级联动组件
-				localStore.set('cityCode', filterSelect[0]);
-				localStore.set('mapId', filterSelect[1]);
-				setUserConfigInfo([{ code: 'cityCode', val: filterSelect[0] }, { code: 'mapId', val: filterSelect[1] }]);
-				this.$emit('filterSelectChange', filterSelect);
-			} else {
-				// 设置一级选择组件
-				localStore.set('_cityCode', filterSelect);
-				this.$emit('filterSelectChange', filterSelect);
-			}
-		},
-		setFilterSelect(filterSelect) {
-			this.filterSelect = filterSelect;
-			if (this.isCascader) {
-				localStore.set('cityCode', filterSelect[0]);
-				localStore.set('mapId', filterSelect[1]);
-			} else {
-				localStore.set('_cityCode', filterSelect);
-			}
-		},
-		setFilterOptions(filterOptions) {
-			this.filterOptions = filterOptions;
+			// 设置一级选择组件
+            // localStore.set('_cityCode', filterSelect);
+            localStore.set(this.localParamName, filterSelect);
+            this.$emit('filterSelectChange', filterSelect);
 		}
 	}
 };
diff --git a/src/views/components/pay/index.vue b/src/views/components/pay/index.vue
index cb725cb63..0bb13d619 100644
--- a/src/views/components/pay/index.vue
+++ b/src/views/components/pay/index.vue
@@ -104,7 +104,6 @@ export default {
 				data['prdCode'] = this.$route.query.prdCode;
 				data['lessonId'] = this.$route.query.lessonId;
 			}
-
 			getCommodityDetailByParams(data).then(response => {
 				this.active = 0;
 				this.orderData = response.data;
@@ -128,13 +127,13 @@ export default {
 			this.active = 0;
 			const type = this.$route.query.permissionType;
 			if (type === PermissionType.LESSON) {
-				this.$router.replace({ path: `${UrlConfig.teach.detail}/${this.$route.params.lessonId}` });
+				this.$router.replace({ path: `${UrlConfig.trainingPlatform.teachDetail}/${this.$route.query.subSystem}`, query: {lessonId: this.$route.query.lessonId, mapId: this.$route.query.mapId, prdCode: this.$route.query.prdCode}});
 			} else if (type === PermissionType.EXAM) {
-				this.$router.replace({ path: `${UrlConfig.exam.course}/${this.orderData.lessonId}` });
+				this.$router.replace({ path: `${UrlConfig.trainingPlatform.course}/${this.$route.query.subSystem}`});
 			} else if (type === PermissionType.SCREEN) {
 				this.$router.replace({ path: `${UrlConfig.dp.detail}/${this.$route.params.lessonId}` });
 			} else if (type === PermissionType.SIMULATION) {
-				this.$router.replace({ path: `${UrlConfig.demonstration.detail}/${this.$route.params.lessonId}` });
+				this.$router.replace({ path: `${UrlConfig.trainingPlatform.prodDetail}/${this.$route.query.subSystem}`, query: { mapId: this.$route.query.mapId} });
 			} else {
 				this.$router.replace({ path: `/` });
 			}
diff --git a/src/views/components/systemTime/digit.vue b/src/views/components/systemTime/digit.vue
index acb7e818d..04015e69c 100644
--- a/src/views/components/systemTime/digit.vue
+++ b/src/views/components/systemTime/digit.vue
@@ -1,32 +1,32 @@
 <template>
-  <div class="digit" :style="{width: 11*zoom+'px', height: 20*zoom+'px', top: top+'px'}">
+  <div class="digit" :style="{width: w+'px', height: h+'px'}">
     <div
       class="segment on"
-      :style="{ background: color, 'border-radius': zoom+'px', opacity: opacity(isShowOne), top: zoom+'px', left: zoom*2+'px', right: zoom*2+'px', height: zblod+'px'}"
+      :style="{ background: color, 'border-radius': z1+'px', opacity: opacity(isShowOne), top: p+'px', left: p+b1+'px', right: b1+'px', width: z1+b1+'px', height: b1+'px'}"
     />
     <div
       class="segment on"
-      :style="{ background: color, 'border-radius': zoom+'px', opacity: opacity(isShowTwo), top: zoom*2+'px', right: zoom+'px', width: zblod+'px', height: zoom*7.5+'px'}"
+      :style="{ background: color, 'border-radius': z1+'px', opacity: opacity(isShowTwo), top: p+b1+'px', left: p+z1+b2+'px', width: b1+'px', height:z1+'px'}"
     />
     <div
       class="segment on"
-      :style="{ background: color, 'border-radius': zoom+'px', opacity: opacity(isShowThee), bottom: zoom*2+'px', right: zoom+'px', width: zblod+'px', height: zoom*7.5+'px'}"
+      :style="{ background: color, 'border-radius': z1+'px', opacity: opacity(isShowThee), top: p+z1+b2+'px', left: p+z1+b2+'px', width: b1+'px', height: z1+'px'}"
     />
     <div
-      class="segment on "
-      :style="{ background: color, 'border-radius': zoom+'px', opacity: opacity(isShowFour), bottom: zoom+'px', right: zoom*2+'px', height: zblod+'px', left: zoom*2+'px' }"
+      class="segment on"
+      :style="{ background: color, 'border-radius': z1+'px', opacity: opacity(isShowFour), top: p+z2+b2+'px', left: p+b1+'px', right: b1+'px', width: z1+b1+'px', height: b1+'px'}"
     />
     <div
-      class="segment on "
-      :style="{ background: color, 'border-radius': zoom+'px', opacity: opacity(isShowFive), bottom: zoom*2+'px', left: zoom+'px', width: zblod+'px', height: zoom*7.5+'px'}"
+      class="segment on"
+      :style="{ background: color, 'border-radius': z1+'px', opacity: opacity(isShowFive), top: p+z1+b2+'px', left: p+'px', width: b1+'px', height: z1+'px'}"
     />
     <div
-      class="segment on "
-      :style="{ background: color, 'border-radius': zoom+'px', opacity: opacity(isShowSix), top: zoom*2+'px', left: zoom+'px',width: zblod+'px', height: zoom*7.5+'px'}"
+      class="segment on"
+      :style="{ background: color, 'border-radius': z1+'px', opacity: opacity(isShowSix), top: p+b1+'px', left: p+'px', width: b1+'px', height:z1+'px'}"
     />
     <div
-      class="segment "
-      :style="{ background: color, 'border-radius': zoom+'px', opacity: opacity(isShowSeven), left: zoom*2+'px', right: zoom*2+'px', height: zblod+'px', bottom: zoom*9.5+'px'}"
+      class="segment on"
+      :style="{ background: color, 'border-radius': z1+'px', opacity: opacity(isShowSeven), top: p+z1+b1+'px', left: p+b1+'px', right: b1+'px', width: z1+b1+'px', height: b1+'px'}"
     />
   </div>
 </template>
@@ -35,10 +35,6 @@
 export default {
 	name: 'Digit',
 	props: {
-		top: {
-			type: Number,
-			required: true
-		},
 		zoom: {
 			type: Number,
 			required: true
@@ -57,9 +53,6 @@ export default {
 		}
 	},
 	computed: {
-		zblod() {
-			return parseInt(this.fine * this.zoom);
-		},
 		isShowOne() {
 			return [2, 3, 5, 6, 7, 8, 9, 0].indexOf(this.number) != -1;
 		},
@@ -80,6 +73,27 @@ export default {
 		},
 		isShowSeven() {
 			return [2, 3, 4, 5, 6, 8, 9].indexOf(this.number) != -1;
+		},
+		b1() {
+			return this.fine * 2;
+		},
+		b2() {
+			return this.fine * 4;
+		},
+		z1() {
+			return this.zoom * 4;
+		},
+		z2() {
+			return this.zoom * 8;
+		},
+		p() {
+			return this.fine * 1;
+		},
+		w() {
+			return this.zoom * 4 + this.fine * 6 + this.p*2;
+		},
+		h() {
+			return this.zoom * 8 + this.fine * 6 + this.p*2;
 		}
 	},
 	methods: {
@@ -92,9 +106,8 @@ export default {
 
 <style rel="stylesheet/scss" lang="scss" scoped>
     .digit {
-        position: relative;
-        display: inline-flex;
-        justify-content: center;
+		display: inline-block;
+		position: relative;
 
         .segment {
             position: absolute;
@@ -114,6 +127,5 @@ export default {
                 -o-transition: opacity 0s;
             }
         }
-
     }
 </style>
diff --git a/src/views/components/systemTime/index.vue b/src/views/components/systemTime/index.vue
index a964e1645..84f8e61bb 100644
--- a/src/views/components/systemTime/index.vue
+++ b/src/views/components/systemTime/index.vue
@@ -1,8 +1,5 @@
 <template>
-  <div
-    class="system-time-box"
-    :style="{background: background, width: width+'px', height: height+'px', 'line-height': height+'px'}"
-  >
+  <div class="system-time-box">
     <template v-for="(item,index) in time">
       <digit
         v-if="Number.isInteger(parseInt(item))"
@@ -10,8 +7,7 @@
         :number="parseInt(item)"
         :color="color"
         :fine="fine"
-        :zoom="time.length - index > 2? zoom: zoom* 0.6"
-        :top="top"
+        :zoom="time.length - index > 2? zoom: zoom* 0.5"
       />
       <separator v-if="!Number.isInteger(parseInt(item))" :key="index" :color="color" :zoom="zoom" :fine="fine" />
     </template>
@@ -53,28 +49,10 @@ export default {
 				return 4;
 			}
 		},
-		width: {
-			type: Number,
-			default() {
-				return 280;
-			}
-		},
-		height: {
-			type: Number,
-			default() {
-				return 80;
-			}
-		},
 		fine: {
 			type: Number,
 			default() {
-				return 1;
-			}
-		},
-		top: {
-			type: Number,
-			default() {
-				return 1;
+				return 2;
 			}
 		}
 	}
diff --git a/src/views/components/systemTime/point.vue b/src/views/components/systemTime/point.vue
index 2be8a63ad..6d03098c4 100644
--- a/src/views/components/systemTime/point.vue
+++ b/src/views/components/systemTime/point.vue
@@ -1,7 +1,7 @@
 <template>
   <div
     class="point"
-    :style="{background: color, width: zblod+'px', height: zblod+'px', top: top+'px', 'border-radius': 0.5*zblod+'px'}"
+    :style="{background: color, width: fine*2+'px', height: fine*2+'px','border-radius': fine+'px'}"
   />
 </template>
 
@@ -9,10 +9,6 @@
 export default {
 	name: 'Point',
 	props: {
-		top: {
-			type: Number,
-			required: true
-		},
 		zoom: {
 			type: Number,
 			required: true
@@ -25,20 +21,10 @@ export default {
 			type: String,
 			required: true
 		}
-	},
-	computed: {
-		zblod() {
-			return parseInt(this.fine * this.zoom);
-		}
-	},
-	methods: {
 	}
 };
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-    .point {
-        position: relative;
-        display: inline-block;
-    }
+
 </style>
diff --git a/src/views/components/systemTime/separator.vue b/src/views/components/systemTime/separator.vue
index 710c219fd..555734ca3 100644
--- a/src/views/components/systemTime/separator.vue
+++ b/src/views/components/systemTime/separator.vue
@@ -1,51 +1,52 @@
 <template>
-    <div class="separator" :style="{width: zoom+'px', height: zoom*20+'px'}">
-        <div class="point-box">
-            <point :color="color" :zoom="zoom" :fine="fine" :top="-2*zoom"></point>
-            <point :color="color" :zoom="zoom" :fine="fine" :top="-12*zoom"></point>
-        </div>
-    </div>
+  <div class="separator" :style="{width: w+'px', height: h+'px'}">
+    <point class="point" :color="color" :zoom="zoom" :fine="fine" :style="{top: zoom*4+p*1+'px'}" />
+    <point class="point" :color="color" :zoom="zoom" :fine="fine" :style="{top: zoom*6+p*2+'px' }" />
+  </div>
 </template>
 
 <script>
-    import Point from './point';
+import Point from './point';
 
-    export default {
-        name: 'separator',
-        props: {
-            zoom: {
-                type: Number,
-                required: true,
-            },
-            fine: {
-                type: Number,
-                required: true,
-            },
-            color: {
-                type: String,
-                required: true,
-            }
-        },
-        components: {
-            Point
-        },
-        methods: {
-        }
-    }
+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;
+		}
+	}
+};
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
     .separator {
-        position: relative;
-        display: inline-block;
-        left: -2px;
-
-        .point-box {
-            display: flex;
-            flex-direction: column;
-            align-items: center;
-            text-align: center;
-            justify-content: center;
-        }
+		display: inline-block;
+		text-align: center;
+		.point {
+			position: relative;
+		}
     }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/views/demonstration/detail/index.vue b/src/views/demonstration/detail/index.vue
index 3e086f79e..19fa1b091 100644
--- a/src/views/demonstration/detail/index.vue
+++ b/src/views/demonstration/detail/index.vue
@@ -1,45 +1,39 @@
 <template>
   <el-card v-loading="loading">
     <div slot="header" style="text-align: center;">
-      <span v-if="hasProduct"><b>{{ $t('demonstration.simulationName') + courseModel.name }}</b></span>
-      <span v-else>{{ $t('demonstration.noSimulationProducts') }}</span>
+      <span><b>{{ $t('demonstration.simulationName') + courseModel.name }}</b></span>
+    </div>
+    <div class="simulation-detail" :style="{ height: height-190 +'px' }">
+      <p class="list-item">
+        <span class="list-label">{{ $t('demonstration.productDescription') }}</span>
+        <span class="list-elem">{{ courseModel.remarks }}</span>
+      </p>
+      <p class="list-item">
+        <span class="list-label">{{ $t('global.permissionList') }}</span>
+      </p>
+      <limit-list :ref="`limit`" :course-model="courseModel" />
+    </div>
+    <div class="btn-buy">
+      <el-button type="success" @click="buy">{{ $t('global.buy') }}</el-button>
+      <el-button v-if="hasPermssion" type="primary" @click="distribute">{{ $t('global.distributePermission') }}</el-button>
+      <el-button v-if="hasPermssion" type="primary" @click="transfer">{{ $t('global.transferQRCode') }}</el-button>
+      <el-button v-show="isStartDemon" :loading="buttonLoading" type="primary" @click="start">{{ $t('demonstration.startSimulation') }}</el-button>
+      <el-button v-show="isCreateRoom" :loading="buttonLoading" type="primary" @click="start">{{ $t('demonstration.createRoom') }}</el-button>
+      <el-button v-show="isInRoom" :loading="buttonLoading" type="primary" @click="joinRoom">{{ $t('demonstration.enterRoom') }}</el-button>
     </div>
-    <el-tabs type="border-card" :value="currentPrdCode" :style="{ height: height-50 +'px' }" @tab-click="handleLeave">
-      <el-tab-pane v-for="item in productList" :key="item.code" :name="item.code" :label="item.name" style="padding: 5px" :style="{ height: height-160 +'px' }">
-        <div>
-          <p class="list-item">
-            <span class="list-label">{{ $t('demonstration.productDescription') }}</span>
-            <span class="list-elem">{{ courseModel.remarks }}</span>
-          </p>
-          <p class="list-item">
-            <span class="list-label">{{ $t('global.permissionList') }}</span>
-          </p>
-          <limit-list :ref="`limit_${item.code}`" :course-model="courseModel" @initLoadPage="initLoadPage" />
-        </div>
-      </el-tab-pane>
-      <div v-if="hasProduct" class="btn-buy">
-        <el-button type="success" @click="buy">{{ $t('global.buy') }}</el-button>
-        <el-button v-if="hasPermssion" type="primary" @click="distribute">{{ $t('global.distributePermission') }}</el-button>
-        <el-button v-if="hasPermssion" type="primary" @click="transfer">{{ $t('global.transferQRCode') }}</el-button>
-        <el-button v-show="isStartDemon" :loading="buttonLoading" type="primary" @click="start">{{ $t('demonstration.startSimulation') }}</el-button>
-        <el-button v-show="isCreateRoom" :loading="buttonLoading" type="primary" @click="start">{{ $t('demonstration.createRoom') }}</el-button>
-        <el-button v-show="isInRoom" :loading="buttonLoading" type="primary" @click="joinRoom">{{ $t('demonstration.enterRoom') }}</el-button>
-      </div>
-    </el-tabs>
   </el-card>
 </template>
 <script>
-import { getPublishMapInfo } from '@/api/jmap/map';
+// import { getPublishMapInfo } from '@/api/jmap/map';
 import { getGoodsTryUse } from '@/api/management/goods';
-import { getCommodityMapProduct, getMapProductDetail } from '@/api/management/mapprd';
 import { PermissionType } from '@/scripts/ConstDic';
 import { launchFullscreen } from '@/utils/screen';
 import { queryPermissionSimulation } from '@/api/management/author';
 import { postCreateRoom, getjointTraining, checkRoomExist } from '@/api/chat';
 import { UrlConfig } from '@/router/index';
 import { simulationNotify, schedulingNotify } from '@/api/simulation';
-import localStore from 'storejs';
 import LimitList from '@/views/components/limits/index';
+import { getSubSystemDetail } from '@/api/trainingPlatform';
 
 export default {
 	name: 'ExamDetailList',
@@ -66,15 +60,11 @@ export default {
 				prdCode: '',
 				pmsList: []
 			},
-			EffectiveTypeList: [],
 			jointShow: false,
 			jointGroup: ''
 		};
 	},
 	computed: {
-		hasProduct() {
-			return this.productList.length;
-		},
 		hasPermssion() {
 			let isShow = false;
 			if (this.courseModel.pmsList && this.courseModel.pmsList.length) {
@@ -89,11 +79,14 @@ export default {
 			return this.courseModel.prdType === '03' && this.hasPermssion && !this.jointShow;
 		},
 		isInRoom() {
-			return this.courseModel.prdType == '03' && this.hasPermssion && this.jointShow;
+			return this.courseModel.prdType === '03' && this.hasPermssion && this.jointShow;
 		},
 		mapId() {
-			return this.$route.params.mapId;
+			return this.$route.query.mapId;
 		},
+		// prodId() {
+		// 	return this.$route.query.prodId;
+		// },
 		height() {
 			return this.$store.state.app.height - 50;
 		}
@@ -101,9 +94,6 @@ export default {
 	watch: {
 		'$route': function (val) {
 			this.loadInitData();
-		},
-		'currentPrdCode': function (code) {
-			this.initLoadPage({ id: this.mapId, code: code });
 		}
 	},
 	async mounted() {
@@ -111,30 +101,51 @@ export default {
 	},
 	methods: {
 		async loadInitData() {
-			this.$Dictionary.effectiveType().then(list => {
-				this.EffectiveTypeList = list;
-			});
-
-			this.currentPrdCode = '';
-			this.productList = [];
+			this.loading = true;
 			try {
-				if (parseInt(this.mapId)) {
-					this.getJointTrainingList();
-					const rest = await getPublishMapInfo(this.mapId);
-					if (rest && rest.code == 200) {
-						const resp = await getCommodityMapProduct(rest.data.skinCode);
-						if (resp.data && resp.data.length) {
-							this.productList = resp.data.sort((a, b) => {
-								return Number(b.prdType) - Number(a.prdType);
-							});
-
-							this.currentPrdCode = localStore.get(this.$route.path) || this.productList[0].code;
-						}
+				const resp = await getSubSystemDetail(this.$route.params.subSystem);
+				this.tryUser = 0;
+				this.loading = false;
+				if (resp.data.mapPrd) {
+					this.courseModel = {
+						id: resp.data.mapPrd.id,
+						name: resp.data.mapPrd.name,
+						mapId: this.mapId,
+						skinCode: resp.data.mapPrd.skinCode,
+						remarks: resp.data.mapPrd.remarks,
+						prdType: resp.data.mapPrd.prdType,
+						prdCode: resp.data.mapPrd.code,
+						pmsList: resp.data.permissionList || [],
+						PermissionType: PermissionType.SIMULATION
+					};
+					this.currentPrdCode = resp.data.mapPrd.code;
+					if (resp.data.mapPrd.prdType === '03') {
+						this.getJointTrainingList();
 					}
 				}
+				if (!this.courseModel.pmsList) {
+					this.tryUser = 1;
+					const paras = {
+						mapId: this.mapId,
+						prdCode: this.courseModel.prdCode,
+						permissionType: PermissionType.SIMULATION
+					};
+
+					try {
+						const resr = await getGoodsTryUse(paras);
+						if (resr.data.tryTime <= 0) {
+							this.tryTime = 0;
+						} else {
+							this.tryTime = resr.data.tryTime;
+							this.goodsId = resr.data.goodsId;
+						}
+					} catch (error) {
+						this.tryTime = 0;
+					}
+				}
+			} catch (error) {
 				this.loading = false;
-			} catch (e) {
-				this.$messageBox(this.$t('error.getProductListFailed'));
+				this.$messageBox(this.$t('error.refreshFailed'));
 			}
 		},
 		async getJointTrainingList() {
@@ -151,61 +162,9 @@ export default {
 				console.error(error, '获取是否拥有综合演练房间');
 			}
 		},
-		async handleLeave(tab) {
-			this.currentPrdCode = tab.name;
-			localStore.set(this.$route.path, this.currentPrdCode);
-		},
-		async initLoadPage(data) {
-			this.loading = true;
-			if (data && parseInt(data.id) && data.code) {
-				try {
-					const resp = await getMapProductDetail(data.code);
-					this.tryUser = 0;
-					this.loading = false;
-					this.courseModel = {
-						id: resp.data.id,
-						name: resp.data.name,
-						mapId: data.id,
-						skinCode: resp.data.skinCode,
-						remarks: resp.data.remarks,
-						prdType: resp.data.prdType,
-						prdCode: resp.data.code,
-						pmsList: resp.data.pmsList || [],
-						PermissionType: PermissionType.SIMULATION
-					};
-					const rest = await queryPermissionSimulation({ mapId: this.courseModel.mapId, prdCode: this.courseModel.prdCode });
-					this.courseModel.pmsList = rest.data;
-					if (!this.courseModel.pmsList) {
-						this.tryUser = 1;
-						const paras = {
-							mapId: data.id,
-							prdCode: data.code,
-							permissionType: PermissionType.SIMULATION
-						};
-
-						try {
-							const resr = await getGoodsTryUse(paras);
-							if (resr.data.tryTime <= 0) {
-								this.tryTime = 0;
-							} else {
-								this.tryTime = resr.data.tryTime;
-								this.goodsId = resr.data.goodsId;
-							}
-						} catch (error) {
-							this.tryTime = 0;
-						}
-					}
-				} catch (error) {
-					this.loading = false;
-					this.$messageBox(this.$t('error.refreshFailed'));
-				}
-			} else {
-				this.loading = false;
-			}
-		},
 		async joinRoom() {
 			await getjointTraining(this.jointGroup);
-			const query = { skinCode: this.courseModel.skinCode, group: this.jointGroup };
+			const query = { skinCode: this.courseModel.skinCode, group: this.jointGroup, subSystem: this.$route.params.subSystem};
 			this.$router.push({ path: `/trainroom`, query: query });
 		},
 		async createRoom() {
@@ -217,7 +176,7 @@ export default {
 				};
 				const res = await postCreateRoom(param);
 				if (res && res.code == 200) {
-					const query = { skinCode: this.courseModel.skinCode, group: res.data };
+					const query = { skinCode: this.courseModel.skinCode, group: res.data, subSystem: this.$route.params.subSystem };
 					this.$router.push({ path: `/trainroom`, query: query });
 				}
 			} catch (error) {
@@ -284,20 +243,20 @@ export default {
 		buy() {
 			this.buttonLoading = true;
 			this.$router.push({
-				path: `${UrlConfig.demonstration.pay}/${this.courseModel.id}`,
-				query: { permissionType: PermissionType.SIMULATION, prdCode: this.courseModel.prdCode, mapId: this.courseModel.mapId }
+				path: `${UrlConfig.trainingPlatform.pay}/${this.courseModel.id}`,
+				query: { permissionType: PermissionType.SIMULATION, prdCode: this.courseModel.prdCode, mapId: this.courseModel.mapId, subSystem: this.$route.params.subSystem }
 			});
 		},
 		transfer() {
 			this.buttonLoading = false;
 			if (this.$refs) {
-				this.$refs[`limit_${this.currentPrdCode}`][0].transfer(this.courseModel);
+				this.$refs[`limit`].transfer(this.courseModel);
 			}
 		},
 		distribute() {
 			this.buttonLoading = false;
 			if (this.$refs) {
-				this.$refs[`limit_${this.currentPrdCode}`][0].distribute(this.courseModel);
+				this.$refs[`limit`].distribute(this.courseModel);
 			}
 		}
 	}
@@ -310,28 +269,12 @@ export default {
     }
 </style>
 <style>
-    .title {
-        font-weight: bold
-    }
-
-    .time-item {
-        font-size: 24px;
-        color: black !important;
-    }
-
-    .time-label {
-        display: -moz-inline-box;
-        display: inline-block;
-        text-align: right;
-        margin-left: 14px;
-    }
-
-    .time-elem {
-        color: rgb(90, 89, 89) !important;
+    .simulation-detail {
+        margin: 50px;
     }
 
     .list-item {
-        font-size: 16px;
+        font-size: 14px;
         margin-bottom: 20px;
         padding: 0px;
     }
diff --git a/src/views/demonstration/list/demonList.vue b/src/views/demonstration/list/demonList.vue
index bd5131bf1..58c9f016b 100644
--- a/src/views/demonstration/list/demonList.vue
+++ b/src/views/demonstration/list/demonList.vue
@@ -91,7 +91,7 @@ export default {
 			}
 		},
 		clickEvent(obj, data, ele) {
-			if (obj.type == 'map') {
+			if (obj.type == 'Map') {
 				setSessionStorage('demonList', obj.id);
 				this.$router.push({ path: `${UrlConfig.demonstration.detail}/${obj.id}` });
 			}
diff --git a/src/views/designPlatform/demonList.vue b/src/views/designPlatform/demonList.vue
new file mode 100644
index 000000000..3acbc2e59
--- /dev/null
+++ b/src/views/designPlatform/demonList.vue
@@ -0,0 +1,230 @@
+<template>
+  <div>
+    <el-card v-loading="loading" class="map-list-main" header="已发布地图列表">
+      <filter-city ref="filerCity" filter-empty :query-function="queryFunction" :local-param-name="localParamName" @filterSelectChange="refresh" />
+      <el-input v-model="filterText" :placeholder="this.$t('global.filteringKeywords')" clearable />
+      <el-scrollbar wrap-class="scrollbar-wrapper" :style="{ height: (height-125) +'px' }">
+        <!-- :style="{ height: heightUp +'px' }" -->
+        <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':''}"
+            >&nbsp;{{ tnode.label }}</span>
+          </span>
+        </el-tree>
+      </el-scrollbar>
+    </el-card>
+  </div>
+</template>
+<script>
+import { listPublishMap } from '@/api/jmap/map';
+// import { getTrainingSystemList} from '@/api/trainingPlatform';
+import { UrlConfig } from '@/router/index';
+import { getSessionStorage, setSessionStorage, removeSessionStorage } from '@/utils/auth';
+import FilterCity from '@/views/components/filterCity';
+import localStore from 'storejs';
+
+export default {
+	name: 'PublicMapList',
+	components: {
+		FilterCity
+	},
+	props: {
+		height: {
+			type: Number,
+			required: true
+		},
+		width: {
+			type: Number,
+			required: true
+		}
+	},
+	data() {
+		return {
+			loading: true,
+			defaultShowKeys: [],
+			queryFunction: listPublishMap,
+			filterText: '',
+			treeData: [],
+			treeList: [],
+			selected: {},
+			defaultProps: {
+				children: 'children',
+				label: 'name'
+			},
+			node: {
+			},
+			// mapId: '',
+			heightUp: 450,
+			point: {
+				x: 0,
+				y: 0
+			},
+			editModel: {},
+			localParamName: 'publish_cityCode',
+			cityCode: ''
+			// skinCode:''
+		};
+	},
+	computed: {
+		role() {
+			return this.$store.state.user.roles.includes('04') ||
+                    this.$store.state.user.roles.includes('05') ||
+                    this.$store.state.user.roles.includes('01');
+		}
+	},
+	watch: {
+		filterText(val) {
+			this.treeList = this.treeData.filter((res) => {
+				return res.name.includes(val);
+			});
+		}
+	},
+	beforeDestroy () {
+		removeSessionStorage('demonList');
+	},
+	mounted() {
+		this.heightUp = Number(localStore.get('upHeight')?localStore.get('upHeight'):(this.height)/2);
+	},
+	methods: {
+		filterNode(value, data) {
+			if (!value) return true;
+			return data.name.indexOf(value) !== -1;
+		},
+		showContextMenu(e, obj, node, vueElem) {
+			if (obj) {
+				this.node = node;
+				this.selected = obj;
+			}
+		},
+		clickEvent(obj, data, ele) {
+			switch (obj.type) {
+			case 'scriptDesign': {
+				setSessionStorage('designType', 'scriptDesign');
+				this.$router.push({ path: `${UrlConfig.design.scriptHome}/${obj.mapId}?skinCode=${obj.skinCode}` });
+				break;
+			}
+			case 'lessonDesign': {
+				setSessionStorage('designType', 'lessonDesign');
+				this.$router.push({ path: `${UrlConfig.design.lessonHome}/${obj.mapId}/${obj.skinCode}`, query: {cityCode: this.cityCode} });
+				break;
+			}
+			case 'runPlanDesign': {
+				setSessionStorage('designType', 'runPlanDesign');
+				this.$router.push({ path: `${UrlConfig.design.runPlan}/${obj.mapId}?skinCode=${obj.skinCode}` });
+				break;
+			}
+			case 'map': {
+				setSessionStorage('demonList', obj.id);
+			}
+			}
+			// this.$refs.menu.doClose();
+		},
+		// async myrefresh(filterSelect){
+
+		// },
+		async refresh(filterSelect) {
+			this.cityCode=filterSelect;
+			this.loading = true;
+			this.treeData = this.treeList = [];
+			try {
+				const res = await listPublishMap({cityCode: filterSelect});
+				res.data.forEach(elem=>{
+					// debugger;
+					// elem.children.find(n => { return n.name.includes("行调")})
+					elem.children=[
+						// {
+						//     id:'1',
+						//     name:'地图设计',
+						//     type:'mapDesign'
+						// },
+						{
+							id: '2',
+							name: '课程设计',
+							type: 'lessonDesign',
+							mapId: elem.id,
+							skinCode: elem.skinCode
+						},
+						{
+							id: '3',
+							name: '剧本设计',
+							type: 'scriptDesign',
+							mapId: elem.id,
+							skinCode: elem.skinCode
+							// code:elem.children.find(n => { return n.name.includes("行调")})
+						},
+						{
+							id: '4',
+							name: '运行图设计',
+							type: 'runPlanDesign',
+							mapId: elem.id,
+							skinCode: elem.skinCode
+						}
+					];
+				});
+				this.treeData = res.data;
+				this.treeList = this.filterText
+					? res.data.filter(elem => { return elem.name.includes(this.filterText); })
+					: res.data;
+				this.$nextTick(() => {
+					const mapId = getSessionStorage('demonList') || null;
+					this.$refs.tree.setCurrentKey(mapId);
+					this.loading = false;
+				});
+			} catch (error) {
+				this.loading = false;
+				this.$messageBox(this.$t('error.refreshFailed'));
+			}
+		},
+		// refresh1(){
+
+		// },
+		drapHeight(height) {
+			this.heightUp = Number(height);
+		},
+		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 });
+		}
+		// createMap() {
+		//     this.$emit("createMap");
+		// },
+	}
+};
+</script>
+<style rel="stylesheet/scss" lang="scss" scoped>
+    .back-home {
+        float: right;
+        cursor: pointer;
+
+    &:hover {
+         color: #3ea726;
+     }
+    }
+
+    .map-list-main{
+        text-align:left;
+    }
+</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/designPlatform/home.vue b/src/views/designPlatform/home.vue
new file mode 100644
index 000000000..76c1054a8
--- /dev/null
+++ b/src/views/designPlatform/home.vue
@@ -0,0 +1,97 @@
+<template>
+    <el-card :style="{height: height+'px'}">
+        <div class="home-box" :style="{height: height+'px'}">
+            <el-scrollbar wrap-class="scrollbar-wrapper">
+                <h1 class="title">
+                    城市轨道交通设计平台
+                    <!-- <img :src="logo" alt="" class="logo-img"> -->
+                </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>
+            </el-scrollbar>
+        </div>
+    </el-card>
+</template>
+
+<script>
+    import logo from '@/assets/logo.png';
+    import home1 from '@/assets/home/home1.png';
+    import home2 from '@/assets/home/home2.png';
+    import home3 from '@/assets/home/demon1.jpg';
+    import home4 from '@/assets/home/tring1.png';
+    import home5 from '@/assets/home/tring4.jpg';
+    import home6 from '@/assets/home/demon2.jpg';
+    export default {
+        name: 'Home',
+        data() {
+            return {
+                listImg: [
+                    { src: home1 },
+                    { src: home2 },
+                    { src: home3 },
+                    { src: home4 },
+                    { src: home5 },
+                    { src: home6 }
+                ],
+                logo: logo
+            };
+        },
+        computed: {
+            height() {
+                return this.$store.state.app.height - 50;
+            }
+        }
+    };
+</script>
+<style rel="stylesheet/scss" lang="scss" scoped>
+    @import "src/styles/mixin.scss";
+
+    /deep/ .el-carousel {
+        overflow: hidden;
+    }
+
+    .home-box {
+        padding: 15px 100px;
+        float: left;
+        width: 100%;
+        font-family: 'Microsoft YaHei';
+
+    .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/designPlatform/index.vue b/src/views/designPlatform/index.vue
new file mode 100644
index 000000000..2c903257f
--- /dev/null
+++ b/src/views/designPlatform/index.vue
@@ -0,0 +1,110 @@
+<template>
+  <div class="app-wrapper">
+    <el-scrollbar wrap-class="scrollbar-wrapper">
+      <div v-show="listShow" class="examList" :style="{width: widthLeft+'px'}">
+        <demon-list ref="demonList" :height="height" :width="widthLeft" />
+      </div>
+      <drap-left :width-left="widthLeft" @drapWidth="drapWidth" />
+      <transition>
+        <router-view :product-list="productList" />
+      </transition>
+    </el-scrollbar>
+  </div>
+</template>
+
+<script>
+import { mapGetters } from 'vuex';
+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';
+
+export default {
+	name: 'DesignPlatform',
+	components: {
+		demonList,
+		drapLeft
+	},
+	data() {
+		return {
+			listShow: true,
+			widthLeft: Number(localStore.get('LeftWidth')) || 450,
+			productList: [],
+			skinCode: '',
+			currentWidth: ''
+		};
+	},
+	computed: {
+		...mapGetters([
+			'lessonbar'
+		]),
+		height() {
+			return this.$store.state.app.height - 50;
+		},
+		width() {
+			return this.$store.state.app.width;
+		}
+	},
+	watch: {
+		'lessonbar.opened': function (val) {
+			this.listShow = val;
+		},
+		widthLeft(val) {
+			this.setMapResize(val);
+		},
+		'$store.state.app.windowSizeCount': function() {
+			this.resize();
+		}
+	},
+	mounted() {
+		this.currentWidth=this.$store.state.app.width - this.widthLeft;
+		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);
+		},
+		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) {
+			this.currentWidth=this.$store.state.app.width - this.widthLeft;
+			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 {
+        // position: fixed;
+        // top: 61px;
+        float: left;
+        height: 100%;
+    }
+</style>
diff --git a/src/views/designPlatform/userDemonList.vue b/src/views/designPlatform/userDemonList.vue
new file mode 100644
index 000000000..0a44a0655
--- /dev/null
+++ b/src/views/designPlatform/userDemonList.vue
@@ -0,0 +1,252 @@
+<template>
+  <el-card v-loading="loading" class="map-list-main" header="我的地图列表">
+    <el-input v-model="filterText" :placeholder="this.$t('global.filteringKeywords')" clearable />
+    <el-scrollbar wrap-class="scrollbar-wrapper" :style="{ height: (height-185) +'px' }">
+      <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':''}"
+          >&nbsp;{{ tnode.label }}</span>
+        </span>
+      </el-tree>
+    </el-scrollbar>
+    <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>
+    <map-operate-menu
+      ref="menu"
+      :point="point"
+      :edit-model="editModel"
+      :skin-code="skinCode"
+      @refresh="loadInitData"
+      @jlmap3d="jlmap3d"
+    />
+  </el-card>
+</template>
+<script>
+import { DeviceMenu } from '@/scripts/ConstDic';
+import { postBuildMapImport, listMap } from '@/api/jmap/mapdraft';
+import { UrlConfig } from '@/router/index';
+import { removeSessionStorage } from '@/utils/auth';
+import localStore from 'storejs';
+import MapOperateMenu from '@/views/map/mapdraft/mapmanage/operateMenu';
+
+export default {
+	name: 'UserMapList',
+	components: {
+		MapOperateMenu
+	},
+	props: {
+		height: {
+			type: Number,
+			required: true
+		},
+		width: {
+			type: Number,
+			required: true
+		}
+	},
+	data() {
+		return {
+			loading: true,
+			defaultShowKeys: [],
+			filterText: '',
+			treeData: [],
+			treeList: [],
+			selected: {},
+			defaultProps: {
+				children: 'children',
+				label: 'name'
+			},
+			node: {
+			},
+			heightUp: 450,
+			point: {
+				x: 0,
+				y: 0
+			},
+			editModel: {},
+			skinCode: ''
+		};
+	},
+	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.heightUp = Number(localStore.get('upHeight')?localStore.get('upHeight'):(this.height)/2);
+		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();
+				res.data&&res.data.forEach(elem=>{
+					// if(elem.children)
+					// {
+					elem.type='map';
+					elem.children=[
+						{
+							id: '1',
+							name: '地图设计',
+							type: 'mapDesign',
+							mapId: elem.id,
+							mapName: elem.name,
+							skinCode: elem.skinCode
+						},
+						{
+							id: '4',
+							name: '运行图设计',
+							type: 'runPlanDesign',
+							mapId: elem.id,
+							mapName: elem.name,
+							skinCode: elem.skinCode
+						}
+					];
+					// }
+				});
+
+				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}?skinCode=${obj.skinCode}` });
+				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.skinCode = obj.skinCode;
+				this.$store.dispatch('menuOperation/setPopMenu', { position: this.point, menu: menu });
+			} else {
+				// 关掉右键操作
+			}
+		},
+		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>
+    .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;
+    }
+</style>
diff --git a/src/views/designPlatform/userIndex.vue b/src/views/designPlatform/userIndex.vue
new file mode 100644
index 000000000..6bd97a13e
--- /dev/null
+++ b/src/views/designPlatform/userIndex.vue
@@ -0,0 +1,147 @@
+<template>
+  <div class="app-wrapper">
+    <map-create ref="mapCreate" :skin-code="skinCode" @refresh="refresh1" @editmap="handleNodeClick" />
+    <!-- <el-scrollbar wrap-class="scrollbar-wrapper"> -->
+    <div>
+      <div v-show="listShow" class="examList" :style="{width: widthLeft+'px'}">
+        <demon-list ref="demonList" :height="height" :width="widthLeft" @createMap="createMap" />
+      </div>
+      <drap-left :width-left="widthLeft" @drapWidth="drapWidth" />
+      <transition>
+        <!-- position:'relative', -->
+        <!-- :style="{left:widthLeft+'px', width: (width - widthLeft)+'px'}"  -->
+        <router-view :product-list="productList" />
+      </transition>
+    </div>
+
+    <!-- </el-scrollbar> -->
+  </div>
+</template>
+
+<script>
+import { mapGetters } from 'vuex';
+import demonList from './userDemonList';
+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 '@/views/map/mapdraft/mapmanage/create';
+
+export default {
+	name: 'DesignPlatform',
+	components: {
+		demonList,
+		drapLeft,
+		MapCreate
+	},
+	data() {
+		return {
+			listShow: true,
+			widthLeft: Number(localStore.get('LeftWidth')) || 450,
+			productList: [],
+			skinCode: ''
+		};
+	},
+	computed: {
+		...mapGetters([
+			'lessonbar'
+		]),
+		height() {
+			return this.$store.state.app.height - 50;
+		},
+		width() {
+			return this.$store.state.app.width;
+		}
+	},
+	watch: {
+		'lessonbar.opened': function (val) {
+			this.listShow = val;
+		},
+		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();
+		},
+
+		getSkinCode(node) {
+			let next = node;
+			while (next) {
+				if (next.data && next.data.type == 'skin') {
+					this.skinCode = next.data.id;
+					break;
+				}
+				next = next.parent;
+			}
+		},
+		handleNodeClick(obj, node) {
+			this.getSkinCode(node);
+			if (obj && obj.type == 'map') {
+				this.editModel = obj;
+				this.$store.dispatch('menuOperation/setPopMenu', { position: null, menu: null });
+				this.mapSelected({ view: 'draft' });
+			}
+		},
+		mapSelected(data) {
+			if (data && this.editModel) {
+				this.$router.push({ path: `${UrlConfig.map.draft}/${this.editModel.id}/${data.view}`, query: { name: this.editModel.name } });
+			}
+		},
+		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 {
+        // position: fixed;
+        // top: 61px;
+        float: left;
+        height: 100%;
+    }
+</style>
diff --git a/src/views/display/demon/addQuest.vue b/src/views/display/demon/addQuest.vue
index 6f931c78d..d5c2947fb 100644
--- a/src/views/display/demon/addQuest.vue
+++ b/src/views/display/demon/addQuest.vue
@@ -51,7 +51,7 @@
 </template>
 
 <script>
-import { getScriptPageListOnline, getScriptById } from '@/api/script';
+import { getScriptPageListOnline, getScriptById,getDraftScriptById } from '@/api/script';
 
 export default {
 	name: 'AddQuest',
@@ -82,6 +82,7 @@ export default {
 				role: ''
 			},
 			memberList: [],
+			mapLocation:null,
 			queryForm: {
 				labelWidth: '80px',
 				reset: false,
@@ -128,6 +129,7 @@ export default {
 				'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': ''
 			}
 		};
@@ -152,11 +154,15 @@ export default {
 		},
 		async handleLoad(index, row) {
 			this.row = row;
-			const res = await getScriptById(row.id);
+			const res = this.$route.fullPath.includes('design/display/demon')?await getDraftScriptById(row.id):await getScriptById(row.id);
 			let newMemberList = [];
 			if (res.code == 200) {
-				if (res.data.memberVOList && res.data.memberVOList.length > 0) {
-					newMemberList = res.data.memberVOList.filter(item => item.hasPlay === true);
+				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' });
@@ -171,11 +177,8 @@ export default {
 		},
 
 		async confirm() {
-			await this.$store.dispatch('training/over');
-			await this.$store.dispatch('training/setMapDefaultState');
-			await this.$store.dispatch('map/clearJlmapTrainView');
-			await this.$store.dispatch('map/setTrainWindowShow', false);
-			this.$emit('selectQuest', this.row, this.form.role);
+			let 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();
 		},
@@ -186,12 +189,14 @@ export default {
 		},
 
 		checkDisabled(role) {
-			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';
+			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';
+				}
 			}
 		},
 
diff --git a/src/views/display/designIndex.vue b/src/views/display/designIndex.vue
new file mode 100644
index 000000000..8fa96b575
--- /dev/null
+++ b/src/views/display/designIndex.vue
@@ -0,0 +1,651 @@
+<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-replay v-if="isReplay" ref="menuReplay" :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"
+        @runPlanLoadShow="runPlanLoadShow"
+        @runPlanViewShow="runPlanViewShow"
+        @faultChooseShow="faultChooseShow"
+        @runQuestLoadShow="runQuestLoadShow"
+        @runAddRolesLoadShow="runAddRolesLoadShow"
+        @switchMode="switchMode"
+      />
+
+      <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/mapsystem/index';
+import MenuExam from '@/views/display/menuExam';
+import MenuLesson from '@/views/display/menuLesson';
+import MenuReplay from '@/views/display/menuReplay';
+import MenuDemon from '@/views/display/menuDemon';
+import MenuScreen from '@/views/display/menuScreen';
+import MenuSchema from '@/views/display/menuSchema';
+import MenuSystemTime from '@/views/display/menuSystemTime';
+import MenuPlan from '@/views/display/menuPlan';
+import MenuScript from '@/views/display/menuScript';
+import AddQuest from './demon/addQuest';
+import Scheduling from './demon/scheduling';
+import { mapGetters } from 'vuex';
+import { getTrainingDetail, getTrainingStepsDetail } from '@/api/jmap/training';
+import { setGoodsTryUse } from '@/api/management/goods';
+import { getProductDetail } from '@/api/management/mapprd';
+import { runDiagramQuit, loadScript, getSimulationInfo } from '@/api/simulation';
+import { OperateMode, TrainingMode } from '@/scripts/ConstDic';
+import { checkLoginLine } from '@/api/login';
+import { loadMapData, loadMapDataById } from '@/utils/loaddata';
+import { EventBus } from '@/scripts/event-bus';
+import Vue from 'vue';
+import { UrlConfig } from '@/router/index';
+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,
+		MenuExam,
+		MenuLesson,
+		MenuReplay,
+		MapSystemDraft,
+		MenuPlan,
+		MenuDemon,
+		MenuScreen,
+		MenuScript,
+		MenuSchema,
+		MenuSystemTime,
+		Jl3dSimulation,
+		Jl3dDrive,
+		Scheduling
+	},
+	props: {
+		size: {
+			type: Object,
+			default() {
+				return null;
+			}
+		}
+	},
+	data() {
+		return {
+			mode: '',
+			trainingObj: {},
+			timeDemonNum: 0,
+			checkLine: null,
+			offset: 15,
+			mouseNum: 1,
+			ierval: null,
+			mouseNumTime: 0,
+			mapBox: null,
+			mapBoxP: null,
+			panelShow: true,
+			simulationShow: false,
+			drivingShow: false,
+			questId: 0, 		// 加载任务的Id
+			group: '',
+			prdTypeMap: {
+				'01': '01', 	// 现地 => 现地
+				'02': '02', 	// 行调 => 行调
+				'04': '02', 	// 司机 => 行调
+				'05': ''		// 派班 => null
+			},
+			isDrive: this.prdType == '04',
+			isShowScheduling: this.prdType == '05'
+		};
+	},
+	computed: {
+		...mapGetters([
+			'canvasWidth',
+			'canvasHeight'
+		]),
+		...mapGetters('map', [
+			'map'
+		]),
+		...mapGetters('training', [
+			'offsetStationCode'
+		]),
+		...mapGetters('config', [
+			'canvasId'
+		]),
+		width() {
+			return this.$store.state.app.width;
+		},
+		height() {
+			return this.$store.state.app.height;
+		},
+		right() {
+			return this.$store.state.config.width / 2 - 55;
+		},
+		trainingId() {
+			return this.$route.query.trainingId;
+		},
+		mapId() {
+			return this.$route.query.mapId;
+		},
+		prdType() {
+			// return this.$route.query.prdType;
+			return this.$store.state.training.prdType;
+		},
+		skinCode() {
+			return this.$route.query.skinCode;
+		},
+		isLesson() {
+			return this.mode === 'teach' || this.mode === 'record' || this.mode === 'manage';
+		},
+		isExam() {
+			return this.mode === 'exam';
+		},
+		isDemon() {
+			return this.mode === 'demon';
+		},
+		isScreen() {
+			return this.mode === 'dp';
+		},
+		isReplay() {
+			return this.mode === 'replay';
+		},
+		isScript() {
+			return this.mode === 'script';
+		},
+		isPlan() {
+			return this.mode === 'plan';
+		}
+		// isDrive() {
+		// 	return this.prdType == '04';
+		// },
+		// isShowScheduling() {
+		// 	return this.prdType == '05';
+		// }
+	},
+	watch: {
+		'$store.state.config.menuBarLoadedCount': function (val) {
+			this.setPosition();
+		},
+		'$store.state.map.mapViewLoadedCount': function (val) {
+			this.mapBoxP = document.getElementById(this.canvasId).children[0];
+			this.mapBox = document.getElementsByTagName('canvas');
+
+			if (this.trainingId) {
+				getTrainingStepsDetail(this.trainingId, { group: this.group }).then(resp => {
+					this.trainingObj = resp.data;
+					this.$store.dispatch('training/setTrainingData', this.trainingObj);
+				});
+			}
+
+		},
+		'$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();
+	},
+	async beforeDestroy() {
+		await this.clearAllTimer();
+		if (!this.isReplay) {
+			await this.quit();
+		}
+		await this.$store.dispatch('training/reset');
+		await this.$store.dispatch('map/mapClear');
+		EventBus.$off('clearCheckLogin');
+	},
+	methods: {
+		// 清除检查在线定时器
+		clearAllTimer() {
+			if (this.ierval) {
+				clearTimeout(this.ierval);
+				this.ierval = null;
+			}
+
+			if (this.checkLine) {
+				clearTimeout(this.checkLine);
+				this.checkLine = null;
+			}
+		},
+		// 设置检查在线定时器
+		checkLoginLineTimer() {
+			if (this.checkLine) {
+				clearTimeout(this.checkLine);
+			}
+
+			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 {
+				if (!this.isReplay) {
+					await this.loadSimulationInfo();
+				}
+
+				if (this.isReplay) {
+					await this.initLoadReplayData();
+				} else if (this.isDemon) {
+					await this.initLoadDemonData();
+				} else if (this.isScreen) {
+					await this.initLoadScreenData();
+				} else if (this.isPlan) {
+					await this.initLoadTestRunData();
+				} else if (this.isScript) {
+					await this.initLoadTaskData();
+				} else {
+					await this.initLoadLessonOrExamData();
+				}
+
+				this.checkLoginLineTimer();
+				this.checkMouseStatusTimer();
+			} catch (error) {
+				this.$messageBox(`初始化失败: ${error.message}`);
+				this.endViewLoading();
+			}
+		},
+		// 课程和考试系统
+		async initLoadLessonOrExamData() {
+			this.$store.dispatch('training/end', null);
+			this.$store.dispatch('training/changeOperateMode', { mode: OperateMode.NORMAL }); // 默认为正常模式
+
+			if (parseInt(this.trainingId)) {
+				// 设置地图数据
+				// 设置实训数据
+				const resp = await getTrainingDetail(this.trainingId);
+				if (resp && resp.code == 200) {
+					const detail = resp.data;
+					const rest = await getProductDetail(detail.prdCode);
+					if (rest && rest.code == 200) {
+						const data = rest.data;
+						await this.$store.dispatch('training/setPrdType', data.prdType);
+						await this.loadMapData(detail.skinCode);
+					}
+				} else {
+					this.$messageBox(`获取实训步骤数据失败`);
+					this.endViewLoading();
+				}
+			} else {
+				this.endViewLoading();
+			}
+		},
+		// 回放系统
+		async initLoadReplayData() {
+			this.$store.dispatch('training/end', TrainingMode.NORMAL);
+			this.$store.dispatch('training/changeOperateMode', { mode: OperateMode.NORMAL }); // 默认为正常模式
+			this.$store.dispatch('training/setPrdType', '');
+
+			if (parseInt(this.skinCode)) {
+				await this.loadMapData(this.skinCode);
+
+			} 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.skinCode)) {
+				await this.loadMapData(this.skinCode);
+
+			} else {
+				this.endViewLoading();
+			}
+		},
+		// 大屏系统请求
+		async initLoadScreenData() {
+			this.$store.dispatch('training/end', TrainingMode.NORMAL);
+			this.$store.dispatch('training/changeOperateMode', { mode: OperateMode.NORMAL }); // 默认为正常模式
+			this.$store.dispatch('training/setPrdType', '01');
+
+			if (parseInt(this.skinCode)) {
+				await this.loadMapData(this.skinCode);
+
+			} 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.skinCode)) {
+				await this.loadMapData(this.skinCode);
+
+			} else {
+				this.endViewLoading();
+			}
+		},
+		// 加载剧本
+		async runQuestLoadShow() {
+			this.$refs.addQuest.doShow();
+		},
+		async runAddRolesLoadShow() {
+			// this.$refs.addQuest.doShow();
+			const row={id: this.$route.query.scriptId};
+			this.$refs.addQuest.handleLoad(1, row);
+		},
+		// 选择脚本
+		async selectQuest(row, id, mapLocation, roleName) {
+			try {
+				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;
+		},
+		// 加载地图数据
+		async loadMapData(skinCode) {
+			try {
+				await loadMapData(skinCode);
+				await this.$store.dispatch('training/setMapDefaultState');
+			} catch (error) {
+				this.$messageBox(`获取地图数据失败: ${error.message}`);
+				this.endViewLoading();
+			}
+		},
+
+		// 通过id加载地图数据
+		async loadMapDataById(mapId) {
+			try {
+				await loadMapDataById(mapId);
+				await this.$store.dispatch('training/setMapDefaultState');
+			} catch (error) {
+				this.$messageBox(`获取地图数据失败: ${error.message}`);
+				this.endViewLoading();
+			}
+		},
+
+		// 销毁仿真
+		async quit() {
+			await runDiagramQuit(this.group);
+			await this.$store.dispatch('training/over');
+		},
+		// 仿真错误时，被动退出时调用
+		async back() {
+			if (this.isExam) {
+				await this.$refs.menuExam.back();
+			} else if (this.isLesson) {
+				await this.$refs.lessonMenu.back();
+			} else if (this.isDemon) {
+				await this.$refs.menuDemon.back();
+			} else if (this.isScreen) {
+				await this.$refs.menuScreen.back();
+			} else if (this.isPlan) {
+				await this.$refs.menuPlan.back();
+			} else if (this.isScript) {
+				await this.$refs.menuScript.back();
+			}
+		},
+		// 设置使用时间
+		async tryTime(param) {
+			const data = {
+				goodsId: param.goodsId,
+				time: param.time
+			};
+			if (data.goodsId) {
+				await setGoodsTryUse(data);
+			}
+		},
+		switchMode(prdType) {
+			this.$store.dispatch('training/setPrdType', prdType);
+		},
+		hidepanel() {
+			if (this.isDrive) {
+				this.panelShow = false;
+				this.drivingShow = true;
+				this.$refs.Jl3dDrive.show(this.skinCode);
+			} else {
+				this.panelShow = false;
+				this.simulationShow = true;
+				this.$refs.Jl3dSimulation.show(this.skinCode);
+			}
+		},
+		showScheduling() {
+			this.$refs.scheduling.doShow();
+		},
+		showpanel() {
+			this.panelShow = true;
+			this.simulationShow = false;
+		},
+		showdriving() {
+			this.panelShow = true;
+			this.drivingShow = false;
+		},
+		runPlanViewShow() {
+			this.$refs.runPlanView.doShow();
+		},
+		runPlanLoadShow() {
+			this.$refs.runPlanLoad.doShow();
+		},
+		faultChooseShow() {
+			this.$refs.faultChoose.doShow();
+		},
+		setWindowSize() {
+			this.$nextTick(() => {
+				const width = this.size ? this.size.width : this.width;
+				const height = this.size ? this.size.height : this.height;
+
+				this.$store.dispatch('config/resize', { width, height });
+
+				this.$store.dispatch('training/updateOffsetStationCode', { offsetStationCode: this.offsetStationCode });
+			});
+		}
+	}
+};
+</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/display/index.vue b/src/views/display/index.vue
index b4d39ad94..efa1ddac3 100644
--- a/src/views/display/index.vue
+++ b/src/views/display/index.vue
@@ -38,6 +38,7 @@
         @runPlanViewShow="runPlanViewShow"
         @faultChooseShow="faultChooseShow"
         @runQuestLoadShow="runQuestLoadShow"
+        @runAddRolesLoadShow="runAddRolesLoadShow"
         @switchMode="switchMode"
       />
 
@@ -236,6 +237,7 @@ export default {
 		$route() {
 			this.$nextTick(() => {
 				this.initLoadData();
+				console.log(1111);
 			});
 		}
 	},
@@ -470,25 +472,35 @@ export default {
 		async runQuestLoadShow() {
 			this.$refs.addQuest.doShow();
 		},
+		async runAddRolesLoadShow() {
+			// this.$refs.addQuest.doShow();
+			const row={id: this.$route.query.scriptId};
+			this.$refs.addQuest.handleLoad(1, row);
+		},
 		// 选择脚本
-		async selectQuest(row, id) {
+		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 (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 (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) {
-					this.$refs.menuDemon.initLoadPage();
+					await this.$refs.menuDemon.initLoadPage();
 				}
 
 				if (this.$refs.menuScript) {
-					this.$refs.menuScript.initLoadPage();
+					await this.$refs.menuScript.initLoadPage();
 				}
+
 			} catch (error) {
 				this.$messageBox(error.message);
 			}
diff --git a/src/views/display/menuExam.vue b/src/views/display/menuExam.vue
index d68d5f586..51dfcf9c6 100644
--- a/src/views/display/menuExam.vue
+++ b/src/views/display/menuExam.vue
@@ -24,6 +24,7 @@ import { exitFullscreen } from '@/utils/screen';
 import { timeFormat } from '@/utils/date';
 import { refreshExamList, finishOneExamQuestion } from '@/api/management/userexam';
 import { launchFullscreen } from '@/utils/screen';
+import { UrlConfig } from '@/router/index';
 
 export default {
 	name: 'MenuExam',
@@ -124,7 +125,7 @@ export default {
 				type: 'warning'
 			}).then(() => {
 				this.$emit('quit');
-				this.$router.push({ path: `/exam/home` });
+				this.$router.push({ path: `${UrlConfig.trainingPlatform.examDetail}/${this.$route.query.examId}`, query: { subSystem: this.$route.query.subSystem }});
 				Notification.closeAll();
 				exitFullscreen();
 			}).catch(() => {
@@ -141,7 +142,7 @@ export default {
 			}).catch(error => {
 				// 如果时50009则表示考试已完成，不能再次进行y
 				if (error.code === 500009) {
-					this.$router.replace({ path: `/exam/result/${this.$route.params.userExamId}` });
+					this.$router.replace({ path: `/trainingPlatform/result/${this.$route.params.userExamId}`, query: {subSystem: this.$route.query.subSystem} });
 				} else {
 					this.$messageBox(this.$t('display.exam.refreshListError'));
 				}
diff --git a/src/views/display/menuSchema.vue b/src/views/display/menuSchema.vue
index a43b2ab0b..795ad2701 100644
--- a/src/views/display/menuSchema.vue
+++ b/src/views/display/menuSchema.vue
@@ -5,7 +5,9 @@
     </el-select>
 
     <el-button-group>
-      <el-button v-if="isDemon" size="small" :disabled="viewDisabled" type="success" @click="viewRunQuest">{{$t('display.schema.loadScript')}}</el-button>
+		<!-- viewRunQuest -->
+	  <el-button v-if="isDemon && isDesignPlatform" size="small" :disabled="viewDisabled" type="success" @click="viewScriptRoles">{{$t('display.schema.selectRoles')}}</el-button>
+      <el-button v-if="isDemon && !isDesignPlatform" size="small" :disabled="viewDisabled" type="success" @click="viewRunQuest">{{$t('display.schema.loadScript')}}</el-button>
       <el-button v-if="notScript && runing" size="small" :disabled="viewDisabled" @click="viewRunPlan">{{$t('display.schema.previewRunDiagram')}}</el-button>
       <el-button v-if="!runing && !isPlan && notScript" size="small" :disabled="viewDisabled" type="warning" @click="loadRunPlan">{{$t('display.schema.loadRunDiagram')}}</el-button>
       <el-button v-if="mode==OperateMode.FAULT" size="small" type="danger" @click="setFault">{{$t('display.schema.faultSetting')}}</el-button>
@@ -22,6 +24,7 @@ import { mapGetters } from 'vuex';
 import { OperateMode } from '@/scripts/ConstDic';
 import { getStationListBySkinCode, queryRunPlan } from '@/api/runplan';
 import { getEveryDayRunPlanData } from '@/api/simulation';
+import {getRpDetailByUserMapId} from '@/api/designPlatform';
 
 export default {
 	name: 'MenuSchema',
@@ -64,6 +67,9 @@ export default {
 		},
 		isDemon() {
 			return this.$route.params.mode === 'demon';
+		},
+		isDesignPlatform(){
+			return this.$route.fullPath.includes('design/display/demon');
 		}
 	},
 	watch: {
@@ -90,14 +96,28 @@ export default {
 					getStationListBySkinCode(opt.skinCode).then(response => {
 						this.$store.dispatch('runPlan/setStations', response.data).then(() => {
 							if (this.$route.params.mode == 'plan') {
-								// 测试运行图功能
-								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'));
-								});
+								// debugger;
+								if(this.$route.query.from=="user"){
+									// 测试运行图功能
+									getRpDetailByUserMapId(this.$route.query.planId).then(resp => {
+										this.$store.dispatch('runPlan/setPlanData', resp.data);
+										this.viewDisabled = false;
+									}).catch(() => {
+										this.$store.dispatch('runPlan/setPlanData', []);
+										this.$messageBox(this.$t('display.schema.getRunDiagramFail'));
+									});
+								}else{
+									// 测试运行图功能
+									queryRunPlan(this.$route.query.planId).then(resp => {
+										this.$store.dispatch('runPlan/setPlanData', resp.data);
+										this.viewDisabled = false;
+									}).catch(() => {
+										this.$store.dispatch('runPlan/setPlanData', []);
+										this.$messageBox(this.$t('display.schema.getRunDiagramFail'));
+									});
+								}
+								
+
 							} else {
 								getEveryDayRunPlanData(this.group).then(resp => {
 									this.$store.dispatch('runPlan/setPlanData', resp.data);
@@ -136,6 +156,9 @@ export default {
 		viewRunQuest() {
 			this.$emit('runQuestLoadShow');
 		},
+		viewScriptRoles(){
+			this.$emit('runAddRolesLoadShow');
+		},
 		switchMode(swch) {
 			this.$emit('switchMode', swch);
 		}
diff --git a/src/views/display/menuSystemTime.vue b/src/views/display/menuSystemTime.vue
index 722e0954e..4ce31fc56 100644
--- a/src/views/display/menuSystemTime.vue
+++ b/src/views/display/menuSystemTime.vue
@@ -1,17 +1,12 @@
 <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>
+      <span class="display-pause">{{ $t('display.systemTime.timePause') }}</span>
     </template>
     <template v-else>
       <system-time
         class="display-time"
         :time="time"
-        :zoom="1.3"
-        :width="110"
-        :height="32"
-        :fine="2"
-        :top="2"
       />
 
     </template>
@@ -77,8 +72,9 @@ export default {
 	}
 
 	.display-time{
-        border: 2px solid white;
-        border-radius: 4px;
+		padding: 3px 5px;
+		box-shadow: 0px 0px 5px #eee;
+        border-radius: 3px;
 	}
 
     .display-card .el-row {
diff --git a/src/views/display/tipExamList.vue b/src/views/display/tipExamList.vue
index 00a62c000..ad55ebf76 100644
--- a/src/views/display/tipExamList.vue
+++ b/src/views/display/tipExamList.vue
@@ -191,7 +191,7 @@ export default {
 			}).catch(error => {
 				// 如果时50009则表示考试已完成，不能再次进行y
 				if (error.code === 500009) {
-					this.$router.replace({ path: `/exam/result/${this.$route.params.userExamId}` });
+					this.$router.replace({ path: `/trainingPlatform/result/${this.$route.params.userExamId}`, query: { subSystem: this.$route.query.subSystem } });
 				} else {
 					this.$messageBox(this.$t('display.exam.refreshListError'));
 
@@ -233,7 +233,9 @@ export default {
 				group: this.$route.query.group,
 				userExamId: this.$route.query.userExamId,
 				trainingId: obj.trainingId,
-				examQuestionId: obj.id
+				examQuestionId: obj.id,
+				subSystem: this.$route.query.subSystem,
+				examId: this.$route.query.examId
 			};
 			this.$router.push({ path: '/display/exam', query: query });
 			this.$emit('refresh');
@@ -260,7 +262,7 @@ export default {
 			exitFullscreen();
 			this.$store.dispatch('exam/over').then(() => {
 				this.$store.dispatch('trainingList/clearTrainingList');
-				this.$router.replace({ path: `/exam/result/${this.$route.query.userExamId}` });
+				this.$router.replace({ path: `/trainingPlatform/result/${this.$route.query.userExamId}`, query: {subSystem: this.$route.query.subSystem} });
 			});
 		},
 		shrink() {
diff --git a/src/views/error-page/404.vue b/src/views/error-page/404.vue
index 03e20fcd5..c94ad1250 100644
--- a/src/views/error-page/404.vue
+++ b/src/views/error-page/404.vue
@@ -15,21 +15,25 @@
         <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>
-        <a href="" class="bullshit__return-home">Back to home</a>
+        <button @click="back" class="bullshit__return-home">Back</button>
       </div>
     </div>
   </div>
 </template>
 
 <script>
-
 export default {
 	name: 'Page404',
 	computed: {
 		message() {
 			return 'The webmaster said that you can not enter this page...'
 		}
-	}
+	},
+    methods: {
+        back() {
+	        this.$router.go(-1);
+        }
+    }
 }
 </script>
 
diff --git a/src/views/exam/detail/courseDetail.vue b/src/views/exam/detail/courseDetail.vue
index 2e1e3daeb..d0fafacaa 100644
--- a/src/views/exam/detail/courseDetail.vue
+++ b/src/views/exam/detail/courseDetail.vue
@@ -4,20 +4,29 @@
       <b>{{ $t('exam.courseName') + ':  '+ courseModel.name }}</b>
     </div>
     <div style=" margin:50px" :style="{ height: height - 150 +'px' }">
-      <!-- <p style="font-size: 14px; margin-bottom: 20px"> 课程说明:
-        <span style="color: #808080 !important;">
-          {{ courseModel.remarks }}
-        </span>
-      </p> -->
       <el-tabs v-model="activeName">
         <el-tab-pane :label="this.$t('exam.itemList')" name="first">
-          <div v-if="courseModel.detail.length != 0" :style="{ height: height - 230 +'px' }">
+          <div v-if="courseModel.treeList.length != 0" :style="{ height: height - 230 +'px' }">
             <el-scrollbar wrap-class="scrollbar-wrapper">
-              <template v-for="item in courseModel.detail">
-                <ul :key="item.code" type="circle">
-                  <li>{{ item.name }}</li>
-                </ul>
-              </template>
+              <el-tree
+                ref="tree"
+                :data="courseModel.treeList"
+                node-key="id"
+                :props="defaultProps"
+                :filter-node-method="filterNode"
+                highlight-current
+                :span="22"
+                :default-expanded-keys="expandList"
+                @node-click="clickEvent"
+                @node-expand="nodeExpand"
+                @node-collapse="nodeCollapse"
+              >
+                <span slot-scope="{ node }">
+                  <span v-if="valid||node.data.trial" class="el-icon-goods" />
+                  <span v-else class="el-icon-sold-out" />
+                  <span :style="{color: node.data.trial||valid ?'green':'black'}">&nbsp;{{ node.label }}</span>
+                </span>
+              </el-tree>
             </el-scrollbar>
           </div>
           <div v-else class="noList">
@@ -38,6 +47,7 @@
       <el-button v-if="hasPermssion" type="primary" @click="distribute">{{ $t('exam.distributePermission') }}</el-button>
       <el-button v-if="hasPermssion" type="primary" @click="transfer">{{ $t('global.transferQRCode') }}</el-button>
       <el-button v-if="isAddRule" type="primary" @click="checkCourse">{{ $t('exam.viewCoursePapers') }}</el-button>
+      <el-button type="primary" @click="backLessonList">返回课程列表</el-button>
     </div>
   </el-card>
 </template>
@@ -46,6 +56,7 @@ import { getCourseLessonDetail } from '@/api/management/exam';
 import { PermissionType } from '@/scripts/ConstDic';
 import { UrlConfig } from '@/router/index';
 import LimitList from '@/views/components/limits/index';
+import { getSessionStorage, setSessionStorage } from '@/utils/auth';
 
 export default {
 	name: 'ExamDetailView',
@@ -61,10 +72,17 @@ export default {
 				price: 0,
 				remarks: '',
 				detail: [],
-				pmsList: []
+				pmsList: [],
+				treeList: []
 			},
 			EffectiveTypeList: [],
-			activeName: 'first'
+			activeName: 'first',
+			defaultProps: {
+				children: 'children',
+				label: 'name'
+			},
+			expandList: [],
+			valid: false
 		};
 	},
 	computed: {
@@ -85,46 +103,49 @@ export default {
 		}
 	},
 	watch: {
-		'$route.params.lessonId': function (val) {
-			this.loadInitPage(val);
+		'$route.params.subSystem': function (val) {
+			this.loadInitPage();
 		}
 	},
 	mounted() {
 		this.$Dictionary.effectiveType().then(list => {
 			this.EffectiveTypeList = list;
 		});
-		this.loadInitPage(this.$route.params.lessonId);
+		this.loadInitPage();
 	},
 	methods: {
-		loadInitPage(lessonId = this.$route.params.lessonId) {
-			if (lessonId) {
-				getCourseLessonDetail({ lessonId: lessonId }).then(res => {
+		loadInitPage() {
+			getCourseLessonDetail({lessonId: this.$route.query.lessonId}).then(resp =>{
+				if (resp.data) {
 					this.courseModel = {
-						id: res.data.id,
-						name: res.data.name,
-						skinCode: res.data.skinCode,
-						price: res.data.price,
-						remarks: res.data.remarks,
-						detail: res.data.examDefinitionVOList || [],
-						pmsList: res.data.permissionVOList || [],
-						prdCode: res.data.prdCode,
-						mapId: res.data.mapId,
-						PermissionType: PermissionType.EXAM
+						id: resp.data.id,
+						name: resp.data.name,
+						pmsList: resp.data.permissionList || [],
+						prdCode: resp.data.prdCode,
+						mapId: resp.data.mapId,
+						PermissionType: PermissionType.EXAM,
+						treeList: resp.data.examDefinitionList
 					};
-				});
-			}
+				}
+				if (this.courseModel.pmsList && this.courseModel.pmsList.length >0) {
+					this.valid = true;
+				}
+				this.getExpandList(this.courseModel.id);
+			}).catch(()=>{
+				this.$messageBox('获取考试信息失败！');
+			});
 		},
 		buy() {
 			this.loading = true;
 			this.$router.push({
-				path: `${UrlConfig.exam.pay}/${this.$route.params.lessonId}`,
-				query: { permissionType: PermissionType.EXAM, lessonId: this.$route.params.lessonId, prdCode: this.courseModel.prdCode, mapId: this.courseModel.mapId }
+				path: `${UrlConfig.trainingPlatform.pay}/${this.courseModel.id}`,
+				query: { permissionType: PermissionType.EXAM, lessonId: this.courseModel.id, prdCode: this.courseModel.prdCode, mapId: this.courseModel.mapId, subSystem: this.$route.params.subSystem }
 			});
 		},
 		checkCourse() {
 			this.loading = true;
 			this.$router.push({
-				path: `${UrlConfig.exam.examRuleManage}`,
+				path: `${UrlConfig.trainingPlatform.examRuleManage}`,
 				query: { lessonId: this.courseModel.id }
 			});
 		},
@@ -141,6 +162,43 @@ export default {
 				this.activeName = 'second';
 				this.$refs.limitList.distribute(this.courseModel);
 			}
+		},
+		clickEvent(obj, node, data) {
+			if (this.valid || obj.trial) {
+				this.$router.push({ path: `${UrlConfig.trainingPlatform.examDetail}/${obj.id}`, query: { subSystem: this.$route.params.subSystem }});
+			} else {
+				this.$confirm(this.$t('tip.accessCourseNo'), this.$t('tip.hint'), {
+					confirmButtonText: this.$t('tip.confirm'),
+					cancelButtonText: this.$t('tip.cancel')
+				}).then(() => {
+					this.buy();
+				}).catch(() => { });
+			}
+		},
+		filterNode(value, data) {
+			if (!value) return true;
+			return data.name.indexOf(value) !== -1;
+		},
+		nodeExpand(obj, node, ele) {
+			const key = obj.id;
+			this.expandList = this.expandList.filter(item => item!==key);
+			this.expandList.push(key);
+			setSessionStorage('trainingExamExpandList'+this.courseModel.id, this.expandList);
+		},
+		nodeCollapse(obj, node, ele) {
+			const key = obj.id;
+			this.expandList = this.expandList.filter(item => item!==key);
+			setSessionStorage('trainingExamExpandList'+this.courseModel.id, this.expandList);
+		},
+		getExpandList(id) {
+			let expand = getSessionStorage('trainingExamExpandList'+id);
+			expand = expand?(expand+'').split(','):'';
+			if (expand instanceof Array) {
+				this.expandList = expand;
+			}
+		},
+		backLessonList() {
+			this.$router.push({ path: `${UrlConfig.trainingPlatform.examHome}/${this.$route.params.subSystem}`});
 		}
 	}
 };
diff --git a/src/views/exam/detail/examDetail.vue b/src/views/exam/detail/examDetail.vue
index 06a9504df..c69aa427c 100644
--- a/src/views/exam/detail/examDetail.vue
+++ b/src/views/exam/detail/examDetail.vue
@@ -6,7 +6,7 @@
     <div style="margin:50px; overflow-y: auto;">
       <el-scrollbar wrap-class="scrollbar-wrapper" :style="{ height: height - 190 +'px' }">
         <p class="list-item">
-          <span class="list-label">{{ $t('exam.examStartTime') +':'}}</span>
+          <span class="list-label">{{ $t('exam.examStartTime') +':' }}</span>
           <span v-if="examDetails.startTime" class="list-elem">
             {{ examDetails.startTime }} - {{ examDetails.endTime }}</span>
           <span v-else class="list-elem">{{ $t('exam.theExamIsReadyAnyTime') }}</span>
@@ -17,15 +17,15 @@
         </p>
         <p class="list-item">
           <span class="list-label">{{ $t('exam.examTimeAvailable') + ':' }}</span>
-          <span class="list-elem">{{ parseInt(examDetails.duration) / 60  + $t('global.minutes') }}</span>
+          <span class="list-elem">{{ parseInt(examDetails.duration) / 60 + $t('exam.minutes') }}</span>
         </p>
         <p class="list-item">
           <span class="list-label">{{ $t('exam.fullMarksInTheExam') + ':' }}</span>
-          <span class="list-elem">{{ examDetails.fullPoint + $t('exam.points') }}</span>
+          <span class="list-elem">{{ examDetails.fullPoint }}</span>
         </p>
         <p class="list-item">
           <span class="list-label">{{ $t('exam.passMarkTheExam') + ':' }}</span>
-          <span class="list-elem">{{ examDetails.passingPoint + $t('exam.points') }}</span>
+          <span class="list-elem">{{ examDetails.passingPoint }}</span>
         </p>
         <p class="list-item">
           <span class="list-label">{{ $t('exam.examinationRules') + ':' }}</span>
@@ -44,6 +44,7 @@
     </div>
     <div class="btn-start">
       <el-button :loading="loading" type="primary" @click="exmaStart">{{ $t('exam.startTheExam') }}</el-button>
+      <el-button @click="back">{{ $t('global.back') }}</el-button>
     </div>
   </el-card>
 </template>
@@ -153,8 +154,8 @@ export default {
 			this.loading = true;
 			getPublishLessonDetail({ id: this.examDetails.lessonId }).then((res) => {
 				this.$router.push({
-					path: `${UrlConfig.exam.pay}/${this.examDetails.lessonId}`,
-					query: { permissionType: PermissionType.EXAM, prdCode: res.data.prdCode, mapId: res.data.mapId }
+					path: `${UrlConfig.trainingPlatform.pay}/${this.examDetails.lessonId}`,
+					query: { permissionType: PermissionType.EXAM, lessonId: this.examDetails.lessonId, prdCode: res.data.prdCode, mapId: res.data.mapId }
 				});
 			}).catch(() => {
 				this.$messageBox(this.$t('error.obtainCourseDetailsFailed'));
@@ -199,7 +200,9 @@ export default {
 						group: resp.data,
 						trainingId: this.examList[0].trainingId,
 						userExamId: this.userExam.id,
-						examQuestionId: this.examList[0].id
+						examQuestionId: this.examList[0].id,
+						subSystem: this.$route.query.subSystem,
+						examId: this.$route.params.examId
 					};
 					this.$router.push({ path: `${UrlConfig.display}/exam`, query: query });
 					launchFullscreen();
@@ -210,6 +213,9 @@ export default {
 			} else {
 				this.loading = false;
 			}
+		},
+		back() {
+			this.$router.push({ path: `${UrlConfig.trainingPlatform.course}/${this.$route.query.subSystem}`, query: {lessonId: this.examDetails.lessonId}});
 		}
 	}
 };
diff --git a/src/views/exam/detail/questionDetail.vue b/src/views/exam/detail/questionDetail.vue
index 26a3a9931..812480d65 100644
--- a/src/views/exam/detail/questionDetail.vue
+++ b/src/views/exam/detail/questionDetail.vue
@@ -105,7 +105,7 @@ export default {
 			}).then(() => {
 				// 放弃试卷接口
 				setExamGive(this.$route.query.userExamId).then(() => {
-					this.$router.push({ path: '/exam/home' });
+                    this.$router.back();
 				});
 			}).catch(() => {
 				this.loading = false;
diff --git a/src/views/exam/index.vue b/src/views/exam/index.vue
index ddbd2d71c..8db0c5593 100644
--- a/src/views/exam/index.vue
+++ b/src/views/exam/index.vue
@@ -1,70 +1,69 @@
 <template>
-  <div class="app-wrapper">
-    <el-scrollbar wrap-class="scrollbar-wrapper">
-      <div v-show="listShow" class="examList" :style="{width: widthLeft+'px'}">
-        <exam-list ref="examlList" :height="height" />
+  <div style="height: 100%; padding-bottom: 20px">
+    <el-card>
+      <div slot="header" style="text-align: center;">
+        <b>考试系统</b>
       </div>
-      <drap-left :width-left="widthLeft" @drapWidth="drapWidth" />
-      <transition>
-        <router-view />
-      </transition>
-    </el-scrollbar>
+    </el-card>
+    <el-card v-loading="loading">
+      <el-table
+        :data="tableData"
+        border
+        style="width: 100%"
+      >
+        <el-table-column
+          prop="name"
+          label="课程"
+        />
+        <el-table-column
+          prop="remarks"
+          show-overflow-tooltip
+          label="说明"
+        />
+        <el-table-column
+          label="操作"
+        >
+          <template slot-scope="scope">
+            <el-button size="mini" type="primary" @click="goLesson(scope.row)">
+              进入考试
+            </el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+    </el-card>
   </div>
 </template>
 
 <script>
-import { mapGetters } from 'vuex';
-import ExamList from './list/examList';
-import drapLeft from '@/views/components/drapLeft/index';
-import localStore from 'storejs';
+import { getSubSystemDetail } from '@/api/trainingPlatform';
+import { UrlConfig } from '@/router/index';
 
 export default {
-	name: 'Exam',
-	components: {
-		ExamList,
-		drapLeft
-	},
+	name: 'ExamHome',
 	data() {
 		return {
-			listShow: true,
-			widthLeft: Number(localStore.get('LeftWidth')) || 450
+			tableData: [],
+			loading: false
 		};
 	},
-	computed: {
-		...mapGetters([
-			'lessonbar'
-		]),
-		height() {
-			return this.$store.state.app.height;
-		}
-	},
-	watch: {
-		'lessonbar.opened': function (val) {
-			this.listShow = val;
-		}
+	mounted() {
+		this.loadInitPage();
 	},
 	methods: {
-		refresh() {
-			this.$refs && this.$refs.examlList && this.$refs.examlList.refresh();
+		loadInitPage() {
+			if (this.$route.params.subSystem) {
+				getSubSystemDetail(this.$route.params.subSystem).then(resp =>{
+					if (resp.data) {
+						this.tableData = resp.data.lessonList;
+					}
+				}).catch(()=>{
+					this.$messageBox('获取考试信息失败！');
+				});
+			}
 		},
-		drapWidth(width) {
-			this.widthLeft = Number(width);
+		goLesson(row) {
+			this.$router.push({ path: `${UrlConfig.trainingPlatform.course}/${this.$route.params.subSystem}`, query: {lessonId: row.id}});
 		}
 	}
 };
 </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;
-    }
-</style>
diff --git a/src/views/exam/list/examList.vue b/src/views/exam/list/examList.vue
deleted file mode 100644
index 832d6bee8..000000000
--- a/src/views/exam/list/examList.vue
+++ /dev/null
@@ -1,165 +0,0 @@
-<template>
-  <el-card v-loading="loading" class="map-list-main">
-    <div slot="header" class="clearfix">
-      <span>{{ $t('exam.itemList') }}</span>
-    </div>
-    <filter-city
-      ref="filerCity"
-      is-cascader
-      filter-empty
-      :query-function="queryFunction"
-      @filterSelectChange="refresh"
-    />
-    <el-input v-model="filterText" :placeholder="this.$t('global.filteringKeywords')" clearable />
-    <el-scrollbar wrap-class="scrollbar-wrapper" :style="{ height: (height-175) +'px' }">
-      <el-tree
-        ref="tree"
-        :data="treeData"
-        :props="defaultProps"
-        node-key="id"
-        :default-expanded-keys="defaultShowKeys"
-        :filter-node-method="filterNode"
-        highlight-current
-        :expand-on-click-node="true"
-        :span="22"
-        @node-contextmenu="showContextMenu"
-        @node-click="clickEvent"
-      >
-        <span slot-scope="{ node: tnode }" class="custom-tree-node">
-          <span
-            v-if="tnode.data.type === 'lesson'"
-            :class="tnode.data.valid? 'el-icon-sold-out':'el-icon-goods'"
-          >
-            <span
-              v-if="tnode.data.type === 'lesson'"
-              :style="{color: tnode.data.valid ? 'green':''}"
-              class="el-icon-tickets"
-            ></span>
-          </span>
-          <span v-if="tnode.data.type === 'exam'" :class="tnode.data.valid? 'el-icon-sold-out':'el-icon-goods'">
-            <span
-              v-if="tnode.data.type === 'exam'"
-              :style="{color: tnode.data.valid ? 'green':''}"
-              class="el-icon-edit-outline"
-            ></span>
-          </span>
-            <span :style="{color: tnode.data.valid ? 'green':''}">&nbsp;{{ tnode.label }}</span>
-        </span>
-      </el-tree>
-    </el-scrollbar>
-  </el-card>
-</template>
-<script>
-import { getCourseLessonTree } from '@/api/management/exam';
-import { PermissionType } from '@/scripts/ConstDic';
-import { UrlConfig } from '@/router/index';
-import FilterCity from '@/views/components/filterCity';
-
-export default {
-	name: 'ExamDetailList',
-	components: {
-		FilterCity
-	},
-	props: {
-		height: {
-			type: Number,
-			required: true
-		}
-	},
-	data() {
-		return {
-			loading: true,
-			defaultShowKeys: [],
-			queryFunction: getCourseLessonTree,
-			filterText: '',
-			treeData: [],
-			selected: {},
-			defaultProps: {
-				children: 'children',
-				label: 'name'
-			},
-			node: {
-			}
-		};
-	},
-	computed: {
-		role() {
-			return this.$store.state.user.roles.includes('04') ||
-                    this.$store.state.user.roles.includes('05') ||
-                    this.$store.state.user.roles.includes('01');
-		}
-	},
-	watch: {
-		filterText(val) {
-			this.treeData.filter((res) => {
-				return res.name.includes(val);
-			});
-		}
-	},
-	methods: {
-		filterNode(value, data) {
-			if (!value) return true;
-			return data.name.indexOf(value) !== -1;
-		},
-		showContextMenu(e, obj, node, vueElem) {
-			if (obj) {
-				this.node = node;
-				this.selected = obj;
-			}
-		},
-		buy(data) {
-			this.$router.push({
-				path: `${UrlConfig.exam.pay}/${data.lessonId}`, query:
-                        { permissionType: PermissionType.EXAM, lessonId: data.lessonId, prdCode: data.prdCode, mapId: data.mapId }
-			});
-		},
-		clickEvent(obj) {
-			if (obj.type === 'lesson') {
-				this.$router.push({ path: `${UrlConfig.exam.course}/${obj.id}` });
-			} else {
-				this.$router.push({ path: `${UrlConfig.exam.detail}/${obj.id}` });
-			}
-		},
-		refresh(filterSelect) {
-			const params = { mapId: filterSelect[1] };
-
-			this.loading = true;
-			getCourseLessonTree(params).then(res => {
-				this.treeData = res.data;
-				this.defaultShowKeys = [this.$route.params.examId];
-				this.$nextTick(() => {
-					this.loading = false;
-					this.$refs.tree.setCurrentKey(this.$route.params.examId); // value 绑定的node-key
-					if (this.filterText) {
-						this.treeData.filter((res) => {
-							return res.name.includes(this.filterText);
-						});
-					}
-				});
-			}).catch(() => {
-				this.loading = false;
-				this.$messageBox('刷新失败');
-			});
-		}
-	}
-};
-</script>
-<style rel="stylesheet/scss" lang="scss" scoped>
-    .back-home {
-        float: right;
-        cursor: pointer;
-
-        &:hover {
-            color: #3ea726;
-        }
-    }
-</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/exam/result.vue b/src/views/exam/result.vue
index 76da7ff3a..f277c59db 100644
--- a/src/views/exam/result.vue
+++ b/src/views/exam/result.vue
@@ -118,7 +118,7 @@ export default {
 		},
 		back() {
 			const examId = this.resultModel.examId;
-			this.$router.push(`${UrlConfig.exam.detail}/${examId}`);
+			this.$router.push({path: `${UrlConfig.trainingPlatform.examDetail}/${examId}`,  query: { subSystem: this.$route.query.subSystem }});
 		}
 	}
 };
diff --git a/src/views/jlmap3d/drive/jl3ddrive.vue b/src/views/jlmap3d/drive/jl3ddrive.vue
index 38cd4ccb8..0f22e8fd8 100644
--- a/src/views/jlmap3d/drive/jl3ddrive.vue
+++ b/src/views/jlmap3d/drive/jl3ddrive.vue
@@ -172,7 +172,7 @@ export default {
 		init: function (skinCode) {
 			const mapdata = this.$store.getters['map/map'];
 			const dom = document.getElementById('app');
-			this.jlmap3d = new JLmapDriving(dom, mapdata, skinCode);
+			this.jlmap3d = new JLmapDriving(dom, mapdata, skinCode,this.$store);
 			this.jlmap3d.eventon();
       this.cctvshow = false;
 
@@ -285,7 +285,9 @@ export default {
   .trainstatus{
     left:0;
     top:0;
-    width:350px;
+    width:fit-content;
+    width:-webkit-fit-content;
+    width:-moz-fit-content;
     height:30px;
     background: #000000;
     position:absolute;
diff --git a/src/views/jlmap3d/simulation/jl3dsimulation.vue b/src/views/jlmap3d/simulation/jl3dsimulation.vue
index 7d3014b41..53c415ef6 100644
--- a/src/views/jlmap3d/simulation/jl3dsimulation.vue
+++ b/src/views/jlmap3d/simulation/jl3dsimulation.vue
@@ -11,7 +11,7 @@
         <el-button type="primary" @click="raysignal">{{$t('jlmap3d.turnoutCheck')}}</el-button>
         <el-button type="primary" @click="back">{{$t('global.back')}}</el-button>
       </el-button-group>
-	  
+
 
 
     </div>
@@ -117,10 +117,9 @@ export default {
 			}
 		},
 		init: function (skinCode) {
-			console.log('three');
 			const mapdata = this.$store.getters['map/map'];
 			const dom = document.getElementById('app');
-			this.jlmap3d = new JLmap3d(dom, mapdata, skinCode);
+			this.jlmap3d = new JLmap3d(dom, mapdata, skinCode,this.$store);
 			this.jlmap3d.eventon();
 		},
 		raystand() {
diff --git a/src/views/jointTraining/index.vue b/src/views/jointTraining/index.vue
index 40e914356..81fee4a96 100644
--- a/src/views/jointTraining/index.vue
+++ b/src/views/jointTraining/index.vue
@@ -121,7 +121,7 @@ export default {
 					await this.$store.dispatch('training/over');
 					await runDiagramOver(this.group);
 					await deljointTrainRoom(this.group);
-					await this.$router.push({ path: `/demonstration/detail/${this.mapId}` });
+					await this.$router.push({ path: `/trainingPlatform/detail/${this.subSystem}`, query: {mapId: this.mapId} });
 				}
 			});
 		},
@@ -149,6 +149,7 @@ export default {
 		this.group = this.$route.query.group;
 		this.mapId = this.$route.query.mapId;
 		this.skinCode = this.$route.query.skinCode;
+		this.subSystem = this.$route.query.subSystem;
 		Message.closeAll();
 	},
 	async mounted() {
diff --git a/src/views/jointTraining/menuDemon.vue b/src/views/jointTraining/menuDemon.vue
index 127776a62..a0847e377 100644
--- a/src/views/jointTraining/menuDemon.vue
+++ b/src/views/jointTraining/menuDemon.vue
@@ -298,7 +298,7 @@ export default {
 		back() {
 			this.$store.dispatch('training/over').then(() => {
 				putJointTrainingSimulationUser(this.group).then(() => {
-					this.$router.push({ path: `/trainroom`, query: { group: this.group } });
+					this.$router.push({ path: `/trainroom`, query: { skinCode: this.$route.query.skinCode, group: this.group, subSystem: this.$route.query.subSystem } });
 					exitFullscreen();
 				});
 			});
diff --git a/src/views/lesson/details.vue b/src/views/lesson/details.vue
new file mode 100644
index 000000000..60fc6aea4
--- /dev/null
+++ b/src/views/lesson/details.vue
@@ -0,0 +1,112 @@
+<template>
+  <el-card>
+    <div slot="header" style="text-align: center;">
+      <b>{{ $t('lesson.courseName') + ':  '+ name }}</b>
+    </div>
+    <div style="display: flex;align-items:flex-start">
+      <div class="tree_box">
+        <el-scrollbar wrap-class="scrollbar-wrapper" :style="{ height: (height-50) +'px' }">
+          <el-tree
+            ref="tree"
+            style="width: 380px"
+            :data="treeList"
+            node-key="id"
+            :props="defaultProps"
+            default-expand-all
+            highlight-current
+            :span="22"
+            :filter-node-method="filterNode"
+            :default-expanded-keys="expandList"
+            @node-contextmenu="showContextMenu"
+            @node-click="clickEvent"
+          />
+        </el-scrollbar>
+      </div>
+      <transition>
+        <router-view />
+      </transition>
+    </div>
+  </el-card>
+</template>
+
+<script>
+import { getLessonTree } from '@/api/jmap/lessondraft';
+import { DeviceMenu } from '@/scripts/ConstDic';
+export default {
+	name: 'LessonDetail',
+	data() {
+		return {
+			treeList: [],
+			defaultProps: {
+				children: 'children',
+				label: 'name',
+				disabled: this.showNode
+			},
+			name: '',
+			lessonId: '',
+			expandList: []
+		};
+	},
+	computed: {
+		width() {
+			return this.$store.state.app.width - 481 - this.widthLeft;
+		},
+		height() {
+			return this.$store.state.app.height - 120;
+		}
+	},
+	mounted() {
+		this.initPageData();
+	},
+	methods: {
+		initPageData() {
+			getLessonTree(this.$route.query.lessonId || this.$route.query.id).then(resp => {
+				if (resp.data && resp.data[0]) {
+					this.name = resp.data[0].name;
+					this.lessonId = resp.data[0].id;
+					this.treeList = resp.data;
+				}
+
+				this.editLesson();
+			});
+
+		},
+		clickEvent(obj, node, ele) {
+		},
+		filterNode(value, data) {
+			if (!value) return true;
+			return data.name.indexOf(value) !== -1;
+		},
+		editLesson() {
+			this.$router.push( {path: `/design/lesson/details/edit/lessonEdit`, query: {id: this.treeList[0].id, skinCode: this.$route.query.skinCode}} );
+		},
+		showNode(obj) {
+			return obj.type !== 'Training';
+		},
+		showContextMenu(e, obj, node, vueElem) {
+			if (obj && obj.type === 'TrainingType' || obj.type === 'Training') {
+				e.preventDefault();
+				this.point = {
+					x: e.clientX,
+					y: e.clientY
+				};
+				this.node = node;
+				const menu = DeviceMenu.Training;
+				this.$store.dispatch('menuOperation/setPopMenu', { position: this.point, menu: menu });
+			}
+		}
+	}
+};
+</script>
+<style rel="stylesheet/scss" lang="scss" scoped>
+    @import "src/styles/mixin.scss";
+
+    .tree_box{
+        position: relative;
+        left: 10px;
+        width: 400px;
+        padding-right: 10px;
+    }
+    .right_box{
+    }
+</style>
diff --git a/src/views/lesson/home.vue b/src/views/lesson/home.vue
new file mode 100644
index 000000000..9a9e49b91
--- /dev/null
+++ b/src/views/lesson/home.vue
@@ -0,0 +1,360 @@
+<template>
+  <div style="height: 100%; overflow: hidden">
+    <el-card>
+      <div class="button_group">
+        <el-button v-if="hasRelease" size="mini" @click="trainingManage">{{ $t('lesson.trainingManage') }}</el-button>
+        <el-button v-if="hasRelease" size="mini" @click="taskManage">{{ $t('lesson.taskManage') }}</el-button>
+        <el-button v-if="hasRelease" size="mini" @click="operationManage">{{ $t('lesson.trainingRule') }}</el-button>
+        <el-button size="mini" type="primary" @click="lessonCreateByPublish">{{ $t('lesson.createNewCoursesFromRelease') }}</el-button>
+        <el-button size="mini" type="primary" @click="lessonCreate">{{ $t('lesson.newConstruction') }}</el-button>
+      </div>
+    </el-card>
+    <el-card v-loading="loading">
+      <!--<el-table-->
+      <!--:data="tableData"-->
+      <!--row-key="id"-->
+      <!--border-->
+      <!--default-expand-all-->
+      <!--:tree-props="{children: 'children', hasChildren: 'hasChildren'}"-->
+      <!--&gt;-->
+      <!--<el-table-column-->
+      <!--prop="name"-->
+      <!--border-->
+      <!--:label="this.$t('lesson.lesson')"-->
+      <!--/>-->
+      <!--<el-table-column-->
+      <!--:label="this.$t('global.status')"-->
+      <!--&gt;-->
+      <!--<template slot-scope="scope">-->
+      <!--<span>{{ handlerStatus(scope.row) }}</span>-->
+      <!--</template>-->
+      <!--</el-table-column>-->
+      <!--<el-table-column-->
+      <!--prop="explanation"-->
+      <!--show-overflow-tooltip-->
+      <!--:label="this.$t('lesson.rejectReason')"-->
+      <!--/>-->
+      <!--<el-table-column-->
+      <!--width="500"-->
+      <!--:label="this.$t('global.operate')"-->
+      <!--&gt;-->
+      <!--<template slot-scope="scope">-->
+      <!--<el-button-->
+      <!--v-if="scope.row.status!=='1'"-->
+      <!--size="mini"-->
+      <!--type="primary"-->
+      <!--@click="createChapter(scope.row)"-->
+      <!--&gt;{{ scope.row.type==='lesson'? $t('lesson.createChapter'):$t('lesson.updateChapter') }}</el-button>-->
+      <!--<el-button-->
+      <!--v-if="scope.row.status==='1'"-->
+      <!--size="mini"-->
+      <!--type="primary"-->
+      <!--@click="goDetail(scope.row)"-->
+      <!--&gt;-->
+      <!--{{ $t('lesson.review') }}-->
+      <!--</el-button>-->
+      <!--<el-button-->
+      <!--v-if="scope.row.type === 'lesson' && scope.row.status!=='1'"-->
+      <!--size="mini"-->
+      <!--type="primary"-->
+      <!--plain-->
+      <!--@click="treeSort(scope.row)"-->
+      <!--&gt;{{ $t('lesson.contentSorting') }}</el-button>-->
+      <!--<el-button-->
+      <!--v-if="scope.row.type === 'lesson'&& scope.row.status!=='1'"-->
+      <!--size="mini"-->
+      <!--type="info"-->
+      <!--@click="editLesson(scope.row)"-->
+      <!--&gt;{{ $t('lesson.editCourse') }}</el-button>-->
+      <!--<el-button-->
+      <!--v-if="scope.row.type === 'lesson'&& scope.row.status==='0'"-->
+      <!--size="mini"-->
+      <!--type="primary"-->
+      <!--@click="publish(scope.row)"-->
+      <!--&gt;{{ hasRelease?$t('global.release'):$t('lesson.applicationForRelease') }}</el-button>-->
+      <!--<el-button-->
+      <!--v-if="scope.row.type === 'lesson'&& scope.row.status!=='1'"-->
+      <!--size="mini"-->
+      <!--type="danger"-->
+      <!--@click="deleteLesson(scope.row)"-->
+      <!--&gt;{{ $t('global.delete') }}</el-button>-->
+      <!--<el-button-->
+      <!--v-if="scope.row.status ==='1'"-->
+      <!--size="mini"-->
+      <!--type="danger"-->
+      <!--@click="revertLesson(scope.row)"-->
+      <!--&gt;-->
+      <!--{{ $t('lesson.withdraw') }}-->
+      <!--</el-button>-->
+      <!--</template>-->
+      <!--</el-table-column>-->
+      <!--</el-table>-->
+      <QueryListPage ref="queryListPage" :query-form="queryForm" :pager-config="pagerConfig" :query-list="queryList" />
+    </el-card>
+    <publish-create ref="publishCreate" @refresh="refresh" />
+    <publish-lesson ref="publishLesson" @refresh="refresh" />
+    <lesson-detail ref="lessonDetail" />
+  </div>
+</template>
+
+<script>
+import { releaseOrCancel } from '@/api/designPlatform';
+import { getLessonDrftList } from '@/api/jmap/lessondraft';
+import { UrlConfig } from '@/router/index';
+import PublishCreate from './lessoncategory/edit/create';
+import PublishLesson from './lessoncategory/edit/lesson/publish';
+import { delLesson, getLessonTree } from '@/api/jmap/lessondraft';
+import LessonDetail from '@/views/approval/lesson/detail';
+import ConstConfig from '@/scripts/ConstConfig';
+
+export default {
+	name: 'LessonHome',
+	components: {
+		PublishCreate,
+		PublishLesson,
+		LessonDetail
+	},
+	data() {
+		return {
+			tableData: [],
+			loading: false,
+			showEdit: false,
+			pagerConfig: {
+				pageSize: 'pageSize',
+				pageIndex: 'pageNum'
+			},
+			queryForm: {
+				show: false
+			},
+			queryList: {
+				query: getLessonDrftList,
+				selectCheckShow: false,
+				indexShow: true,
+				columns: [
+					{
+						title: '课程名称',
+						prop: 'name'
+					},
+					{
+						title: '课程说明',
+						prop: 'remarks'
+					},
+					{
+						title: '状态',
+						prop: 'status',
+						type: 'tag',
+						columnValue: (row) => {
+							return this.$convertField(row.status, ConstConfig.ConstSelect.releaseReview, ['value', 'label']);
+						},
+						tagType: (row) => { return 'success'; }
+					},
+					{
+						title: '驳回说明',
+						prop: 'explanation'
+					},
+					{
+						type: 'button',
+						title: this.$t('global.operate'),
+						width: '400',
+						buttons: [
+							{
+								name: this.$t('lesson.contentSorting'),
+								handleClick: this.treeSort,
+								type: 'primary',
+								showControl: (row) => {
+									return row.status!=='1';
+								}
+							},
+							{
+								name: this.$t('global.release'),
+								handleClick: this.publish,
+								type: 'primary',
+								showControl: (row) => {
+									return row.status ==='0'&&this.hasRelease;
+								}
+							},
+							{
+								name: this.$t('lesson.applicationForRelease'),
+								handleClick: this.publish,
+								type: 'primary',
+								showControl: (row) => {
+									return row.status ==='0'&& !this.hasRelease;
+								}
+							},
+							{
+								name: this.$t('global.delete'),
+								handleClick: this.deleteLesson,
+								type: 'danger',
+								showControl: (row) => {
+									return row.status !=='1';
+								}
+							},
+							{
+								name: this.$t('lesson.withdraw'),
+								handleClick: this.revertLesson,
+								type: 'danger',
+								showControl: (row) => {
+									return row.status ==='1';
+								}
+							},
+							{
+								name: '课程详情',
+								handleClick: this.goDetail,
+								type: 'primary'
+							}
+						]
+					}
+				],
+				actions: [
+					/* { text: this.$t('global.create'), btnCode: 'employee_insert', handler: this.handleCreateRunPlan }*/
+				]
+			}
+
+		};
+	},
+	computed: {
+		mapId() {
+			return this.$route.params.mapId;
+		},
+		hasRelease() {
+			return this.$store.state.user.roles.includes('04') ||
+                    this.$store.state.user.roles.includes('05');
+		}
+	},
+	watch: {
+		$route() {
+			this.refresh();
+		}
+	},
+	mounted() {
+	},
+	methods: {
+		loadInitData() {
+			getLessonTree(this.$route.params.skinCode).then(response=> {
+				response.data.forEach(elem => {
+					if (elem.children) {
+						elem.children.forEach( it => {
+							it.parentId = elem.id;
+						} );
+					}
+				});
+				this.tableData = response.data;
+				this.loading = false;
+			}).catch(( ) => {
+				this.$messageBox(this.$t('error.getDraftCourseDataFailed'));
+			});
+		},
+		refuse() {
+			this.loading = true;
+			getLessonTree(this.$route.params.skinCode).then(response=> {
+				response.data.forEach(elem => {
+					if (elem.children) {
+						elem.children.forEach( it => {
+							it.parentId = elem.id;
+						} );
+					}
+				});
+				this.tableData = response.data;
+				this.loading = false;
+			});
+		},
+		handlerStatus(row) {
+			let lessonStatus = '';
+			switch (row.status) {
+			case '0':
+				lessonStatus = this.$t('lesson.notRelease');
+				break;
+			case '1':
+				lessonStatus = this.$t('lesson.pendingReview');
+				break;
+			case '2':
+				lessonStatus = this.$t('lesson.published');
+				break;
+			case '3':
+				lessonStatus = this.$t('lesson.rejected');
+				break;
+			}
+			return lessonStatus;
+		},
+		refresh() {
+			this.$refs.queryListPage.refresh(true);
+		},
+		editLesson(row) {
+			this.$router.push( {path: `${UrlConfig.design.lessonEdit}/lessonEdit`, query: {id: row.id, skinCode: row.code}} );
+		},
+		lessonCreate() {
+			this.$router.push({ path: `${UrlConfig.design.lessonEdit}/lessonCreate`, query: {skinCode: this.$route.params.skinCode} });
+		},
+		lessonCreateByPublish() {
+			this.$nextTick(() => {
+				this.$refs.publishCreate.doShow();
+			});
+		},
+		publish(index, row) {
+			row.skinCode = this.$route.params.skinCode;
+			row.cityCode = this.$route.query.cityCode;
+			this.$refs.publishLesson.doShow(row);
+		},
+		deleteLesson(index, row) {
+			delLesson(row).then(response => {
+				this.$message.success(this.$t('tip.successfullyDelete'));
+				this.loading = true;
+				this.refresh();
+			}).catch(() => {
+				this.$messageBox(this.$t('tip.failDelete'));
+			});
+		},
+		createChapter(index, row) {
+			if (row.type === 'Lesson') {
+				this.$router.push({path: `${UrlConfig.design.lessonEdit}/chapterCreate`, query: {lessonId: row.id}});
+			} else if (row.type === 'Chapter') {
+				this.$router.push( {path: `${UrlConfig.design.lessonEdit}/chapterEdit`, query: {id: row.id, lessonId: row.parentId}} );
+			}
+		},
+		treeSort(index, row) {
+			this.$router.push({path: `${UrlConfig.design.lessonEdit}/treeSort`, query: row});
+		},
+		taskManage() {
+			this.$router.push({path: `${UrlConfig.design.taskManage}`, query: {mapId: this.$route.params.mapId, skinCode: this.$route.params.skinCode}});
+		},
+		trainingManage() {
+			this.$router.push({path: `${UrlConfig.design.trainingManage}/${this.$route.params.skinCode}`, query: {mapId: this.$route.params.mapId}});
+		},
+		operationManage() {
+			this.$router.push({path: `${UrlConfig.design.trainingRule}`, query: {mapId: this.$route.params.mapId, skinCode: this.$route.params.skinCode}});
+		},
+		revertLesson(index, row) {
+			this.$confirm(this.$t('tip.cancelCoursePublicationHint'), this.$t('global.tips'), {
+				confirmButtonText: this.$t('global.confirm'),
+				cancelButtonText: this.$t('global.cancel'),
+				type: 'warning'
+			}).then(() => {
+				releaseOrCancel(row.id, '0').then(response => {
+					this.loading = false;
+					this.$message.success(this.$t('tip.cancelTheSuccessfulApplicationOfTheCourseRelease'));
+					this.refresh();
+				}).catch(() => {
+					this.loading = false;
+					this.$messageBox(this.$t('tip.cancellationOfCoursePublicationApplicationFailed'));
+					this.refresh();
+				});
+			});
+		},
+		goDetail(index, row) {
+			// this.$refs.lessonDetail.show(row.id);
+			this.$router.push({path: `/design/lesson/details`, query: {lessonId: row.id, skinCode: this.$route.params.skinCode}});
+		}
+	}
+};
+</script>
+<style rel="stylesheet/scss" lang="scss" scoped>
+    .draft {
+        width: 400px;
+        text-align: center;
+        margin: 20px auto;
+    }
+    .button_group {
+        float: right;
+        margin: 20px 10px;
+    }
+</style>
diff --git a/src/views/lesson/lessoncategory/category/tree.vue b/src/views/lesson/lessoncategory/category/tree.vue
index 2540127b5..5f2438e14 100644
--- a/src/views/lesson/lessoncategory/category/tree.vue
+++ b/src/views/lesson/lessoncategory/category/tree.vue
@@ -1,168 +1,186 @@
 <template>
-    <el-card class="map-list-main" v-loading="loading">
-        <div slot="header" class="clearfix">
-            <span>{{$t('lesson.courseList')}}</span>
-            <el-button type="text" @click="publishCreate" style="float: right; padding: 3px 0">{{$t('lesson.createNewCoursesFromRelease')}}</el-button>
-        </div>
-        <el-input :placeholder="this.$t('global.filteringKeywords')" v-model="filterText" clearable> </el-input>
-        <el-scrollbar wrapClass="scrollbar-wrapper" :style="{height: (height - 55)  + 'px'}">
-            <el-tree ref="lessonTree" :data="treeData" :props="defaultProps" :filter-node-method="filterNode"
-                @node-contextmenu="showContextMenu" draggable :allow-drop="allowDrop" :allow-drag="allowDrag"
-                @node-drag-end="handleDragEnd" expand-on-click-node highlight-current @node-click="clickEvent" :span=22>
-                <span slot-scope="{ node, data }">
-                    <span v-if="node.data.type === 'skin'" class="el-icon-news"></span>
-                    <span v-if="node.data.type === 'lesson'" class="el-icon-tickets"></span>
-                    <span v-if="node.data.type === 'chapter'" class="el-icon-document"></span>
-                    <span>&nbsp;{{ node.label }}</span>
-                </span>
-            </el-tree>
-        </el-scrollbar>
-        <tree-operate-menu ref="treeOperateMenu" :point="point" :selected="selected" @refresh="refresh"
-            @lessonCreate="lessonCreate" @chapterCreate="chapterCreate" @treeSort="treeSort"></tree-operate-menu>
-    </el-card>
+  <el-card v-loading="loading" class="map-list-main">
+    <div slot="header" class="clearfix">
+      <span>{{ $t('lesson.courseList') }}</span>
+      <el-button type="text" style="float: right; padding: 3px 0" @click="publishCreate">{{ $t('lesson.createNewCoursesFromRelease') }}</el-button>
+    </div>
+    <el-input v-model="filterText" :placeholder="this.$t('global.filteringKeywords')" clearable />
+    <el-scrollbar wrap-class="scrollbar-wrapper" :style="{height: (height - 55) + 'px'}">
+      <el-tree
+        ref="lessonTree"
+        :data="treeData"
+        :props="defaultProps"
+        :filter-node-method="filterNode"
+        draggable
+        :allow-drop="allowDrop"
+        :allow-drag="allowDrag"
+        expand-on-click-node
+        highlight-current
+        :span="22"
+        @node-contextmenu="showContextMenu"
+        @node-drag-end="handleDragEnd"
+        @node-click="clickEvent"
+      >
+        <span slot-scope="{ node }">
+          <span v-if="node.data.type === 'skin'" class="el-icon-news" />
+          <span v-if="node.data.type === 'lesson'" class="el-icon-tickets" />
+          <span v-if="node.data.type === 'chapter'" class="el-icon-document" />
+          <span>&nbsp;{{ node.label }}</span>
+        </span>
+      </el-tree>
+    </el-scrollbar>
+    <tree-operate-menu
+      ref="treeOperateMenu"
+      :point="point"
+      :selected="selected"
+      @refresh="refresh"
+      @lessonCreate="lessonCreate"
+      @chapterCreate="chapterCreate"
+      @treeSort="treeSort"
+    />
+  </el-card>
 </template>
 <script>
-    import { getLessonTree, dragSortLessonChapter } from '@/api/jmap/lessondraft'
-    import { DeviceMenu } from '@/scripts/ConstDic';
-    import TreeOperateMenu from './operateMenu';
-    import FilterCity from '@/views/components/filterCity';
+import { getLessonTree, dragSortLessonChapter } from '@/api/jmap/lessondraft';
+import { DeviceMenu } from '@/scripts/ConstDic';
+import TreeOperateMenu from './operateMenu';
+import FilterCity from '@/views/components/filterCity';
 
-    export default {
-        name: 'TrainingOperate',
-        components: {
-            TreeOperateMenu,
-        },
-        props: {
-            height: {
-                type: Number
-            }
-        },
-        data() {
-            return {
-                loading: true,
-                defaultProps: {
-                    children: 'children',
-                    label: 'name'
-                },
-                filterText: '',
-                node: {},
-                selected: {},
-                menuoper: {},
-                treeData: [],
-                point: {
-                    x: 0,
-                    y: 0
-                }
-            }
-        },
-        watch: {
-            filterText(val) {
-                this.$refs.lessonTree.filter(val);
-            }
-        },
-        mounted() {
-            this.refresh();
-        },
-        methods: {
-            filterNode(value, data) {
-                if (!value) return true;
-                return data.name.indexOf(value) !== -1;
-            },
-            allowDrop(draggingNode, dropNode, type) {
-                if (draggingNode && draggingNode.data.type === 'chapter') {
-                    return dropNode && dropNode.data.type === 'chapter';
-                } else if (draggingNode && draggingNode.data.type === 'training') {
-                    return dropNode && dropNode.data.type === 'training' && type !== 'inner' && draggingNode.parent == dropNode.parent;
-                }
-            },
-            allowDrag(draggingNode) {
-                return draggingNode && (draggingNode.data.type === 'chapter' || draggingNode.data.type === 'training');
-            },
-            handleDragEnd(draggingNode, dropNode, dropType, ev) {
-                if (draggingNode && dropNode && dropType !== 'none') {
-                    let lesson = this.getLeesonId(dropNode);
-                    let lessonId = lesson.data.id;
-                    let model = {
-                        location: dropType,
-                        sourceId: draggingNode.data.id,
-                        sourceType: draggingNode.data.type,
-                        targetId: dropNode.data.id,
-                        targetType: dropNode.data.type,
-                        lessonId: lessonId,
-                        chapterId: dropNode.parent.data.id
-                    }
-                    let that = this;
-                    dragSortLessonChapter(model).then(response => {
-                    })
-                }
-            },
-            getLeesonId(node) {
-                if (null !== node.parent.parent) {
-                    return this.getLeesonId(node.parent);
-                } else {
-                    return node;
-                }
-            },
-            showContextMenu(e, obj, node, vueElem) {
-                if (obj && (obj.type == 'lesson' || obj.type == 'chapter')) {
-                    e.preventDefault();
-                    this.point = {
-                        x: e.clientX,
-                        y: e.clientY
-                    }
-                    this.node = node;
-                    this.selected = obj;
-                    let menu = DeviceMenu.Lesson;
-                    this.$store.dispatch('menuOperation/setPopMenu', { position: this.point, menu: menu });
-                }
-            },
-            clickEvent(obj, node, vueElem) {
-                this.$store.dispatch('menuOperation/setPopMenu', { position: null, menu: null });
-                if (obj.type === 'skin') {
-                    this.$emit('lessonCreate', node);
-                } else if (obj.type === 'lesson') {
-                    this.$emit('lessonEdit', node);
-                } else if (obj.type === 'chapter') {
-                    this.$emit('chapterEdit', node);
-                }
-            },
-            chapterCreate() {
-                this.$emit('chapterCreate', this.node);
-            },
-            lessonCreate() {
-                this.$emit('lessonCreate', this.node);
-            },
-            publishCreate() {
-                this.$emit('publishCreate', this.node);
-            },
-            treeSort() {
-                this.$emit('treeSort', this.node);
-            },
-            convertTreeData(list) {
-                let tree = [];
-                if (list && list.length) {
-                    /*去除列表的training节点*/
-                    list.forEach(elem => {
-                        elem.children = this.convertTreeData(elem.children);
-                        if (elem.type !== 'training') {
-                            tree.push(elem);
-                        }
-                    })
-                }
-                return tree;
-            },
-            refresh() {
-                this.loading = true;
-                getLessonTree().then(response => {
-                    this.treeData = this.convertTreeData(response.data);
-                    this.$nextTick(() => { this.loading = false; });
-                }).catch(error => {
-                    this.$messageBox(this.$t('error.refreshFailed'));
-                    this.loading = false;
-                });
-            }
-        }
-    }
+export default {
+	name: 'TrainingOperate',
+	components: {
+		TreeOperateMenu
+	},
+	props: {
+		height: {
+			type: Number
+		}
+	},
+	data() {
+		return {
+			loading: true,
+			defaultProps: {
+				children: 'children',
+				label: 'name'
+			},
+			filterText: '',
+			node: {},
+			selected: {},
+			menuoper: {},
+			treeData: [],
+			point: {
+				x: 0,
+				y: 0
+			}
+		};
+	},
+	watch: {
+		filterText(val) {
+			this.$refs.lessonTree.filter(val);
+		}
+	},
+	mounted() {
+		this.refresh();
+	},
+	methods: {
+		filterNode(value, data) {
+			if (!value) return true;
+			return data.name.indexOf(value) !== -1;
+		},
+		allowDrop(draggingNode, dropNode, type) {
+			if (draggingNode && draggingNode.data.type === 'chapter') {
+				return dropNode && dropNode.data.type === 'chapter';
+			} else if (draggingNode && draggingNode.data.type === 'training') {
+				return dropNode && dropNode.data.type === 'training' && type !== 'inner' && draggingNode.parent == dropNode.parent;
+			}
+		},
+		allowDrag(draggingNode) {
+			return draggingNode && (draggingNode.data.type === 'chapter' || draggingNode.data.type === 'training');
+		},
+		handleDragEnd(draggingNode, dropNode, dropType, ev) {
+			if (draggingNode && dropNode && dropType !== 'none') {
+				const lesson = this.getLeesonId(dropNode);
+				const lessonId = lesson.data.id;
+				const model = {
+					location: dropType,
+					sourceId: draggingNode.data.id,
+					sourceType: draggingNode.data.type,
+					targetId: dropNode.data.id,
+					targetType: dropNode.data.type,
+					lessonId: lessonId,
+					chapterId: dropNode.parent.data.id
+				};
+				dragSortLessonChapter(model).then(response => {
+				});
+			}
+		},
+		getLeesonId(node) {
+			if (node.parent.parent !== null) {
+				return this.getLeesonId(node.parent);
+			} else {
+				return node;
+			}
+		},
+		showContextMenu(e, obj, node, vueElem) {
+			if (obj && (obj.type == 'lesson' || obj.type == 'chapter')) {
+				e.preventDefault();
+				this.point = {
+					x: e.clientX,
+					y: e.clientY
+				};
+				this.node = node;
+				this.selected = obj;
+				const menu = DeviceMenu.Lesson;
+				this.$store.dispatch('menuOperation/setPopMenu', { position: this.point, menu: menu });
+			}
+		},
+		clickEvent(obj, node, vueElem) {
+			this.$store.dispatch('menuOperation/setPopMenu', { position: null, menu: null });
+			if (obj.type === 'skin') {
+				this.$emit('lessonCreate', node);
+			} else if (obj.type === 'lesson') {
+				this.$emit('lessonEdit', node);
+			} else if (obj.type === 'chapter') {
+				this.$emit('chapterEdit', node);
+			}
+		},
+		chapterCreate() {
+			this.$emit('chapterCreate', this.node);
+		},
+		lessonCreate() {
+			this.$emit('lessonCreate', this.node);
+		},
+		publishCreate() {
+			this.$emit('publishCreate', this.node);
+		},
+		treeSort() {
+			this.$emit('treeSort', this.node);
+		},
+		convertTreeData(list) {
+			const tree = [];
+			if (list && list.length) {
+				/* 去除列表的training节点*/
+				list.forEach(elem => {
+					elem.children = this.convertTreeData(elem.children);
+					if (elem.type !== 'training') {
+						tree.push(elem);
+					}
+				});
+			}
+			return tree;
+		},
+		refresh() {
+			this.loading = true;
+			getLessonTree().then(response => {
+				this.treeData = this.convertTreeData(response.data);
+				this.$nextTick(() => { this.loading = false; });
+			}).catch(() => {
+				this.$messageBox(this.$t('error.refreshFailed'));
+				this.loading = false;
+			});
+		}
+	}
+};
 </script>
 <style>
     .el-tree-node.is-current>.el-tree-node__content {
diff --git a/src/views/lesson/lessoncategory/edit/chapter/index.vue b/src/views/lesson/lessoncategory/edit/chapter/index.vue
index db7cb9b93..ab2dbe76d 100644
--- a/src/views/lesson/lessoncategory/edit/chapter/index.vue
+++ b/src/views/lesson/lessoncategory/edit/chapter/index.vue
@@ -1,233 +1,220 @@
 <template>
-    <div class="card-box">
-        <el-steps class="steps" :active="display">
-            <el-step :title="title" icon="el-icon-edit-outline"></el-step>
-            <el-step title="" icon="el-icon-upload"></el-step>
-        </el-steps>
-        <el-card class="forms">
-            <el-scrollbar wrapClass="scrollbar-wrapper" :style="{height:height -160 + 'px'}" style="padding-top: 40px">
-                <el-form ref="form" :model="chapterModel" :rules="rules" label-width="135px">
-                    <el-form-item :label="this.$t('lesson.courseName')" prop="lessonName">
-                        <el-input v-model="chapterModel.lessonName" :disabled="true"></el-input>
-                    </el-form-item>
-                    <el-form-item :label="this.$t('lesson.parentChapter')" prop="parentName">
+  <div class="card-box">
+    <el-steps class="steps" :active="display">
+      <el-step :title="title" icon="el-icon-edit-outline" />
+      <el-step title="" icon="el-icon-upload" />
+    </el-steps>
+    <el-card class="forms">
+      <el-scrollbar wrap-class="scrollbar-wrapper" :style="{height:height -160 + 'px'}" style="padding-top: 40px">
+        <el-form ref="form" :model="chapterModel" :rules="rules" label-width="135px">
+          <el-form-item :label="this.$t('lesson.courseName')" prop="lessonName">
+            <el-input v-model="chapterModel.lessonName" :disabled="true" />
+          </el-form-item>
+          <!--<el-form-item :label="this.$t('lesson.parentChapter')" prop="parentName">
                         <el-input v-model="chapterModel.parentName" :disabled="true"></el-input>
-                    </el-form-item>
-                    <el-form-item :label="this.$t('lesson.chapterName')" prop="name">
-                        <el-input v-model="chapterModel.name"></el-input>
-                    </el-form-item>
-                    <el-form-item :label="this.$t('lesson.chapterInstructions')" prop="remarks">
-                        <el-input type="textarea" :autosize="{ minRows: 4, maxRows: 4}" :placeholder="this.$t('rules.pleaseEnterContent')"
-                            v-model="chapterModel.remarks">
-                        </el-input>
-                    </el-form-item>
-                    <el-form-item :label="this.$t('lesson.associatedTraining')">
-                        <el-table ref="singleTable" :data="chapterModel.trainings" border highlight-current-row
-                            :height="237">
-                            <el-table-column type="index" width="50">
-                            </el-table-column>
-                            <el-table-column property="trainingName" :label="this.$t('lesson.trainingName')">
-                            </el-table-column>
-                            <el-table-column property="trial" :label="this.$t('global.isTry')" width="80">
-                                <template slot-scope="scope">
-                                    <el-checkbox v-model="scope.row.trial"></el-checkbox>
-                                </template>
-                            </el-table-column>
-                            <el-table-column fixed="right" :label="this.$t('global.operate')" width="70">
-                                <template slot-scope="scope">
-                                    <el-button @click.native.prevent="deleteRow(scope.$index, chapterModel.trainings)"
-                                        type="text" size="small">{{$t('global.remove')}}</el-button>
-                                </template>
-                            </el-table-column>
-                        </el-table>
-                        <el-button type="primary" style="margin-top: 20px" @click='pushTrain'>{{$t('lesson.addTraining')}}</el-button>
-                    </el-form-item>
-                </el-form>
-            </el-scrollbar>
-        </el-card>
-        <div class="draft">
-            <el-button-group>
-                <el-button type="primary" @click="create" v-show="!isEdit">{{$t('global.append')}}</el-button>
-                <el-button type="primary" @click="update" v-show="isEdit">{{$t('global.update')}}</el-button>
-            </el-button-group>
-        </div>
-        <train-list ref="pathRoute" :trainings="this.chapterModel.trainings" :detail="detail"
-            @routeSelected="routeSelected"></train-list>
+                    </el-form-item>-->
+          <el-form-item :label="this.$t('lesson.chapterName')" prop="name">
+            <el-input v-model="chapterModel.name" />
+          </el-form-item>
+          <el-form-item :label="this.$t('lesson.chapterInstructions')" prop="remarks">
+            <el-input
+              v-model="chapterModel.remarks"
+              type="textarea"
+              :autosize="{ minRows: 4, maxRows: 4}"
+              :placeholder="this.$t('rules.pleaseEnterContent')"
+            />
+          </el-form-item>
+          <el-form-item :label="this.$t('lesson.associatedTraining')">
+            <el-table
+              ref="singleTable"
+              :data="chapterModel.trainings"
+              border
+              highlight-current-row
+              :height="237"
+            >
+              <el-table-column type="index" width="50" />
+              <el-table-column property="trainingName" :label="this.$t('lesson.trainingName')" />
+              <el-table-column property="trial" :label="this.$t('global.isTry')" width="80">
+                <template slot-scope="scope">
+                  <el-checkbox v-model="scope.row.trial" />
+                </template>
+              </el-table-column>
+              <el-table-column fixed="right" :label="this.$t('global.operate')" width="70">
+                <template slot-scope="scope">
+                  <el-button
+                    type="text"
+                    size="small"
+                    @click.native.prevent="deleteRow(scope.$index, chapterModel.trainings)"
+                  >{{ $t('global.remove') }}</el-button>
+                </template>
+              </el-table-column>
+            </el-table>
+            <el-button type="primary" style="margin-top: 20px" @click="pushTrain">{{ $t('lesson.addTraining') }}</el-button>
+          </el-form-item>
+        </el-form>
+      </el-scrollbar>
+    </el-card>
+    <div class="draft">
+      <el-button-group>
+        <el-button v-show="!isEdit" type="primary" @click="create">{{ $t('global.append') }}</el-button>
+        <el-button v-show="isEdit" type="primary" @click="update">{{ $t('global.update') }}</el-button>
+        <el-button type="primary" @click="back">{{ $t('global.back') }}</el-button>
+      </el-button-group>
     </div>
+    <train-list
+      ref="pathRoute"
+      :trainings="this.chapterModel.trainings"
+      :detail="detail"
+      @routeSelected="routeSelected"
+    />
+  </div>
 </template>
 
 <script>
-    import { createLessonChapter, updateLessonChapter, getLessonDetail, getLessonChapterDetail } from '@/api/jmap/lessondraft';
-    import localStore from 'storejs';
-    import TrainList from './list';
+import { createLessonChapter, updateLessonChapter, getLessonDetail, getLessonChapterDetail } from '@/api/jmap/lessondraft';
+import localStore from 'storejs';
+import TrainList from './list';
 
-    export default {
-        name: 'sectionEdit',
-        props: {
-            height: {
-                type: Number
-            }
-        },
-        components: {
-            TrainList
-        },
-        data() {
-            return {
-                isEdit: false,
-                display: 1,
-                productId: '',
-                trial: '',
-                chapterModel: {
-                    trainingId: '',
-                    lessonId: '',
-                    lessonName: '',
-                    name: '',
-                    remarks: '',
-                    parentId: null,
-                    parentName: '',
-                    trainings: []
-                },
-                detail: {
-                    mapId: '',
-                    prdCode: '',
-                },
-            }
-        },
-        computed: {
-            title() {
-                return this.isEdit ? this.$t('lesson.updateChapter') : this.$t('lesson.createChapter');
-            },
-            rules() {
-                let baseRules = {
-                    name: [
-                        { required: true, message: this.$t('rules.enterChapterName'), trigger: 'change' }
-                    ],
-                    remarks: [
-                        { required: true, message: this.$t('rules.enterChapterInstructions'), trigger: 'change' }
-                    ],
-                }
-                return baseRules;
-            }
-        },
-        methods: {
-            initData(isNew, node) {
-                this.isEdit = !isNew;
-                this.clearForm();
-                if (isNew) {
-                    let parent = null;
-                    if (node.data.type === 'chapter') {
-                        parent = node.data;
-                    }
-                    let lesson = this.getLesson(node);
-                    this.setLessonAndParent(parent, lesson);
-                    this.loadTrainingList(lesson);
-                } else {
-                    let parent = null;
-                    if (node.parent.data.type === 'chapter') {
-                        parent = node.parent.data;
-                    }
-                    let lesson = this.getLesson(node);
-                    this.setLessonAndParent(parent, lesson);
-                    this.loadTrainingList(lesson, node);
-                }
-            },
-            getChapter(data) {
-                getLessonChapterDetail(data).then(response => {
-                    this.setChapterModel(response.data);
-                }).catch(error => {
-                    this.$messageBox(this.$t('error.obtainChapterDataFailed'))
-                });
-            },
-            deleteRow(index, rows) {
-                rows.splice(index, 1);
-            },
-            pushTrain() {
-                if (this.$refs && this.$refs.pathRoute) {
-                    this.$refs.pathRoute.doShow();
-                }
-            },
-            routeSelected(data) {
-                data.forEach((elem, index) => {
-                    this.chapterModel.trainings.push({
-                        trainingName: elem.name,
-                        trial: false,
-                        trainingId: elem.id,
-                    });
-                });
-            },
-            setChapterModel(data) {
-                let lessonName = this.chapterModel.lessonName;
-                let parentName = this.chapterModel.parentName;
-                this.chapterModel = data;
-                this.chapterModel.trainings = data.trainings || [];
-                this.chapterModel.lessonName = lessonName;
-                this.chapterModel.parentName = parentName;
-            },
-            setLessonAndParent(parent, lesson) {
-                this.chapterModel.lessonId = lesson.id;
-                this.chapterModel.lessonName = lesson.name;
-                if (parent) {
-                    this.chapterModel.parentId = parent.id;
-                    this.chapterModel.parentName = parent.name;
-                }
-            },
-            getLesson(node) {
-                if (node.data.type === 'lesson') {
-                    return node.data;
-                } else {
-                    return this.getLesson(node.parent);
-                }
-            },
-            clearForm() {
-                this.chapterModel.trainingId = '';
-                this.chapterModel.trainings = [];
-                this.$refs.form.resetFields();
-            },
+export default {
+	name: 'SectionEdit',
+	components: {
+		TrainList
+	},
+	props: {
+		height: {
+			type: Number
+		}
+	},
+	data() {
+		return {
+			isEdit: false,
+			display: 1,
+			productId: '',
+			trial: '',
+			chapterModel: {
+				trainingId: '',
+				lessonId: '',
+				lessonName: '',
+				name: '',
+				remarks: '',
+				trainings: []
+			},
+			detail: {
+				mapId: '',
+				prdCode: ''
+			}
+		};
+	},
+	computed: {
+		title() {
+			return this.isEdit ? this.$t('lesson.updateChapter') : this.$t('lesson.createChapter');
+		},
+		rules() {
+			const baseRules = {
+				name: [
+					{ required: true, message: this.$t('rules.enterChapterName'), trigger: 'change' }
+				],
+				remarks: [
+					{ required: true, message: this.$t('rules.enterChapterInstructions'), trigger: 'change' }
+				]
+			};
+			return baseRules;
+		}
+	},
+	methods: {
+		initData(isNew, data) {
+			this.isEdit = !isNew;
+			this.clearForm();
+			if (isNew) {
+				this.loadTrainingList(data);
+			} else {
+				this.loadTrainingList(data);
+			}
+		},
+		getChapter(data) {
+			getLessonChapterDetail(data).then(response => {
+				this.setChapterModel(response.data);
+			}).catch(error => {
+				this.$messageBox(this.$t('error.obtainChapterDataFailed'));
+			});
+		},
+		deleteRow(index, rows) {
+			rows.splice(index, 1);
+		},
+		pushTrain() {
+			if (this.$refs && this.$refs.pathRoute) {
+				this.$refs.pathRoute.doShow();
+			}
+		},
+		routeSelected(data) {
+			data.forEach((elem, index) => {
+				this.chapterModel.trainings.push({
+					trainingName: elem.name,
+					trial: false,
+					trainingId: elem.id
+				});
+			});
+		},
+		setChapterModel(data) {
+			const lessonName = this.chapterModel.lessonName;
+			this.chapterModel = data;
+			this.chapterModel.trainings = data.trainings || [];
+			this.chapterModel.lessonName = lessonName;
+		},
+		clearForm() {
+			this.chapterModel.trainingId = '';
+			this.chapterModel.trainings = [];
+			this.$refs.form.resetFields();
+		},
 
-            // 获取课程详情/章节详情
-            loadTrainingList(model, node) {
-                getLessonDetail(model).then(resp => {
-                    this.detail.mapId = resp.data.mapId;
-                    this.detail.prdCode = resp.data.prdCode;
-                    if (this.isEdit) {
-                        this.getChapter(node.data);
-                    }
-                }).catch(error => {
-                    this.$messageBox(this.$t('error.obtainCourseDetailsFailed'));
-                })
-            },
-            create() {
-                this.$refs.form.validate((valid) => {
-                    if (valid) {
-                        createLessonChapter(this.chapterModel).then(response => {
-                            this.$emit('refresh');
-                            this.$message.success(this.$t('tip.createSuccess'));
-                        }).catch(error => {
-                            this.$messageBox(this.$t('error.refreshFailed'))
-                        });
-                    }
-                });
-            },
-            update() {
-                this.$refs.form.validate((valid) => {
-                    if (valid) {
-                        updateLessonChapter(this.chapterModel).then(response => {
-                            this.$emit('refresh');
-                            this.$message.success(this.$t('tip.updateSuccessfully'));
-                        }).catch(error => {
-                            this.$messageBox(this.$t('error.refreshFailed'))
-                        });
-                    }
-                });
-            }
-        }
-    }
+		// 获取课程详情/章节详情
+		loadTrainingList(data) {
+			getLessonDetail({ id: data.lessonId }).then(resp => {
+				this.detail.mapId = resp.data.mapId;
+				this.detail.prdCode = resp.data.prdCode;
+				this.chapterModel.lessonId = resp.data.id;
+				this.chapterModel.lessonName = resp.data.name;
+				if (this.isEdit) {
+					this.getChapter(data);
+				}
+			}).catch(error => {
+				this.$messageBox(this.$t('error.obtainCourseDetailsFailed'));
+			});
+		},
+		create() {
+			this.$refs.form.validate((valid) => {
+				if (valid) {
+					createLessonChapter(this.chapterModel).then(response => {
+						this.$emit('refresh');
+						this.$message.success(this.$t('tip.createSuccess'));
+					}).catch(error => {
+						this.$messageBox(this.$t('error.refreshFailed'));
+					});
+				}
+			});
+		},
+		update() {
+			this.$refs.form.validate((valid) => {
+				if (valid) {
+					updateLessonChapter(this.chapterModel).then(response => {
+						this.$emit('refresh');
+						this.$message.success(this.$t('tip.updateSuccessfully'));
+					}).catch(error => {
+						this.$messageBox(this.$t('error.refreshFailed'));
+					});
+				}
+			});
+		},
+		back() {
+			this.$router.go(-1);
+		}
+	}
+};
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
     @import "src/styles/mixin.scss";
 
-
     .card-box {
         padding-top: 20px;
     }
diff --git a/src/views/lesson/lessoncategory/edit/lesson/index.vue b/src/views/lesson/lessoncategory/edit/lesson/index.vue
index 0790e03bd..145c7fd30 100644
--- a/src/views/lesson/lessoncategory/edit/lesson/index.vue
+++ b/src/views/lesson/lessoncategory/edit/lesson/index.vue
@@ -44,16 +44,15 @@
     <div class="draft">
       <el-button-group>
         <template v-if="!isEdit">
-          <el-button v-if="courseModel.skinCode" type="primary" @click="create">{{$t('global.create')}}</el-button>
+          <el-button v-if="courseModel.skinCode" type="primary" @click="create">{{ $t('global.create') }}</el-button>
+          <el-button type="primary" @click="back">{{ $t('global.back') }}</el-button>
         </template>
         <template v-else>
-          <el-button type="primary" @click="update">{{$t('global.update')}}</el-button>
-          <el-button type="primary" @click="publish">{{$t('global.release')}}</el-button>
-          <el-button type="danger" @click="deleteLesson">{{$t('global.delete')}}</el-button>
+          <el-button type="primary" @click="update">{{ $t('global.update') }}</el-button>
+          <el-button type="primary" @click="back">{{ $t('global.back') }}</el-button>
         </template>
       </el-button-group>
     </div>
-    <publish-lesson ref="publishLesson" />
   </div>
 </template>
 
@@ -61,12 +60,10 @@
 import { createLesson, updateLesson, getLessonDetail, delLesson } from '@/api/jmap/lessondraft';
 import { getCommodityMapProduct } from '@/api/management/mapprd';
 import { getSkinCodeList } from '@/api/management/mapskin';
-import PublishLesson from './publish';
 
 export default {
 	name: 'CourseEdit',
 	components: {
-		PublishLesson
 	},
 	props: {
 		height: {
@@ -119,17 +116,15 @@ export default {
 		});
 	},
 	methods: {
-		initData(isNew, node) {
+		initData(isNew, data) {
 			this.isEdit = !isNew;
 			this.clearForm();
 			if (!isNew) {
-				this.refresh(node);
+				this.refresh(data);
 			} else {
-				this.courseModel.skinCode = node.data.id;
+				this.courseModel.skinCode = this.$route.query.skinCode;
 			}
-
-			this.productList = [];
-			getCommodityMapProduct(this.getParentSkin(node)).then(response => {
+			getCommodityMapProduct(this.$route.query.skinCode).then(response => {
 				this.productList = response.data || [];
 				this.productList = this.productList.filter(elem => { return elem.prdType != '03'; });
 			});
@@ -176,37 +171,13 @@ export default {
 				}
 			});
 		},
-		publish() {
-			this.$refs.publishLesson.doShow(this.courseModel);
-		},
-		deleteLesson() {
-			delLesson(this.courseModel).then(response => {
-				this.$message.success(this.$t('tip.successfullyDelete'));
-				this.$refs.form.resetFields();
-				this.isEdit = false,
-				this.$emit('refresh');
-			}).catch(error => {
-				this.$messageBox(this.$t('tip.failDelete'));
-			});
-		},
-		getParentSkin(node) {
-			let next = node;
-			let skinCode = '';
-			while (next) {
-				if (next.data && next.data.type == 'skin') {
-					skinCode = next.data.id;
-				}
-				next = next.parent;
-			}
-			return skinCode;
-		},
-		refresh(node) {
-			if (node && node.data) {
-				getLessonDetail(node.data).then(response => {
+		refresh(query) {
+			if (query) {
+				getLessonDetail(query).then(response => {
 					const data = response.data;
 					this.courseModel = {
 						id: data.id,
-						skinCode: this.getParentSkin(node),
+						skinCode: this.$route.query.skinCode,
 						prdCode: data.prdCode,
 						name: data.name,
 						remarks: data.remarks
@@ -215,6 +186,9 @@ export default {
 					this.$messageBox(this.$t('error.obtainCourseInformationFailed'));
 				});
 			}
+		},
+		back() {
+			this.$router.back();
 		}
 	}
 };
diff --git a/src/views/lesson/lessoncategory/edit/lesson/publish.vue b/src/views/lesson/lessoncategory/edit/lesson/publish.vue
index 498edc7b8..b6d0266c2 100644
--- a/src/views/lesson/lessoncategory/edit/lesson/publish.vue
+++ b/src/views/lesson/lessoncategory/edit/lesson/publish.vue
@@ -10,17 +10,17 @@
         @submit.native.prevent
       >
         <el-form-item :label="this.$t('lesson.releaseAssociatedCity')" prop="cityCode">
-          <el-select v-model="editModel.cityCode" :placeholder="this.$t('rules.pleaseSelect')" @change="cityChange">
+          <el-select v-model="editModel.cityCode" :placeholder="this.$t('rules.pleaseSelect')" :disabled="this.disabled" @change="cityChange">
             <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="this.$t('lesson.releaseAssociatedMap')" prop="mapId">
-          <el-select v-model="editModel.mapId" :placeholder="this.$t('rules.pleaseSelect')" @change="mapChange">
+          <el-select v-model="editModel.mapId" :placeholder="this.$t('rules.pleaseSelect')" :disabled="this.disabled" @change="mapChange">
             <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="this.$t('lesson.publishCourseName')" prop="name">
-          <el-input v-model="editModel.name" />
+          <el-input v-model="editModel.name" :disabled="!this.hasRelease" />
         </el-form-item>
       </el-form>
     </div>
@@ -34,7 +34,7 @@
 <script>
 import { getPublishMapListBySkinCode } from '@/api/jmap/map';
 import { getLessonNameByMapIdAndLessonId } from '@/api/jmap/lessondraft';
-import { publishLesson } from '@/api/jmap/lessondraft';
+import { adminPublishLesson, releaseOrCancel } from '@/api/designPlatform';
 
 export default {
 	name: 'LessonPublish',
@@ -42,6 +42,7 @@ export default {
 		return {
 			dialogShow: false,
 			loading: false,
+			disabled: true,
 			mapList: [],
 			cityList: [],
 			cityMapDict: {},
@@ -70,6 +71,10 @@ export default {
 					{ required: true, message: this.$t('rules.pleaseEnterMapName'), trigger: 'change' }
 				]
 			};
+		},
+		hasRelease() {
+			return this.$store.state.user.roles.includes('04') ||
+                    this.$store.state.user.roles.includes('05');
 		}
 	},
 	methods: {
@@ -90,7 +95,7 @@ export default {
 			this.editModel = {
 				id: model.id,
 				name: model.name,
-				mapId: '',
+				mapId: this.$route.params.mapId,
 				prdCode: model.prdCode,
 				cityCode: model.cityCode
 			};
@@ -108,6 +113,7 @@ export default {
 					this.$Dictionary.cityType().then(list => {
 						this.cityList = list.filter(elem => { return this.cityMapDict[elem.code]; });
 					});
+					this.mapList = this.cityMapDict[model.cityCode];
 				});
 			}
 
@@ -116,16 +122,26 @@ export default {
 		doClose() {
 			this.$refs.form.resetFields();
 			this.dialogShow = false;
+			this.$emit('refresh');
 		},
 		doSave() {
 			this.loading = true;
 			this.$refs['form'].validate((valid) => {
-				if (valid) {
-					publishLesson(this.editModel).then(response => {
+				if (valid && this.hasRelease) {
+					adminPublishLesson(this.editModel, this.editModel.id).then(response => {
 						this.loading = false;
 						this.$message.success(this.$t('tip.coursePublishSuccessful'));
 						this.doClose();
-					}).catch(error => {
+					}).catch(() => {
+						this.loading = false;
+						this.$messageBox(this.$t('tip.coursePublishFailed'));
+					});
+				} else if (valid && !this.hasRelease) {
+					releaseOrCancel(this.editModel.id, '1').then(response => {
+						this.loading = false;
+						this.$message.success(this.$t('tip.coursePublishSuccessful'));
+						this.doClose();
+					}).catch(() => {
 						this.loading = false;
 						this.$messageBox(this.$t('tip.coursePublishFailed'));
 					});
diff --git a/src/views/lesson/lessoncategory/edit/sorttree/index.vue b/src/views/lesson/lessoncategory/edit/sorttree/index.vue
index 7e1679712..a5d222621 100644
--- a/src/views/lesson/lessoncategory/edit/sorttree/index.vue
+++ b/src/views/lesson/lessoncategory/edit/sorttree/index.vue
@@ -30,6 +30,9 @@
         </el-tree>
       </el-scrollbar>
     </el-card>
+    <div class="draft">
+      <el-button type="primary" @click="goBack">{{ $t('global.back') }}</el-button>
+    </div>
   </div>
 </template>
 
@@ -50,24 +53,29 @@ export default {
 	},
 	computed: {
 		height() {
-			return this.$store.state.app.height - 140;
+			return this.$store.state.app.height - 180;
 		}
 	},
 	methods: {
-		convertTreeData(list, node) {
+		convertTreeData(list, data) {
 			let tree = [];
-			if (node && node.data && list && list.length) {
+			if (data && list && list.length) {
 				list.forEach(elem => {
-					if (node.data.name == elem.name) {
-						tree = [elem];
+					if (elem.children) {
+						elem.children.forEach( item => {
+							if (data.id == item.id) {
+								tree = [elem];
+							}
+						});
 					}
 				});
 			}
 			return tree;
 		},
-		initData(node) {
-			getLessonTree({ mapId: '' }).then(response => {
-				this.treeData = this.convertTreeData(response.data, node);
+		initData(data) {
+			getLessonTree(data.id).then(response => {
+				// this.treeData = this.convertTreeData(response.data, data);
+				this.treeData = response.data;
 			}).catch(() => {
 				this.$messageBox(this.$t('error.refreshFailed'));
 			});
@@ -85,16 +93,15 @@ export default {
 			return draggingNode && (draggingNode.data.type === 'chapter' || draggingNode.data.type === 'training');
 		},
 		getLeesonId(node) {
-			if (node.parent.parent !== null) {
-				return this.getLeesonId(node.parent);
+			if (node.parent.data.type === 'lesson') {
+				return node.parent.data.id;
 			} else {
-				return node;
+				return this.getLeesonId(node.parent);
 			}
 		},
 		handleDragEnd(draggingNode, dropNode, dropType, ev) {
 			if (draggingNode && dropNode && dropType !== 'none') {
-				const lesson = this.getLeesonId(dropNode);
-				const lessonId = lesson.data.id;
+				const lessonId = this.getLeesonId(dropNode);
 				const model = {
 					location: dropType,
 					sourceId: draggingNode.data.id,
@@ -109,6 +116,9 @@ export default {
 					this.$emit('refresh');
 				});
 			}
+		},
+		goBack() {
+			this.$router.go(-1);
 		}
 	}
 };
@@ -142,4 +152,9 @@ export default {
         margin: 0 auto;
         margin-top: 10px;
     }
+    .draft {
+        width: 300px;
+        text-align: center;
+        margin: 20px auto;
+    }
 </style>
diff --git a/src/views/lesson/lessoncategory/index.vue b/src/views/lesson/lessoncategory/index.vue
index ea604fb71..5c6a63fda 100644
--- a/src/views/lesson/lessoncategory/index.vue
+++ b/src/views/lesson/lessoncategory/index.vue
@@ -1,18 +1,7 @@
 <template>
   <div class="mainContext">
-    <div class="treeContext">
-      <cource-category
-        ref="tree"
-        :height="height"
-        @publishCreate="publishCreate"
-        @lessonCreate="lessonCreate"
-        @lessonEdit="lessonEdit"
-        @chapterCreate="chapterCreate"
-        @chapterEdit="chapterEdit"
-        @treeSort="treeSort"
-      />
-    </div>
-    <div class="draftContext" :style="{width: width +'px'}">
+    <div class="draftContext">
+      <!--:style="{width: width +'px'}  -->
       <div v-if="lessonShow">
         <lesson-edit ref="lesson" :height="height" @refresh="refresh" />
       </div>
@@ -22,23 +11,19 @@
       <div v-if="treeShow">
         <sort-tree ref="sortTree" :height="height" @refresh="refresh" />
       </div>
-      <publish-create ref="publish" @refresh="refresh" />
     </div>
   </div>
 </template>
 
 <script>
-import CourceCategory from './category/tree';
 import LessonEdit from './edit/lesson/index';
 import ChapterEdit from './edit/chapter/index';
 import SortTree from './edit/sorttree/index';
-import PublishCreate from './edit/create';
+import localStore from 'storejs';
 
 export default {
 	name: 'LessonDraft',
 	components: {
-		CourceCategory,
-		PublishCreate,
 		LessonEdit,
 		ChapterEdit,
 		SortTree
@@ -55,10 +40,30 @@ export default {
 	},
 	computed: {
 		width() {
-			return this.$store.state.app.width - 420;
+			return this.$store.state.app.width - localStore.get('LeftWidth');
 		},
 		height() {
-			return this.$store.state.app.height - 102;
+			return this.$store.state.app.height - 125;
+		}
+	},
+	mounted() {
+		const data = this.$route.query;
+		switch (this.$route.params.type) {
+		case 'lessonCreate':
+			this.lessonCreate(data);
+			break;
+		case 'lessonEdit':
+			this.lessonEdit(data);
+			break;
+		case 'chapterCreate':
+			this.chapterCreate(data);
+			break;
+		case 'chapterEdit':
+			this.chapterEdit(data);
+			break;
+		case 'treeSort':
+			this.treeSort(data);
+			break;
 		}
 	},
 	methods: {
@@ -71,51 +76,42 @@ export default {
 				}
 			});
 		},
-		publishCreate(node) {
-			this.isNew = true;
-			this.$nextTick(() => {
-				this.$refs.publish.doShow(node);
-			});
-		},
-		lessonCreate(node) {
+		lessonCreate(data) {
 			this.isNew = true;
 			this.exchangeShow({ lessonShow: true });
 			this.$nextTick(() => {
-				this.$refs.lesson.initData(true, node);
+				this.$refs.lesson.initData(true, data);
 			});
 		},
-		lessonEdit(node) {
+		lessonEdit(data) {
 			this.isNew = false;
 			this.exchangeShow({ lessonShow: true });
 			this.$nextTick(() => {
-				this.$refs.lesson.initData(false, node);
+				this.$refs.lesson.initData(false, data);
 			});
 		},
-		chapterCreate(node) {
+		chapterCreate(data) {
 			this.isNew = true;
 			this.exchangeShow({ chapterShow: true });
 			this.$nextTick(() => {
-				this.$refs.chapter.initData(true, node);
+				this.$refs.chapter.initData(true, data);
 			});
 		},
-		chapterEdit(node) {
+		chapterEdit(data) {
 			this.isNew = false;
 			this.exchangeShow({ chapterShow: true });
 			this.$nextTick(() => {
-				this.$refs.chapter.initData(false, node);
+				this.$refs.chapter.initData(false, data);
 			});
 		},
-		treeSort(node) {
+		treeSort(data) {
 			this.isNew = false;
 			this.exchangeShow({ treeShow: true });
 			this.$nextTick(() => {
-				this.$refs.sortTree.initData(node);
+				this.$refs.sortTree.initData(data);
 			});
 		},
 		refresh(filterSelect) {
-			this.$nextTick(() => {
-				this.$refs.tree.refresh(filterSelect);
-			});
 		}
 	}
 };
@@ -129,6 +125,6 @@ export default {
     }
 
     .draftContext {
-        float: left;
+        // float: left;
     }
 </style>
diff --git a/src/views/lesson/taskmanage/createTask.vue b/src/views/lesson/taskmanage/createTask.vue
index 561fca430..91b883e66 100644
--- a/src/views/lesson/taskmanage/createTask.vue
+++ b/src/views/lesson/taskmanage/createTask.vue
@@ -1,100 +1,100 @@
 <template>
-  <el-dialog v-dialogDrag :title="title" :visible.sync="dialogVisible" width="25%" :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="doSave">{{ $t('global.confirm') }}</el-button>
-      <el-button @click="doClose">{{ $t('global.cancel') }}</el-button>
-    </span>
-  </el-dialog>
+    <el-dialog v-dialogDrag :title="title" :visible.sync="dialogVisible" width="25%" :before-close="doClose" center>
+        <data-form ref="dataform" :form="form" :formModel="formModel" :rules="rules"/>
+        <span slot="footer" class="dialog-footer">
+            <el-button type="primary" @click="doSave">{{$t('global.confirm')}}</el-button>
+            <el-button @click="doClose">{{$t('global.cancel')}}</el-button>
+        </span>
+    </el-dialog>
 </template>
 
 <script>
-import { addTrainingRulesList } from '@/api/management/dictionary';
-import { listPublishMap } from '@/api/jmap/mapdraft';
-import { OperationList } from '@/scripts/OperationConfig';
-import { addAutoGenerateTask } from '@/api/management/task';
-import { getSkinCodeList } from '@/api/management/mapskin';
+    import { addTrainingRulesList } from '@/api/management/dictionary';
+    import { listPublishMap } from '@/api/jmap/mapdraft';
+    import { OperationList } from '@/scripts/OperationConfig';
+    import { addAutoGenerateTask } from '@/api/management/task';
+    import { getSkinCodeList } from '@/api/management/mapskin'
 
-export default {
-	name: 'CreateTask',
-	data() {
-		return {
-			dialogVisible: false,
-			skinCodeList: [],
-			taskStatusList: [],
-			formModel: {
-				parameter: '',
-				type: '01'
-			},
-			isShow: false
-		};
-	},
-	computed: {
-		form() {
-			const isAdd = this.type === 'ADD';
-			const form = {
-				labelWidth: '120px',
-				items: [
-					{ prop: 'parameter', label: this.$t('lesson.skinType'), type: 'select', required: true, options: this.skinCodeList }
-				]
-			};
-			return form;
-		},
-		rules() {
-			const crules = {
-				parameter: [
-					{ required: true, message: this.$t('rules.mapInput'), trigger: 'change' }
-				]
-			};
-			return crules;
-		},
-		title() {
-			return this.$t('lesson.generationOperation');
-		}
-	},
-	mounted() {
-		this.loadInitData();
-	},
-	methods: {
-		loadInitData() {
-			this.skinCodeList = [];
-			getSkinCodeList().then(response => {
-				this.skinCodeList = response.data.map(elem => { return { value: elem.code, label: elem.name }; });
-			});
+    export default {
+        name: 'CreateTask',
+        data() {
+            return {
+                dialogVisible: false,
+                skinCodeList: [],
+                taskStatusList: [],
+                formModel: {
+                    parameter: this.$route.query.skinCode,
+                    type: '01'
+                },
+                isShow: false
+            };
+        },
+        computed: {
+            form() {
+                const isAdd = this.type === 'ADD';
+                const form = {
+                    labelWidth: '120px',
+                    items: [
+                        { prop: 'parameter', label: this.$t('lesson.skinType'), type: 'select', required: true, options: this.skinCodeList, disabled: true }
+                    ]
+                };
+                return form;
+            },
+            rules() {
+                let crules = {
+                    parameter: [
+                        { required: true, message: this.$t('rules.mapInput'), trigger: 'change' }
+                    ]
+                }
+                return crules;
+            },
+            title() {
+                return this.$t('lesson.generationOperation');
+            }
+        },
+        mounted() {
+            this.loadInitData();
+        },
+        methods: {
+            loadInitData() {
+                this.skinCodeList = [];
+                getSkinCodeList().then(response => {
+                    this.skinCodeList = response.data.map(elem => { return { value: elem.code, label: elem.name }; });
+                });
 
-			this.taskStatusList = [];
-			this.$Dictionary.taskStatus().then(list => {
-				this.taskStatusList = list.map(elem => { return { value: elem.code, label: elem.name }; });
-			});
-		},
-		doShow() {
-			this.dialogVisible = true;
-		},
-		doSave() {
-			const self = this;
-			this.$refs.dataform.validateForm(() => {
-				self.create();
-			});
-		},
-		doClose() {
-			this.formModel = {
-				parameter: '',
-				type: '01'
-			};
-			this.$refs.dataform.resetForm();
-			this.isShow = false;
-			this.dialogVisible = false;
-		},
-		async create() {
-			const self = this;
-			try {
-				const res = await addAutoGenerateTask(this.formModel);
-				self.doClose();
-				self.$emit('reloadTable'); // 刷新列表
-			} catch (error) {
-				this.$messageBox(this.$t('tip.creatingFailed'));
-			}
-		}
-	}
-};
+                this.taskStatusList = [];
+                this.$Dictionary.taskStatus().then(list => {
+                    this.taskStatusList = list.map(elem => { return { value: elem.code, label: elem.name }; });
+                })
+            },
+            doShow() {
+                this.dialogVisible = true;
+            },
+            doSave() {
+                const self = this;
+                this.$refs.dataform.validateForm(() => {
+                    self.create();
+                })
+            },
+            doClose() {
+                this.formModel = {
+                    parameter: this.$route.query.skinCode,
+                    type: '01'
+                }
+                this.$refs.dataform.resetForm();
+                this.isShow = false;
+                this.dialogVisible = false;
+            },
+            async create() {
+                let self = this
+                try {
+                    let res = await addAutoGenerateTask(this.formModel);
+                    self.doClose()
+                    self.$emit('reloadTable');  // 刷新列表
+                } catch (error) {
+                    this.$messageBox(this.$t('tip.creatingFailed'));
+                }
+            }
+        }
+    }
 </script>
diff --git a/src/views/lesson/taskmanage/list.vue b/src/views/lesson/taskmanage/list.vue
index 296f05a49..f06b0f57c 100644
--- a/src/views/lesson/taskmanage/list.vue
+++ b/src/views/lesson/taskmanage/list.vue
@@ -3,6 +3,11 @@
         <QueryListPage ref="queryListPage" :pager-config="pagerConfig" :query-form="queryForm" :query-list="queryList">
         </QueryListPage>
         <create-task ref='CreateTask' @reloadTable="reloadTable"></create-task>
+        <div class="draft">
+            <el-button-group>
+                <el-button type="primary" @click="turnback">{{ $t('global.back') }}</el-button>
+            </el-button-group>
+        </div>
     </div>
 </template>
 
@@ -42,7 +47,7 @@
                     }
                 },
                 queryList: {
-                    query: getTaskList,
+                    query: this.queryFunction,
                     selectCheckShow: false,
                     indexShow: true,
                     columns: [
@@ -145,7 +150,7 @@
                 })
             },
             taskCancel(index, node) {
-                this.$confirm( this.$t('tip.startOperationHint'), this.$t('global.tips'), {
+                this.$confirm( this.$t('tip.cancelsTaskHint'), this.$t('global.tips'), {
                     confirmButtonText: this.$t('global.confirm'),
                     cancelButtonText: this.$t('global.cancel'),
                     type: 'warning'
@@ -165,6 +170,20 @@
             createTask() {
                 this.$refs.CreateTask.doShow();
             },
+            turnback() {
+                this.$router.go(-1)
+            },
+            queryFunction(params) {
+                params['mapId'] = this.$route.query.mapId;
+                return getTaskList(params)
+            }
         }
     }
 </script>
+<style rel="stylesheet/scss" lang="scss" scoped>
+    .draft {
+        width: 400px;
+        text-align: center;
+        margin: 20px auto;
+    }
+</style>
diff --git a/src/views/lesson/trainingRule/addBatch.vue b/src/views/lesson/trainingRule/addBatch.vue
index a80e01584..7021d52f8 100644
--- a/src/views/lesson/trainingRule/addBatch.vue
+++ b/src/views/lesson/trainingRule/addBatch.vue
@@ -20,7 +20,7 @@ export default {
 			loading: false,
 			dialogVisible: false,
 			formModel: {
-				skinCode: ''
+				skinCode: this.$route.query.skinCode
 			},
 			skinCodeList: [],
 			isShow: false
@@ -32,7 +32,7 @@ export default {
 			const form = {
 				labelWidth: '120px',
 				items: [
-					{ prop: 'skinCode', label: this.$t('lesson.skinType'), type: 'select', required: true, options: this.skinCodeList }
+					{ prop: 'skinCode', label: this.$t('lesson.skinType'), type: 'select', required: true, options: this.skinCodeList, disabled: true }
 				]
 			};
 			return form;
@@ -104,7 +104,7 @@ export default {
 		},
 		handleClose() {
 			this.formModel = {
-				skinCode: ''
+                skinCode: this.$route.query.skinCode
 			};
 			this.$refs.dataform.resetForm();
 			this.isShow = false;
diff --git a/src/views/lesson/trainingRule/addEdit.vue b/src/views/lesson/trainingRule/addEdit.vue
index 8df4c5b9c..a108b400c 100644
--- a/src/views/lesson/trainingRule/addEdit.vue
+++ b/src/views/lesson/trainingRule/addEdit.vue
@@ -46,7 +46,7 @@ export default {
 			const form = {
 				labelWidth: '120px',
 				items: [
-					{ prop: 'skinCode', label: this.$t('lesson.skinType'), type: 'select', required: true, options: this.skinCodeList, disabled: !isAdd },
+					{ prop: 'skinCode', label: this.$t('lesson.skinType'), type: 'select', required: true, options: this.skinCodeList, disabled: true },
 					{ prop: 'trainingType', label: this.$t('lesson.trainingType'), type: 'select', required: true, options: this.trainingTypeList, disabled: !isAdd, change: true, onChange: this.changeList },
 					{ prop: 'operateType', label: this.$t('lesson.operationType'), type: 'select', required: true, options: this.trainingOperateTypeMap[this.formModel.trainingType], disabled: !isAdd },
 					{ label: '', type: 'button', options: this.placeholderList, style: 'margin-bottom: 0; margin-top: -10px;', typeBtn: 'info', click: this.addTrainName },
@@ -197,7 +197,11 @@ export default {
 					maxDuration: data.maxDuration,
 					trainingRemark: this.repliceName(data.trainingRemark, this.placeholderList)
 				};
-			}
+			}else {
+			    this.formModel = {
+			        skinCode: this.$route.query.skinCode
+                }
+            }
 		},
 		repliceName(fieldValue, enumList) {
 			if (enumList && enumList.length > 0) {
diff --git a/src/views/lesson/trainingRule/list.vue b/src/views/lesson/trainingRule/list.vue
index fb85b6234..6117bfc5e 100644
--- a/src/views/lesson/trainingRule/list.vue
+++ b/src/views/lesson/trainingRule/list.vue
@@ -5,6 +5,11 @@
     <training-edit ref="edit" type="EDIT" @reloadTable="reloadTable" />
     <add-batch ref="addBatch" @reloadTable="reloadTable" />
     <save-as ref="saveAs" @reloadTable="reloadTable" />
+      <div class="draft">
+          <el-button-group>
+              <el-button type="primary" @click="turnback">{{ $t('global.back') }}</el-button>
+          </el-button-group>
+      </div>
   </div>
 </template>
 
@@ -14,13 +19,14 @@ import { getSkinCodeList } from '@/api/management/mapskin';
 import TrainingEdit from './addEdit';
 import AddBatch from './addBatch';
 import SaveAs from './saveAs.vue';
+import { UrlConfig } from '@/router/index';
 
 export default {
 	name: 'TrainingRule',
 	components: {
 		TrainingEdit,
 		AddBatch,
-		SaveAs
+        SaveAs
 	},
 	data() {
 		return {
@@ -37,13 +43,6 @@ export default {
 				labelWidth: '140px',
 				reset: true,
 				queryObject: {
-					skinCode: {
-						type: 'select',
-						label: this.$t('lesson.skinType'),
-						config: {
-							data: []
-						}
-					},
 					trainingType: {
 						type: 'select',
 						label: this.$t('lesson.trainingType'),
@@ -128,8 +127,8 @@ export default {
 				],
 				actions: [
 					{ text: this.$t('global.add'), handler: this.handleAdd },
-					{ text: this.$t('lesson.generation'), handler: this.handleBatchAdd },
-					{ text: this.$t('lesson.saveAs'), handler: this.handleSaveAs }
+                    { text: this.$t('lesson.generation'), handler: this.handleBatchAdd },
+                    { text: this.$t('lesson.saveAs'), handler: this.handleSaveAs }
 				]
 			},
 			currentModel: {}
@@ -179,9 +178,6 @@ export default {
 			this.skinCodeList = [];
 			getSkinCodeList().then(response => {
 				this.skinCodeList = response.data;
-				response.data.forEach(elem => {
-					this.queryForm.queryObject.skinCode.config.data.push({ value: elem.code, label: elem.name });
-				});
 			});
 
 			// 获取实训类型
@@ -218,12 +214,13 @@ export default {
 			}
 		},
 		async getList(params) {
+            params['mapId'] = this.$route.query.mapId;
 			const res = await getTrainingRulesList(params);
 			this.totals = res.data.total;
 			return res;
 		},
 		handleViewDetail(index, row) {
-			this.$router.push({ path: `/lesson/manage/trainingRule/detail`, query: { id: row.id, type: row.trainingType, skinCode: row.skinCode } });
+            this.$router.push({ path: `${UrlConfig.design.trainingRuleDetail}`, query: { id: row.id, type: row.trainingType, skinCode: row.skinCode } });
 		},
 
 		handleEdit(index, row) {
@@ -238,11 +235,11 @@ export default {
 			this.$refs.addBatch.show(this.totals);
 		},
 
-		handleSaveAs() {
-			this.$refs.saveAs.show();
-		},
+        handleSaveAs() {
+            this.$refs.saveAs.show();
+        },
 
-		handleDelete(index, row) {
+        handleDelete(index, row) {
 			this.$confirm(this.$t('lesson.wellDelTrainingRule'), this.$t('global.tips'), {
 				confirmButtonText: this.$t('global.confirm'),
 				cancelButtonText: this.$t('global.cancel'),
@@ -257,10 +254,19 @@ export default {
 				});
 			});
 		},
-
+        turnback() {
+            this.$router.go(-1)
+        },
 		reloadTable() {
 			this.queryList.reload();
 		}
 	}
 };
 </script>
+<style rel="stylesheet/scss" lang="scss" scoped>
+    .draft {
+        width: 400px;
+        text-align: center;
+        margin: 20px auto;
+    }
+</style>
diff --git a/src/views/lesson/trainingmanage/draft.vue b/src/views/lesson/trainingmanage/draft.vue
index eebe47552..a1ec701e8 100644
--- a/src/views/lesson/trainingmanage/draft.vue
+++ b/src/views/lesson/trainingmanage/draft.vue
@@ -1,8 +1,11 @@
 <template>
   <el-dialog v-dialogDrag :title="operation.title" :visible.sync="dialogShow" width="500px" :before-close="close">
     <el-form ref="form" :model="operateModel" label-width="auto" :rules="rules" size="mini" label-position="right" class="dialog-form">
+      <el-form-item v-if="isAdd" :label="this.$t('lesson.trainingName')+':'" prop="name">
+        <el-input v-model="operateModel.name" style="width: 300px" />
+      </el-form-item>
       <el-form-item :label="this.$t('lesson.skinType') + ':'" prop="skinCode">
-        <el-select v-model="operateModel.skinCode" @change="skinCodeChoose">
+        <el-select v-model="operateModel.skinCode" style="width: 300px" :disabled="this.disable" @change="skinCodeChoose">
           <el-option
             v-for="option in skinCodeList"
             :key="option.code"
@@ -11,8 +14,9 @@
           />
         </el-select>
       </el-form-item>
+
       <el-form-item :label="this.$t('lesson.productType')" prop="prdCode">
-        <el-select v-model="operateModel.prdCode" @change="prdChange">
+        <el-select v-model="operateModel.prdCode" style="width: 300px" @change="prdChange">
           <el-option
             v-for="option in productList"
             :key="option.code"
@@ -22,7 +26,7 @@
         </el-select>
       </el-form-item>
       <el-form-item :label="this.$t('lesson.trainingType') + ':'" prop="type">
-        <el-select v-model="operateModel.type" @change="typeChange">
+        <el-select v-model="operateModel.type" style="width: 300px" @change="typeChange">
           <el-option
             v-for="option in trainingTypeLists"
             :key="option.code"
@@ -32,7 +36,7 @@
         </el-select>
       </el-form-item>
       <el-form-item :label="this.$t('lesson.operationType') + ':'" prop="operateType">
-        <el-select v-model="operateModel.operateType" multiple>
+        <el-select v-model="operateModel.operateType" style="width: 300px" multiple>
           <el-option
             v-for="option in trainingTypeMap[operateModel.type]"
             :key="option.code"
@@ -42,24 +46,24 @@
         </el-select>
       </el-form-item>
       <el-form-item v-if="isUpdate" :label="this.$t('lesson.minTime')" prop="minDuration">
-        <el-input-number v-model="operateModel.minDuration" :min="0" :max="10000" />s
+        <el-input-number v-model="operateModel.minDuration" style="width: 300px" :min="0" :max="10000" />s
       </el-form-item>
       <el-form-item v-if="isUpdate" :label="this.$t('lesson.maxTime')" prop="maxDuration">
-        <el-input-number v-model="operateModel.maxDuration" :min="0" :max="10000" />s
+        <el-input-number v-model="operateModel.maxDuration" style="width: 300px" :min="0" :max="10000" />s
       </el-form-item>
       <el-form-item v-if="isUpdate" :label="this.$t('lesson.trainingDescription')" prop="remarks">
-        <el-input v-model="operateModel.remarks" type="textarea" />
+        <el-input v-model="operateModel.remarks" style="width: 300px" type="textarea" />
       </el-form-item>
     </el-form>
     <span slot="footer" class="dialog-footer">
-      <el-button @click="handleClose">{{$t('global.cancel')}}</el-button>
-      <el-button type="primary" :loading="loading" @click="handleDeal">{{$t('global.confirm')}}</el-button>
+      <el-button @click="handleClose">{{ $t('global.cancel') }}</el-button>
+      <el-button type="primary" :loading="loading" @click="handleDeal">{{ $t('global.confirm') }}</el-button>
     </span>
   </el-dialog>
 </template>
 
 <script>
-import { addAutoTraining, updateAutoTraining, deleteAutoTraining } from '@/api/jmap/training';
+import { addAutoTraining, updateAutoTraining, deleteAutoTraining, addTraining } from '@/api/jmap/training';
 import { getOperateTrainingList } from '@/api/management/operation';
 import { getCommodityMapProduct } from '@/api/management/mapprd';
 
@@ -78,6 +82,7 @@ export default {
 			type: Object,
 			required: true
 		}
+
 	},
 	data() {
 		var minDurations = (rule, value, callback) => {
@@ -112,13 +117,18 @@ export default {
 		var checkOperateType = (rule, value, callback) => {
 			if (value.length <= 0) {
 				return callback(new Error(this.$t('rules.selectTrainingType')));
-			} else if (this.operation.event == '02' && value.length !== 1) {
+			} else if ((this.operation.event === '02' || this.operation.event === '04')&& value.length !== 1) {
 				return callback(new Error(this.$t('rules.selectOneTrainingType')));
 			} else {
 				callback();
 			}
 		};
-
+		var checkName = (rule, value, callback) => {
+			if (this.operation.event == '04' && !value) {
+				return callback(new Error('请输入实训名称'));
+			}
+			callback();
+		};
 		// var checkRemarks = (rule, value, callback) => {
 		// 	if (this.operation.event == '02' && !value) {
 		// 		return callback(new Error('请输入实训描述'));
@@ -128,6 +138,7 @@ export default {
 
 		return {
 			dialogShow: false,
+			disable: true,
 			productTypesList: [],
 			trainTypesList: [],
 			productList: [],
@@ -135,7 +146,7 @@ export default {
 			operateModel: {
 				name: '',
 				type: '',
-				skinCode: '',
+				skinCode: this.$route.params.skinCode,
 				prdCode: '',
 				operateType: [],
 				maxDuration: 0,
@@ -150,6 +161,9 @@ export default {
 				title: ''
 			},
 			rules: {
+				name: [
+					{ required: true, validator: checkName, trigger: 'blur'}
+				],
 				skinCode: [
 					{ required: true, message: this.$t('rules.pleaseEnterMapName'), trigger: 'change' }
 				],
@@ -176,9 +190,15 @@ export default {
 	},
 	computed: {
 		isUpdate() {
-			return this.operation.event == '02';
+			return this.operation.event === '02' || this.operation.event === '04';
+		},
+		isAdd() {
+			return this.operation.event === '04';
 		}
 	},
+	mounted() {
+		this.skinCodeChoose(this.$route.params.skinCode);
+	},
 	methods: {
 		show(data) {
 			this.operation = {
@@ -312,6 +332,25 @@ export default {
 							this.$messageBox(this.$t('tip.deleteAutomaticGenerationTrainingFailure'));
 							this.loading = false;
 						});
+					} else if (this.operation.event === '04') {
+						const data = {
+							name: this.operateModel.name,
+							type: this.operateModel.type,
+							prdCode: this.operateModel.prdCode,
+							skinCode: this.operateModel.skinCode,
+							operateType: this.operateModel.operateType[0],
+							minDuration: this.operateModel.minDuration,
+							maxDuration: this.operateModel.maxDuration,
+							remarks: this.operateModel.remarks
+						};
+						addTraining(data).then(response => {
+							this.$message.success(this.$t('tip.addTrainingSuccessfully'));
+							this.$emit('refresh');
+							this.close();
+						}).catch(() => {
+							this.$messageBox(this.$t('tip.addTrainingFailed'));
+							this.loading = false;
+						});
 					}
 				}
 			});
diff --git a/src/views/lesson/trainingmanage/index.vue b/src/views/lesson/trainingmanage/index.vue
index 8af900867..63b30e624 100644
--- a/src/views/lesson/trainingmanage/index.vue
+++ b/src/views/lesson/trainingmanage/index.vue
@@ -8,6 +8,11 @@
       :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>
 
@@ -38,16 +43,7 @@ export default {
 			},
 			queryForm: {
 				labelWidth: '120px',
-				initLoadCallback: this.loadInitQueryList,
 				queryObject: {
-					skinCode: {
-						type: 'select',
-						label: this.$t('lesson.skinType'),
-						change: this.skinCodeChoose,
-						config: {
-							data: []
-						}
-					},
 					prdCode: {
 						type: 'select',
 						label: this.$t('lesson.product'),
@@ -71,13 +67,13 @@ export default {
 							data: []
 						}
 					},
-					generateType: {
+					/* generateType: {
 						type: 'select',
 						label: this.$t('lesson.automaticOrManual'),
 						config: {
 							data: [{ value: '02', label: this.$t('lesson.manual') }, { value: '01', label: this.$t('lesson.automatic') }]
 						}
-					},
+					},*/
 					name: {
 						type: 'text',
 						label: this.$t('lesson.trainingName')
@@ -85,7 +81,7 @@ export default {
 				}
 			},
 			queryList: {
-				query: pageQueryTraining,
+				query: this.queryFunction,
 				selectCheckShow: false,
 				indexShow: true,
 				columns: [
@@ -143,13 +139,19 @@ export default {
 								handleClick: this.demoDisplay,
 								type: ''
 							}
+							/* {
+								name: this.$t('lesson.trainingRecord'),
+								handleClick: this.trainingRecord,
+								type: ''
+							}*/
 						]
 					}
 				],
 				actions: [
-					{ text: this.$t('lesson.generateTraining'), btnCode: 'employee_insert', handler: this.autoMaticTrainging },
-					{ text: this.$t('lesson.updateTraining'), btnCode: 'employee_insert', handler: this.editTrainingByType, type: 'warning'},
-					{ text: this.$t('lesson.deleteTraining'), btnCode: 'employee_insert', handler: this.delAutoMaticTrainging, type: 'danger'}
+					{ 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'}
+					/* { text: this.$t('lesson.addTraining'), btnCode: 'employee_add', handler: this.addingTraining, type: 'primary' }*/
 				]
 			},
 
@@ -159,22 +161,27 @@ export default {
 	async created() {
 		await this.loadInitData();
 		const json = localStore.get(this.$route.path);
-		if (json && json.type) {
-			this.typeChoose(json);
-		}
-		if (json && json.prdCode) {
-			this.skinCodeChoose(json);
-		}
+		json.type = '';
+		json.prdCode = '';
+		json.operateType = '';
 	},
 	methods: {
 		async loadInitData() {
 			this.skinCodeList = [];
-			this.queryForm.queryObject.skinCode.config.data = [];
+			this.queryForm.queryObject.prdCode.config.data = [];
 			getSkinCodeList().then(response => {
 				this.skinCodeList = response.data;
-				response.data.forEach(elem => {
-					this.queryForm.queryObject.skinCode.config.data.push({ value: elem.code, label: elem.name });
-				});
+			});
+			getCommodityMapProduct(this.$route.params.skinCode).then((response) => {
+				const productList = response.data;
+				if (productList && productList.length > 0) {
+					productList.forEach(elem => {
+						// 过滤综合演练产品
+						if (elem.prdType != '03') {
+							this.queryForm.queryObject.prdCode.config.data.push({ value: elem.code, label: elem.name });
+						}
+					});
+				}
 			});
 
 			this.prdTypeList = [];
@@ -213,28 +220,6 @@ export default {
 			this.trainingOperateTypeMap['08'] = list08; // 限速实训
 			this.reloadTable();
 		},
-		loadInitQueryList(form) {
-			if (form && form.skinCode) {
-				getCommodityMapProduct(form.skinCode).then((response) => {
-					const productList = response.data;
-					if (productList && productList.length > 0) {
-						productList.forEach(elem => {
-							// 过滤综合演练产品
-							if (elem.prdType != '03') {
-								this.queryForm.queryObject.prdCode.config.data.push({ value: elem.code, label: elem.name });
-							}
-						});
-					}
-				});
-			}
-		},
-		skinCodeChoose(form) {
-			this.queryForm.queryObject.prdCode.config.data = [];
-			form.type = '';
-			form.prdCode = '';
-			form.operateType = '';
-			this.loadInitQueryList(form);
-		},
 		prdChoose(form) {
 			form.type = '';
 			form.operateType = '';
@@ -257,6 +242,9 @@ export default {
 		delAutoMaticTrainging() {
 			this.$refs.draftTrain.show({ event: '03', title: this.$t('lesson.deleteAutoGeneratedTraining') });
 		},
+		// addingTraining() {
+		// 	this.$refs.draftTrain.show({ event: '04', title: this.$t('lesson.addTraining') });
+		// },
 		demoDisplay(index, node) {
 			trainingNotify({ trainingId: node.id }).then(resp => {
 				/** 区分演示和正式，需要在演示时设置lessonId为0*/
@@ -266,11 +254,32 @@ export default {
 			}).catch(error => {
 				this.$messageBox(this.$t('error.createSimulationFailed') +error.message);
 			});
-
 		},
 		reloadTable() {
 			this.queryList.reload();
+		},
+		turnback() {
+			this.$router.go(-1);
+		},
+		trainingRecord(index, node) {
+			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;
+			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/lesson/trainingrecord/category/draft.vue b/src/views/lesson/trainingrecord/category/draft.vue
index 674684017..6d91e27b6 100644
--- a/src/views/lesson/trainingrecord/category/draft.vue
+++ b/src/views/lesson/trainingrecord/category/draft.vue
@@ -50,8 +50,8 @@
       </el-form-item>
     </el-form>
     <span slot="footer" class="dialog-footer">
-      <el-button @click="handleClose">{{$t('global.cancel')}}</el-button>
-      <el-button type="primary" @click="handleDeal">{{$t('global.confirm')}}</el-button>
+      <el-button @click="handleClose">{{ $t('global.cancel') }}</el-button>
+      <el-button type="primary" @click="handleDeal">{{ $t('global.confirm') }}</el-button>
     </span>
   </el-dialog>
 </template>
@@ -176,7 +176,7 @@ export default {
 			}
 			if (node && node.data) {
 				switch (node.data.type) {
-				case 'trainingType':
+				case 'TrainingType':
 					if (node.parent) {
 						this.operateModel.type = node.data.id;
 						this.operateModel.prdCode = node.parent.data.id;
@@ -196,7 +196,7 @@ export default {
 					this.operateModel.operateType = '';
 					this.operationList = this.trainingOperateTypeMap[node.data.id] || [];
 					break;
-				case 'training':
+				case 'Training':
 					if (node.parent && node.parent.parent) {
 						this.operateModel.type = node.parent.data.id;
 						this.operateModel.prdCode = node.parent.parent.data.id;
diff --git a/src/views/lesson/trainingrecord/category/operateMenu.vue b/src/views/lesson/trainingrecord/category/operateMenu.vue
index 0d3e0c7ba..2c5dd04a8 100644
--- a/src/views/lesson/trainingrecord/category/operateMenu.vue
+++ b/src/views/lesson/trainingrecord/category/operateMenu.vue
@@ -54,10 +54,10 @@ export default {
 		node: function (val, old) {
 			if (val && val.data) {
 				switch (val.data.type) {
-				case 'trainingType':
+				case 'TrainingType':
 					this.menu = this.menuCreate;
 					break;
-				case 'training':
+				case 'Training':
 					this.menu = this.menuEdit;
 					break;
 				}
diff --git a/src/views/lesson/trainingrecord/category/tree.vue b/src/views/lesson/trainingrecord/category/tree.vue
index 8e443fecc..af283369d 100644
--- a/src/views/lesson/trainingrecord/category/tree.vue
+++ b/src/views/lesson/trainingrecord/category/tree.vue
@@ -19,17 +19,17 @@
         @node-click="clickEvent"
       >
         <div slot-scope="{ node: nodeScop }">
-          <span v-if="nodeScop.data.type == 'skin'" class="el-icon-news"></span>
-          <span v-else-if="nodeScop.data.type == 'prd'" class="el-icon-tickets"></span>
+          <span v-if="nodeScop.data.type == 'skin'" class="el-icon-news" />
+          <span v-else-if="nodeScop.data.type == 'prd'" class="el-icon-tickets" />
           <span
             v-else-if="nodeScop.data.type == 'trainingType'"
             class="el-icon-document"
-          ></span>
+          />
           <span
             v-else-if="nodeScop.data.type == 'training'"
             class="el-icon-edit-outline"
-          ></span>
-            <span>&nbsp;{{ nodeScop.label }}</span>
+          />
+          <span>&nbsp;{{ nodeScop.label }}</span>
         </div>
       </el-tree>
     </el-scrollbar>
@@ -86,12 +86,13 @@ export default {
 		},
 		clickEvent(obj, node, data) {
 			this.$store.dispatch('menuOperation/setPopMenu', { position: null, menu: null });
-			if (obj && obj.type === 'training') {
+			if (obj && obj.type === 'Training') {
 				this.$emit('selectMapSure', obj);
 			}
 		},
 		showContextMenu(e, obj, node, vueElem) {
-			if (obj && obj.type === 'trainingType' || obj.type === 'training') {
+
+			if (obj && obj.type === 'TrainingType' || obj.type === 'Training') {
 				e.preventDefault();
 				this.point = {
 					x: e.clientX,
@@ -103,7 +104,7 @@ export default {
 			}
 		},
 		getParent(node) {
-			while (node && node.data.type != 'skin') {
+			while (node && node.data.type != 'Skin') {
 				node = node.parent;
 			}
 
diff --git a/src/views/lesson/trainingrecord/home.vue b/src/views/lesson/trainingrecord/home.vue
new file mode 100644
index 000000000..744f3741d
--- /dev/null
+++ b/src/views/lesson/trainingrecord/home.vue
@@ -0,0 +1,160 @@
+<template>
+  <el-card v-loading="loading" class="map-list-main">
+    <div slot="header" class="clearfix">
+      <span>{{ $t(`lesson.trainingList`) }}</span>
+    </div>
+    <div style="{width: 150px}">
+      <el-input v-model="filterText" :placeholder="$t(`lesson.filterPlaceholder`)" clearable />
+    </div>
+    <el-scrollbar wrap-class="scrollbar-wrapper" :style="{ height: (height-270) +'px' }">
+      <el-tree
+        ref="tree"
+        :data="treeData"
+        :props="defaultProps"
+        node-key="id"
+        :default-expanded-keys="defaultShowKeys"
+        :filter-node-method="filterNode"
+        expand-on-click-node
+        highlight-current
+        :span="22"
+        @node-contextmenu="showContextMenu"
+        @node-click="clickEvent"
+      >
+        <div slot-scope="{ node: nodeScop }">
+          <span v-if="nodeScop.data.type == 'skin'" class="el-icon-news">&nbsp;{{ nodeScop.label }}</span>
+          <span v-else-if="nodeScop.data.type == 'prd'" class="el-icon-tickets">&nbsp;{{ nodeScop.label }}</span>
+          <span
+            v-else-if="nodeScop.data.type == 'trainingType'"
+            class="el-icon-document"
+          >&nbsp;{{ nodeScop.label }}</span>
+          <span
+            v-else-if="nodeScop.data.type == 'training'"
+            class="el-icon-edit-outline"
+          >&nbsp;{{ nodeScop.label }}</span>
+        </div>
+      </el-tree>
+    </el-scrollbar>
+    <operate-menu ref="menu" :point="point" :node="node" @refresh="refresh" @trainingShow="trainingShow" />
+  </el-card>
+</template>
+<script>
+import { DeviceMenu } from '@/scripts/ConstDic';
+import { getTrainingTree } from '@/api/jmap/training';
+import { trainingNotify } from '@/api/simulation';
+import OperateMenu from './category/operateMenu';
+import { UrlConfig } from '@/router/index';
+import localStore from 'storejs';
+
+export default {
+	name: 'TrainingOperate',
+	components: {
+		OperateMenu
+	},
+	data() {
+		return {
+			loading: true,
+			defaultShowKeys: [],
+			filterText: '',
+			treeData: [],
+			defaultProps: {
+				children: 'children',
+				label: 'name'
+			},
+			point: {
+				x: 0,
+				y: 0
+			},
+			node: {
+			}
+		};
+	},
+	computed: {
+		height() {
+			return this.$store.state.app.height - 50;
+		}
+	},
+	watch: {
+		filterText(val) {
+			this.$refs.tree.filter(val);
+		}
+	},
+	mounted() {
+		this.refresh();
+	},
+	methods: {
+		filterNode(value, data) {
+			if (!value) return true;
+			return data.name.indexOf(value) !== -1;
+		},
+		clickEvent(obj, node, data) {
+			this.$store.dispatch('menuOperation/setPopMenu', { position: null, menu: null });
+			if (obj && obj.type === 'Training') {
+				this.resize();
+				trainingNotify({ trainingId: obj.id }).then(resp => {
+					this.group = resp.data;
+					this.$router.push({ path: `${UrlConfig.design.lessonTraining}/${obj.id}/${obj.name}`, query: { group: resp.data } });
+				}).catch(error => {
+					this.$messageBox(`${this.$t('error.createSimulationFailed')}: ${error.message}`);
+				});
+			}
+		},
+		showContextMenu(e, obj, node, vueElem) {
+			if (obj && obj.type === 'TrainingType' || obj.type === 'Training') {
+				e.preventDefault();
+				this.point = {
+					x: e.clientX,
+					y: e.clientY
+				};
+				this.node = node;
+				const menu = DeviceMenu.Training;
+				this.$store.dispatch('menuOperation/setPopMenu', { position: this.point, menu: menu });
+			}
+		},
+		getParent(node) {
+			while (node && node.data.type != 'Skin') {
+				node = node.parent;
+			}
+
+			return node || {};
+		},
+		trainingShow() {
+			this.$emit('trainingStart', { id: this.node.data.id, lessonId: this.getParent(this.node).data.id });
+		},
+		refresh() {
+			this.loading = true;
+			getTrainingTree().then(response => {
+				this.treeData = response.data;
+				this.defaultShowKeys = [this.$route.params.trainingId];
+				this.$nextTick(() => {
+					this.loading = false;
+					this.$refs.tree.setCurrentKey(this.$route.params.trainingId); // value 绑定的node-key
+					if (this.filterText) {
+						this.$refs.tree.filter(this.filterText);
+					}
+				});
+			}).catch(() => {
+				this.loading = false;
+				this.$messageBox(this.$t('error.refreshFailed'));
+			});
+		},
+		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 });
+		}
+	}
+};
+</script>
+
+<style>
+    .el-tree {
+        overflow-x: hidden;
+    }
+    .map-list-main {
+        text-align: center;
+    }
+    .el-tree-node.is-current>.el-tree-node__content {
+        background-color: #e4e3e3 !important;
+    }
+</style>
diff --git a/src/views/lesson/trainingrecord/index.vue b/src/views/lesson/trainingrecord/index.vue
index d9b2d81ea..7997efa4f 100644
--- a/src/views/lesson/trainingrecord/index.vue
+++ b/src/views/lesson/trainingrecord/index.vue
@@ -9,7 +9,7 @@
       />
     </div>
     <drap-left :width-left="widthLeft" @drapWidth="drapWidth" />
-    <div class="mapContext">
+    <div>
       <router-view />
     </div>
   </div>
@@ -100,9 +100,4 @@ export default {
         float: left;
         width: 350px;
     }
-
-    .mapContext {
-        float: right;
-        width: auto;
-    }
 </style>
diff --git a/src/views/lesson/trainingrecord/manage/index.vue b/src/views/lesson/trainingrecord/manage/index.vue
index 940dffc8c..39bea1645 100644
--- a/src/views/lesson/trainingrecord/manage/index.vue
+++ b/src/views/lesson/trainingrecord/manage/index.vue
@@ -43,6 +43,12 @@ export default {
 		},
 		trainingId() {
 			return this.$route.params.trainingId;
+		},
+		width() {
+			return this.$store.state.app.width - 481 - this.widthLeft;
+		},
+		height() {
+			return this.$store.state.app.height - 90;
 		}
 	},
 	watch: {
@@ -112,7 +118,9 @@ export default {
     @import "src/styles/mixin.scss";
 
     .blockContext {
-        float: left;
+        // float: left;
+		height: 100%;
+        overflow: hidden;
     }
 
     .mapContext {
diff --git a/src/views/lesson/trainingrecord/manage/stepmanage/index.vue b/src/views/lesson/trainingrecord/manage/stepmanage/index.vue
index c3978f6e0..879f19532 100644
--- a/src/views/lesson/trainingrecord/manage/stepmanage/index.vue
+++ b/src/views/lesson/trainingrecord/manage/stepmanage/index.vue
@@ -81,3 +81,4 @@ export default {
 	}
 };
 </script>
+
diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index bca6294c0..1a553d0ff 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="login-container" :style="{'background-image': 'url('+bgImg+')'}">
+    <div v-if="project" class="text-box">{{ title }}</div>
     <div class="content-box">
-
       <div class="qrcode-main">
         <div class="login-code-box" @click="loginRefresh">
           <qrcode-vue
@@ -30,7 +30,7 @@
       </div>
 
       <el-form ref="loginForm" class="login-form" :model="loginForm" :rules="loginRules" label-position="left">
-        <div class="title_box">欢迎登陆琏课堂</div>
+        <div class="title_box">欢迎登录城市轨道交通实训平台</div>
         <el-form-item prop="username" class="item_form_box">
           <span class="svg-container svg-container_login">
             <svg-icon icon-class="user" />
@@ -49,23 +49,45 @@
             @keyup.enter="handleLogin"
           />
           <span class="show-pwd" @click="showPwd">
-            <svg-icon icon-class="eye" />
+            <svg-icon icon-class="eye" v-if="pwdDisplay"/>
+            <svg-icon icon-class="eye-open" v-else/>
           </span>
         </el-form-item>
         <div class="tip-message">{{ tipsMsg }}</div>
-        <el-popover
+        <div style="display: inline-block;width: 100%;margin-bottom: 10px;">
+          <div style="display:inline-block">
+              <el-checkbox v-model="isAutoLogin">自动登录</el-checkbox>
+          </div>
+          <el-popover
+            placement="right"
+            title=""
+            width="200"
+            trigger="hover"
+            class="popover_box"
+          >
+            <div>
+              <img :src="QCode" alt="" style="width: 100px; height: 100px; display: block; margin:0 auto;">
+              <div style="margin-top: 10px;">请在琏课堂小程序助手，完善个人信息，设置登录密码，手机号或邮箱。</div>
+            </div>
+            <div slot="reference">无法登录?</div>
+          </el-popover>
+        </div>
+        <!-- <el-popover
           placement="right"
           title=""
           width="200"
           trigger="hover"
-          content="请在琏课堂小程序助手，完善个人信息，设置登陆密码，手机号或邮箱。"
           class="popover_box"
         >
-          <div slot="reference">无法登陆?</div>
-        </el-popover>
+          <div>
+            <img :src="QCode" alt="" style="width: 100px; height: 100px; display: block; margin:0 auto;">
+            <div style="margin-top: 10px;">请在琏课堂小程序助手，完善个人信息，设置登录密码，手机号或邮箱。</div>
+          </div>
+          <div slot="reference">无法登录?</div>
+        </el-popover> -->
         <el-form-item>
           <el-button type="primary" style="width:100%;" :loading="loading" @click.native.prevent="handleLogin">
-            登陆
+            登录
           </el-button>
         </el-form-item>
       </el-form>
@@ -75,14 +97,20 @@
 </template>
 
 <script>
+// import md5 from 'js-md5';
+import QCode from '@/assets/erCode.jpg';
+import { removeSessionStorage } from '@/utils/auth';
+import { UrlConfig } from '@/router/index';
+import localStore from 'storejs';
+import Cookies from 'js-cookie';
 import md5 from 'js-md5';
 import QrcodeVue from 'qrcode.vue';
 import { getLoginWmurl, checkLoginStatus } from '@/api/login';
 import { LoginParams } from '@/utils/login';
 import bgImg from '@/assets/bg1.jpg';
 import { setToken } from '@/utils/auth';
+import { loginTitle } from '@/scripts/ConstDic';
 
-// 登陆琏课堂
 export default {
 	name: 'Login',
 	components: { QrcodeVue },
@@ -103,6 +131,8 @@ export default {
 		};
 		return {
 			bgImg: bgImg,
+      QCode: QCode,
+      isAutoLogin:false,
 			loginForm: {
 				username: '',
 				password: ''
@@ -120,13 +150,50 @@ export default {
 			loadingCode: false,
 			checkLogin: null,
 			checkTimeout: null,
-			scanSuccess: false
+      scanSuccess: false,
+      pwdDisplay:true
 		};
 	},
-	mounted() {
-		document.title = '琏课堂';
-		this.loginRefresh();
+	computed: {
+		project() {
+			return this.$route.params.project;
+		},
+		title() {
+			return loginTitle[this.$route.params.project||'default'];
+		}
 	},
+	mounted() {
+		document.title = loginTitle[this.$route.params.project||'default'];
+		this.loginRefresh();
+  },
+  beforeCreate(){
+      if(Cookies.get('UserName')&&Cookies.get('UserToken')){
+          const model = {'username':Cookies.get('UserName'),'password':Cookies.get('UserToken')};
+          model.type = 'class';
+          model.project = this.$route.params.project;
+          removeSessionStorage('againEnter');
+					this.$store.dispatch('Login', model).then(() => {
+						this.$store.dispatch('GetUserConfigInfo');
+						this.$store.dispatch('SetAccount', model.username);
+						// 设置路由
+						this.loading = false;
+						this.tipsMsg = '';
+						let path = localStore.get('trainingPlatformRoute'+model.username);
+						if (!path || !path.startsWith('/trainingPlatform')) {
+							path = UrlConfig.trainingPlatform.trainingPlatformHome;
+						}
+						this.$nextTick(() => {
+							this.$i18n.locale = 'zh';
+							Cookies.set('user_lang', 'zh');
+						});
+						this.$router.push({ path: path });
+					}).catch(error => {
+						this.tipsMsg = error.message;
+						this.loading = false;
+						setTimeout(() => { this.tipsMsg = ''; }, 5000);
+					});
+      }
+  },
 	methods: {
 		clearTimer(timer) {
 			if (timer) {
@@ -149,7 +216,7 @@ export default {
 			}).catch((error) => {
 				console.log(error);
 				this.loadingCode = false;
-				this.$messageBox('获取登陆二维码失败，请刷新重试');
+				this.$messageBox('获取登录二维码失败，请刷新重试');
 			});
 		},
 		checkLoginStatus() {
@@ -170,7 +237,15 @@ export default {
 					self.$store.dispatch('QrLoginSetting', { key: 'SET_TOKEN', value: response.data.token }).then(() => {
 						// 清除定时器，设置路由
 						self.clearTimer(self.checkLogin);
-						self.$router.push({ path: '/' });
+						let path = '/login';
+						if (this.project) {
+							path = path + '/' + this.project;
+						}
+						self.$router.push({ path: path });
+						self.$nextTick(() => {
+							self.$i18n.locale = 'zh';
+							Cookies.set('user_lang', 'zh');
+						});
 					});
 				}).catch(error => {
 					if (error.data && error.data.status == '1') {
@@ -181,10 +256,12 @@ export default {
 			}, 3000);
 		},
 		showPwd() {
-			if (this.pwdType === 'password') {
+      if (this.pwdType === 'password') {
+        this.pwdDisplay=false;
 				this.pwdType = '';
 			} else {
-				this.pwdType = 'password';
+        this.pwdType = 'password';
+        this.pwdDisplay=true;
 			}
 		},
 		handleLogin() {
@@ -193,18 +270,32 @@ export default {
 					const model = Object.assign({}, this.loginForm);
 					model.password = md5(model.password);
 					model.type = 'class';
-
-					this.loading = true;
+					model.project = this.$route.params.project;
+          this.loading = true;
+          if(this.isAutoLogin){
+              Cookies.set('UserName', model.username, { expires: 1/48});
+              Cookies.set('UserToken', model.password, { expires: 1/48});
+          }
+					removeSessionStorage('againEnter');
 					this.$store.dispatch('Login', model).then(() => {
 						this.$store.dispatch('GetUserConfigInfo');
+						this.$store.dispatch('SetAccount', model.username);
 						// 设置路由
 						this.loading = false;
 						this.tipsMsg = '';
-						this.$router.push({ path: '/' });
-					}).catch(() => {
-						this.tipsMsg = '用户名或密码不正确，请重新输入。';
+						let path = localStore.get('trainingPlatformRoute'+model.username);
+						if (!path || !path.startsWith('/trainingPlatform')) {
+							path = UrlConfig.trainingPlatform.trainingPlatformHome;
+						}
+						this.$nextTick(() => {
+							this.$i18n.locale = 'zh';
+							Cookies.set('user_lang', 'zh');
+						});
+						this.$router.push({ path: path });
+					}).catch(error => {
+						this.tipsMsg = error.message;
 						this.loading = false;
-						setTimeout(() => { this.tipsMsg = ''; }, 15000);
+						setTimeout(() => { this.tipsMsg = ''; }, 5000);
 					});
 				} else {
 					console.log('error submit!!');
@@ -217,15 +308,18 @@ export default {
 </script>
 
 <style rel="stylesheet/scss" lang="scss">
-  $bg:#fff;
-  $light_gray:#eee;
+    $bg:#fff;
+    $light_gray:#eee;
 
-  .login-container {
+    .login-container {
+    .el-form-item{
+        background: #fff !important;
+        border: 1px solid rgba(0, 0, 0, 0.1) !important;
     .el-input {
-      height: 40px;
-      width: 85%;
-
-      input {
+        height: 40px;
+        width: 85%;
+        background: #fff;
+    input {
         background: #fff !important;
         border: 0px;
         -webkit-appearance: none;
@@ -234,39 +328,40 @@ export default {
         color: #000;
         height: 100%;
 
-        &:-webkit-autofill {
-          box-shadow: 0 0 0px 1000px $bg inset !important;
-          -webkit-text-fill-color: #000 !important;
-        }
-      }
+    &:-webkit-autofill {
+         box-shadow: 0 0 0px 1000px $bg inset !important;
+         -webkit-text-fill-color: #000 !important;
+     }
+    }
+    }
     }
 
     .item_form_box {
-      border: 1px solid #ccc;
-      border-radius: 5px;
-      color: #454545;
+        border: 1px solid #ccc;
+        border-radius: 5px;
+        color: #454545;
     }
 
     .item_form_password{
         margin-bottom: 10px;
     }
 
-	.tip-message {
-		color: #F56C61;
-		padding: 5px;
+    .tip-message {
+        color: #F56C61;
+        padding: 5px;
         font-size: 12px;
         height: 23px;
         margin-bottom: 10px;
-	}
-  }
+    }
+    }
 </style>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-  $bg:#f0f0f0;
-  $qrbg:#fff;
-  $dark_gray:#889aa4;
-  $light_gray:#eee;
-  $qrcodeSize: 270px;
+    $bg:#f0f0f0;
+    $qrbg:#fff;
+    $dark_gray:#889aa4;
+    $light_gray:#eee;
+    $qrcodeSize: 270px;
     .popover_box {
         position: absolute;
         right: 80px;
@@ -275,18 +370,16 @@ export default {
         color: #225592;
         font-size: 14px;
     }
-
-  .login-container {
-    position: fixed;
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    height: 100%;
-    width: 100%;
-    background-repeat: no-repeat;
-    background-origin: border-box;
-    background-size: 100% 100%;
-
+    .login-container {
+        position: fixed;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        height: 100%;
+        width: 100%;
+        background-repeat: no-repeat;
+        background-origin: border-box;
+        background-size: 100% 100%;
     .content-box{
         width: 720px;
         display: flex;
@@ -298,47 +391,52 @@ export default {
         box-sizing: border-box;
         position: relative;
     }
-
+    .text-box{
+        position: absolute;
+        top: 10%;
+        font-size: 30px;
+        font-weight: bold;
+    }
     .login-form {
         width: 420px;
         padding: 0 50px;
     }
 
     .svg-container {
-      padding-left: 14px;
-      color: $dark_gray;
-      vertical-align: middle;
-      width: 30px;
-      display: inline-block;
+        padding-left: 14px;
+        color: $dark_gray;
+        vertical-align: middle;
+        width: 30px;
+        display: inline-block;
 
-      &_login {
-        font-size: 16px;
-      }
+    &_login {
+         font-size: 16px;
+     }
     }
 
     .title_box {
-      font-size: 24px;
-      color: #000;
-      margin: 0px auto 30px auto;
-      text-align: center;
+        font-size: 20px;
+        color: #000;
+        margin: 0px auto 30px auto;
+        text-align: center;
     }
 
     .show-pwd {
-      position: absolute;
-      right: 10px;
-      top: 3px;
-      font-size: 16px;
-      color: $dark_gray;
-      cursor: pointer;
-      user-select: none;
+        position: absolute;
+        right: 10px;
+        top: 3px;
+        font-size: 16px;
+        color: $dark_gray;
+        cursor: pointer;
+        user-select: none;
+    }
     }
-  }
 
-  .qrcode-main{
-    width: 300px;
-    background-color: $qrbg;
-    text-align: center;
-    border-right: 1px solid #ececec;
+    .qrcode-main{
+        width: 300px;
+        background-color: $qrbg;
+        text-align: center;
+        border-right: 1px solid #ececec;
     .tip-info {
         text-align: left;
         display: inline-block;
@@ -363,5 +461,6 @@ export default {
         color: #353535;
         line-height: 30px;
     }
-  }
+    }
 </style>
+
diff --git a/src/views/login/loginDesign.vue b/src/views/login/loginDesign.vue
new file mode 100644
index 000000000..9fb58082e
--- /dev/null
+++ b/src/views/login/loginDesign.vue
@@ -0,0 +1,436 @@
+<template>
+  <div class="login-container" :style="{'background-image': 'url('+bgImg+')'}">
+    <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="点击刷新"
+            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 class="tip-info">
+          <fieldset>
+            <legend>推荐配置</legend>
+            <span>浏览器：
+              <a href="https://www.google.cn/chrome/" target="_blank" style="text-decoration: underline;">谷歌浏览器</a>
+            </span>
+            <br>
+            <span>屏幕分辨率：1920*1080</span>
+          </fieldset>
+        </div>
+      </div>
+
+      <el-form ref="loginForm" class="login-form" :model="loginForm" :rules="loginRules" label-position="left">
+        <div class="title_box">欢迎登录城市轨道交通设计平台</div>
+        <el-form-item prop="username" class="item_form_box">
+          <span class="svg-container svg-container_login">
+            <svg-icon icon-class="user" />
+          </span>
+          <el-input v-model="loginForm.username" name="username" type="text" placeholder="Mobile phone number/email" />
+        </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
+            v-model="loginForm.password"
+            name="password"
+            :type="pwdType"
+            placeholder="密码"
+            @keyup.enter="handleLogin"
+          />
+          <span class="show-pwd" @click="showPwd">
+            <svg-icon icon-class="eye" v-if="pwdDisplay"/>
+            <svg-icon icon-class="eye-open" v-else/>
+          </span>
+        </el-form-item>
+        <div class="tip-message">{{ tipsMsg }}</div>
+        <div style="display: inline-block;width: 100%;margin-bottom: 10px;">
+          <div style="display:inline-block">
+              <el-checkbox v-model="isAutoLogin">自动登录</el-checkbox>
+          </div>
+          <el-popover
+            placement="right"
+            title=""
+            width="200"
+            trigger="hover"
+            class="popover_box"
+          >
+            <div>
+              <img :src="QCode" alt="" style="width: 100px; height: 100px; display: block; margin:0 auto;">
+              <div style="margin-top: 10px;">请在琏课堂小程序助手，完善个人信息，设置登录密码，手机号或邮箱。</div>
+            </div>
+            <div slot="reference">无法登录?</div>
+          </el-popover>
+        </div>
+        <el-form-item>
+          <el-button type="primary" style="width:100%;" :loading="loading" @click.native.prevent="handleLogin">
+            登录
+          </el-button>
+        </el-form-item>
+      </el-form>
+
+    </div>
+  </div>
+</template>
+
+<script>
+import { UrlConfig } from '@/router/index';
+import md5 from 'js-md5';
+import Cookies from 'js-cookie';
+import QrcodeVue from 'qrcode.vue';
+import { getLoginWmurl, checkLoginStatus } from '@/api/login';
+import { LoginParams } from '@/utils/login';
+import bgImg from '@/assets/bg1.jpg';
+import { setDesignToken } from '@/utils/auth';
+import QCode from '@/assets/erCode.jpg';
+
+export default {
+	name: 'LoginDesign',
+	components: { QrcodeVue },
+	data() {
+		const validateUsername = (rule, value, callback) => {
+			if (value.length < 5) {
+				callback(new Error('请输入正确的用户名'));
+			} else {
+				callback();
+			}
+		};
+		const validatePass = (rule, value, callback) => {
+			if (value.length < 5) {
+				callback(new Error('密码不能小于5位'));
+			} else {
+				callback();
+			}
+		};
+		return {
+      bgImg: bgImg,
+      isAutoLogin:false,
+			loginForm: {
+				username: '',
+				password: ''
+			},
+			loginRules: {
+				username: [{ required: true, trigger: 'blur', validator: validateUsername }],
+				password: [{ required: true, trigger: 'blur', validator: validatePass }]
+			},
+			loading: false,
+      pwdType: 'password',
+      QCode: QCode,
+			tipsMsg: '',
+			qrcodeClassName: 'login-qrcode',
+			sessionId: '',
+			loginUrl: '',
+			loadingCode: false,
+			checkLogin: null,
+			checkTimeout: null,
+      scanSuccess: false,
+      pwdDisplay:true
+		};
+  },
+  beforeCreate(){
+      if(Cookies.get('UserDesignName')&&Cookies.get('UserDesignToken')){
+          const model = {'username':Cookies.get('UserDesignName'),'password':Cookies.get('UserDesignToken')};
+          model.type = 'design';
+          this.$store.dispatch('Login', model).then(() => {
+            this.$store.dispatch('GetUserConfigInfo');
+            // 设置路由
+            this.loading = false;
+            this.tipsMsg = '';
+            this.$nextTick(() => {
+              this.$i18n.locale = 'zh';
+              Cookies.set('user_lang', 'zh');
+            });
+            this.$router.push({ path: `${UrlConfig.design.prefix}` });
+          }).catch(error => {
+            this.tipsMsg = error.message;
+            this.loading = false;
+            setTimeout(() => { this.tipsMsg = ''; }, 5000);
+          });
+      }
+  },
+	mounted() {
+    document.title = '城市轨道交通设计平台';
+		this.loginRefresh();
+	},
+	methods: {
+		clearTimer(timer) {
+			if (timer) {
+				clearTimeout(timer);
+				timer = null;
+			}
+    },
+    judgeAutoLogin(){
+        
+    },
+		loginRefresh() {
+			this.loadingCode = true;
+			getLoginWmurl(LoginParams.Design).then(response => {
+				this.sessionId = response.data.sessionId;
+				this.loginUrl = response.data.url;
+				this.loadingCode = false;
+				this.clearTimer(this.checkTimeout);
+				this.checkTimeout = setTimeout(() => {
+					this.loadingCode = true;
+					this.loginUrl = '';
+				}, 3 * 60 * 1000);
+				this.checkLoginStatus();
+			}).catch((error) => {
+				console.log(error);
+				this.loadingCode = false;
+				this.$messageBox('获取登录二维码失败，请刷新重试');
+			});
+		},
+		checkLoginStatus() {
+			const self = this;
+
+			// 销毁则不再定时
+			if (this && this._isDestroyed) {
+				return;
+			}
+
+			// 清空已存在的定时器
+			// 设置定时器检测
+      this.clearTimer(this.checkLogin);
+			this.checkLogin = setTimeout(() => {
+				checkLoginStatus(self.sessionId).then(response => {
+					setDesignToken(response.data.token);
+					// 设置扫码登录
+					self.$store.dispatch('QrLoginSetting', { key: 'SET_TOKENDESIGN', value: response.data.token }).then(() => {
+            // 清除定时器，设置路由
+						self.clearTimer(self.checkLogin);
+						self.$router.push({ path: '/design/login' });
+						self.$nextTick(() => {
+							self.$i18n.locale = 'zh';
+							Cookies.set('user_lang', 'zh');
+						});
+					});
+				}).catch(error => {
+					if (error.data && error.data.status == '1') {
+						self.scanSuccess = true;
+					}
+					self.checkLoginStatus();
+				});
+			}, 3000);
+		},
+		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);
+          
+          if(this.isAutoLogin){
+              Cookies.set('UserDesignName', model.username, { expires: 1/48});
+              Cookies.set('UserDesignToken', model.password, { expires: 1/48});
+          }
+					// model.type = 'plan';
+          model.type = 'design';
+          
+					this.loading = true;
+					this.$store.dispatch('Login', model).then(() => {
+						this.$store.dispatch('GetUserConfigInfo');
+						// 设置路由
+						this.loading = false;
+						this.tipsMsg = '';
+						this.$nextTick(() => {
+							this.$i18n.locale = 'zh';
+							Cookies.set('user_lang', 'zh');
+						});
+						this.$router.push({ path: `${UrlConfig.design.prefix}` });
+					}).catch(error => {
+						this.tipsMsg = error.message;
+						this.loading = false;
+						setTimeout(() => { this.tipsMsg = ''; }, 5000);
+					});
+
+				} else {
+					console.log('error submit!!');
+					return false;
+				}
+			});
+		}
+	}
+};
+</script>
+
+<style rel="stylesheet/scss" lang="scss">
+    $bg:#fff;
+    $light_gray:#eee;
+
+    .login-container {
+    .el-form-item{
+        background: #fff !important;
+        border: 1px solid rgba(0, 0, 0, 0.1) !important;
+        .el-input {
+            height: 40px;
+            width: 85%;
+            background: #fff;
+            input {
+                background: #fff !important;
+                border: 0px;
+                -webkit-appearance: none;
+                border-radius: 0px;
+                padding: 8px 9px 7px 5px;
+                color: #000;
+                height: 100%;
+                &:-webkit-autofill {
+                    box-shadow: 0 0 0px 1000px $bg inset !important;
+                    -webkit-text-fill-color: #000 !important;
+                }
+            }
+        }
+    }
+
+    .item_form_box {
+        border: 1px solid #ccc;
+        border-radius: 5px;
+        color: #454545;
+    }
+
+    .item_form_password{
+        margin-bottom: 10px;
+    }
+
+    .tip-message {
+        color: #F56C61;
+        padding: 5px;
+        font-size: 12px;
+        height: 23px;
+        margin-bottom:10px;
+    }
+  }
+</style>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+    $bg:#f0f0f0;
+    $qrbg:#fff;
+    $dark_gray:#889aa4;
+    $light_gray:#eee;
+    $qrcodeSize: 270px;
+    // .popover_box {
+    //     position: absolute;
+    //     right: 80px;
+    //     bottom: 106px;
+    //     cursor: pointer;
+    //     color: #225592;
+    //     font-size: 14px;
+    // }
+    .popover_box {
+      position: relative;
+      display: inline-block;
+      float: right;
+      cursor: pointer;
+      color: #225592;
+      font-size: 14px;
+    }
+    .login-container {
+        position: fixed;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        height: 100%;
+        width: 100%;
+        background-repeat: no-repeat;
+        background-origin: border-box;
+        background-size: 100% 100%;
+    .content-box{
+        width: 720px;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        background: #fff;
+        padding: 30px 30px 30px;
+        margin-bottom: 20px;
+        box-sizing: border-box;
+        position: relative;
+    }
+    .text-box{
+        position: absolute;
+        top: 10%;
+        font-size: 30px;
+        font-weight: bold;
+    }
+    .login-form {
+        width: 420px;
+        padding: 0 50px;
+    }
+
+    .svg-container {
+        padding-left: 14px;
+        color: $dark_gray;
+        vertical-align: middle;
+        width: 30px;
+        display: inline-block;
+
+    &_login {
+         font-size: 16px;
+     }
+    }
+
+    .title_box {
+        font-size: 20px;
+        color: #000;
+        margin: 0px auto 30px auto;
+        text-align: center;
+    }
+
+    .show-pwd {
+        position: absolute;
+        right: 10px;
+        top: 3px;
+        font-size: 16px;
+        color: $dark_gray;
+        cursor: pointer;
+        user-select: none;
+    }
+    }
+
+    .qrcode-main{
+        width: 300px;
+        background-color: $qrbg;
+        text-align: center;
+        border-right: 1px solid #ececec;
+    .tip-info {
+        text-align: left;
+        display: inline-block;
+        color: green;
+        margin: 0 auto;
+    }
+
+    .login-code-box{
+        width: 150px;
+        margin: 0 auto;
+        cursor: pointer;
+    }
+
+    .system-type {
+        margin: 5px 0;
+        display: block;
+    }
+
+    .sub-title {
+        font-size: 16px;
+        text-align: center;
+        color: #353535;
+        line-height: 30px;
+    }
+    }
+</style>
+
diff --git a/src/views/login/loginEn.vue b/src/views/login/loginEn.vue
index 665a98e6f..1236534bc 100644
--- a/src/views/login/loginEn.vue
+++ b/src/views/login/loginEn.vue
@@ -1,7 +1,8 @@
 <template>
   <div class="login-container" :style="{'background-image': 'url('+bgImg+')'}">
-    <div class="content-box">
+    <div v-if="project" class="text-box">{{ title }}</div>
 
+    <div class="content-box">
       <div class="qrcode-main">
         <div class="login-code-box" @click="loginRefresh">
           <qrcode-vue
@@ -30,7 +31,7 @@
       </div>
 
       <el-form ref="loginForm" class="login-form" :model="loginForm" :rules="loginRules" label-position="left">
-        <div class="title_box">Welcome to 琏课堂</div>
+        <div class="title_box">Welcome to 城市轨道交通实训平台</div>
         <el-form-item prop="username" class="item_form_box">
           <span class="svg-container svg-container_login">
             <svg-icon icon-class="user" />
@@ -53,16 +54,37 @@
           </span>
         </el-form-item>
         <div class="tip-message">{{ tipsMsg }}</div>
-        <el-popover
+        <div style="display: inline-block;width: 100%;margin-bottom: 10px;">
+          <div style="display:inline-block">
+              <el-checkbox v-model="isAutoLogin">Auto Login</el-checkbox>
+          </div>
+          <el-popover
+            placement="right"
+            title=""
+            width="200"
+            trigger="hover"
+            class="popover_box"
+          >
+            <div>
+              <img :src="QCode" alt="" style="width: 100px; height: 100px; display: block; margin:0 auto;">
+              <div style="margin-top: 10px;">Please in lian classroom small program assistant, perfect personal information, set login password, mobile phone number or email.</div>
+            </div>
+            <div slot="reference">unable to login?</div>
+          </el-popover>
+        </div>
+        <!-- <el-popover
           placement="right"
           title=""
           width="200"
           trigger="hover"
-          content="Please in lian classroom small program assistant, perfect personal information, set login password, mobile phone number or email."
           class="popover_box"
         >
+          <div>
+            <img :src="QCode" alt="" style="width: 100px; height: 100px; display: block; margin:0 auto;">
+            <div style="margin-top: 10px;">Please in lian classroom small program assistant, perfect personal information, set login password, mobile phone number or email.</div>
+          </div>
           <div slot="reference">unable to login?</div>
-        </el-popover>
+        </el-popover> -->
         <el-form-item>
           <el-button type="primary" style="width:100%;" :loading="loading" @click.native.prevent="handleLogin">
             login
@@ -75,15 +97,19 @@
 </template>
 
 <script>
-import md5 from 'js-md5';
+import QCode from '@/assets/erCode.jpg';
+import { removeSessionStorage } from '@/utils/auth';
+import { UrlConfig } from '@/router/index';
+import localStore from 'storejs';
 import Cookies from 'js-cookie';
+import md5 from 'js-md5';
 import QrcodeVue from 'qrcode.vue';
 import { getLoginWmurl, checkLoginStatus } from '@/api/login';
 import { LoginParams } from '@/utils/login';
 import bgImg from '@/assets/bg1.jpg';
 import { setToken } from '@/utils/auth';
+import { loginTitle } from '@/scripts/ConstDic';
 
-// 英文版登陆
 export default {
 	name: 'Login',
 	components: { QrcodeVue },
@@ -103,6 +129,8 @@ export default {
 			}
 		};
 		return {
+      QCode: QCode,
+      isAutoLogin:false,
 			bgImg: bgImg,
 			loginForm: {
 				username: '',
@@ -124,8 +152,44 @@ export default {
 			scanSuccess: false
 		};
 	},
+	computed: {
+		project() {
+			return this.$route.params.project;
+		},
+		title() {
+			return loginTitle[this.$route.params.project||'default'];
+		}
+  },
+  beforeCreate(){
+    if(Cookies.get('UserName')&&Cookies.get('UserToken')){
+        const model = {'username':Cookies.get('UserName'),'password':Cookies.get('UserToken')};
+        model.type = 'class';
+        model.project = this.$route.params.project;
+        removeSessionStorage('againEnter');
+        this.$store.dispatch('Login', model).then(() => {
+          this.$store.dispatch('GetUserConfigInfo');
+          this.$store.dispatch('SetAccount', model.username);
+          // 设置路由
+          this.loading = false;
+          this.tipsMsg = '';
+          let path = localStore.get('trainingPlatformRoute'+model.username);
+          if (!path || !path.startsWith('/trainingPlatform')) {
+            path = UrlConfig.trainingPlatform.trainingPlatformHome;
+          }
+          this.$nextTick(() => {
+            this.$i18n.locale = 'en';
+            Cookies.set('user_lang', 'en');
+          });
+          this.$router.push({ path: path });
+        }).catch(error => {
+          this.tipsMsg = error.message;
+          this.loading = false;
+          setTimeout(() => { this.tipsMsg = ''; }, 5000);
+        });
+    }
+  },
 	mounted() {
-		document.title = '琏课堂';
+		document.title = loginTitle[this.$route.params.project||'default'];
 		this.loginRefresh();
 	},
 	methods: {
@@ -171,7 +235,11 @@ export default {
 					self.$store.dispatch('QrLoginSetting', { key: 'SET_TOKEN', value: response.data.token }).then(() => {
 						// 清除定时器，设置路由
 						self.clearTimer(self.checkLogin);
-						self.$router.push({ path: '/' });
+						let path = '/en/login';
+						if (this.project) {
+							path = path + '/' + this.project;
+						}
+						self.$router.push({ path: path });
 						self.$nextTick(() => {
 							self.$i18n.locale = 'en';
 							Cookies.set('user_lang', 'en');
@@ -198,20 +266,30 @@ export default {
 					const model = Object.assign({}, this.loginForm);
 					model.password = md5(model.password);
 					model.type = 'class';
-
+					model.project = this.$route.params.project;
 					this.loading = true;
+          if(this.isAutoLogin){
+              Cookies.set('UserName', model.username, { expires: 1/48});
+              Cookies.set('UserToken', model.password, { expires: 1/48});
+          }
+          removeSessionStorage('againEnter');
 					this.$store.dispatch('Login', model).then(() => {
 						this.$store.dispatch('GetUserConfigInfo');
+						this.$store.dispatch('SetAccount', model.username);
 						// 设置路由
 						this.loading = false;
 						this.tipsMsg = '';
-						this.$router.push({ path: '/' });
+						let path = localStore.get('trainingPlatformRoute'+model.username);
+						if (!path || !path.startsWith('/trainingPlatform')) {
+							path = UrlConfig.trainingPlatform.trainingPlatformHome;
+						}
 						this.$nextTick(() => {
 							this.$i18n.locale = 'en';
 							Cookies.set('user_lang', 'en');
 						});
-					}).catch(() => {
-						this.tipsMsg = 'Incorrect user name or password.';
+						this.$router.push({ path: path });
+					}).catch(error => {
+						this.tipsMsg = error.message;
 						this.loading = false;
 						setTimeout(() => { this.tipsMsg = ''; }, 5000);
 					});
@@ -225,35 +303,81 @@ export default {
 };
 </script>
 
+<style rel="stylesheet/scss" lang="scss">
+    $bg:#fff;
+    $light_gray:#eee;
+
+    .login-container {
+    .el-form-item{
+        background: #fff !important;
+        border: 1px solid rgba(0, 0, 0, 0.1) !important;
+    .el-input {
+        height: 40px;
+        width: 85%;
+        background: #fff;
+    input {
+        background: #fff !important;
+        border: 0px;
+        -webkit-appearance: none;
+        border-radius: 0px;
+        padding: 8px 9px 7px 5px;
+        color: #000;
+        height: 100%;
+
+    &:-webkit-autofill {
+         box-shadow: 0 0 0px 1000px $bg inset !important;
+         -webkit-text-fill-color: #000 !important;
+     }
+    }
+    }
+    }
+
+    .item_form_box {
+        border: 1px solid #ccc;
+        border-radius: 5px;
+        color: #454545;
+    }
+
+    .item_form_password{
+        margin-bottom: 10px;
+    }
+
+    .tip-message {
+        color: #F56C61;
+        padding: 5px;
+        font-size: 12px;
+        height: 23px;
+        margin-bottom: 10px;
+    }
+    }
+</style>
+
 <style rel="stylesheet/scss" lang="scss" scoped>
-  $bg:#f0f0f0;
-  $qrbg:#fff;
-  $dark_gray:#889aa4;
-  $light_gray:#eee;
-  $qrcodeSize: 270px;
-
-  .popover_box {
-      position: absolute;
-      right: 80px;
-      bottom: 113px;
-      cursor: pointer;
-      color: #225592;
-      font-size: 14px;
-  }
-
-  .login-container {
-    position: fixed;
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    height: 100%;
-    width: 100%;
-    background-repeat: no-repeat;
-    background-origin: border-box;
-    background-size: 100% 100%;
-
+    $bg:#f0f0f0;
+    $qrbg:#fff;
+    $dark_gray:#889aa4;
+    $light_gray:#eee;
+    $qrcodeSize: 270px;
+    .popover_box {
+        position: absolute;
+        right: 80px;
+        bottom: 106px;
+        cursor: pointer;
+        color: #225592;
+        font-size: 14px;
+    }
+    .login-container {
+        position: fixed;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        height: 100%;
+        width: 100%;
+        background-repeat: no-repeat;
+        background-origin: border-box;
+        background-size: 100% 100%;
     .content-box{
-        width: 720px;
+        width: 780px;
         display: flex;
         align-items: center;
         justify-content: center;
@@ -263,47 +387,52 @@ export default {
         box-sizing: border-box;
         position: relative;
     }
-
+    .text-box{
+        position: absolute;
+        top: 10%;
+        font-size: 30px;
+        font-weight: bold;
+    }
     .login-form {
-        width: 420px;
+        width: 480px;
         padding: 0 50px;
     }
 
     .svg-container {
-      padding-left: 14px;
-      color: $dark_gray;
-      vertical-align: middle;
-      width: 30px;
-      display: inline-block;
+        padding-left: 14px;
+        color: $dark_gray;
+        vertical-align: middle;
+        width: 30px;
+        display: inline-block;
 
-      &_login {
-        font-size: 16px;
-      }
+    &_login {
+         font-size: 16px;
+     }
     }
 
     .title_box {
-      font-size: 24px;
-      color: #000;
-      margin: 0px auto 30px auto;
-      text-align: center;
+        font-size: 20px;
+        color: #000;
+        margin: 0px auto 30px auto;
+        text-align: center;
     }
 
     .show-pwd {
-      position: absolute;
-      right: 10px;
-      top: 3px;
-      font-size: 16px;
-      color: $dark_gray;
-      cursor: pointer;
-      user-select: none;
+        position: absolute;
+        right: 10px;
+        top: 3px;
+        font-size: 16px;
+        color: $dark_gray;
+        cursor: pointer;
+        user-select: none;
+    }
     }
-  }
 
-  .qrcode-main{
-    width: 300px;
-    background-color: $qrbg;
-    text-align: center;
-    border-right: 1px solid #ececec;
+    .qrcode-main{
+        width: 300px;
+        background-color: $qrbg;
+        text-align: center;
+        border-right: 1px solid #ececec;
     .tip-info {
         text-align: left;
         display: inline-block;
@@ -328,5 +457,6 @@ export default {
         color: #353535;
         line-height: 30px;
     }
-  }
+    }
 </style>
+
diff --git a/src/views/login/loginEnDesign.vue b/src/views/login/loginEnDesign.vue
new file mode 100644
index 000000000..df11a95fd
--- /dev/null
+++ b/src/views/login/loginEnDesign.vue
@@ -0,0 +1,434 @@
+<template>
+  <div class="login-container" :style="{'background-image': 'url('+bgImg+')'}">
+    <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="Click the refresh"
+            element-loading-spinner="el-icon-refresh"
+            element-loading-background="rgba(255, 255, 255, 0.9)"
+          />
+        </div>
+        <div class="login-tip">
+          <span class="sub-title">Log in using mobile phone WeChat scan code</span>
+        </div>
+        <div class="tip-info">
+          <fieldset>
+            <legend>The recommended configuration</legend>
+            <span>browser:
+              <a href="https://www.google.cn/chrome/" target="_blank" style="text-decoration: underline;">Google Chrome</a>
+            </span>
+            <br>
+            <span>screen resolution：1920*1080</span>
+          </fieldset>
+        </div>
+      </div>
+
+      <el-form ref="loginForm" class="login-form" :model="loginForm" :rules="loginRules" label-position="left">
+        <div class="title_box">Welcome to 城市轨道交通设计平台</div>
+        <el-form-item prop="username" class="item_form_box">
+          <span class="svg-container svg-container_login">
+            <svg-icon icon-class="user" />
+          </span>
+          <el-input v-model="loginForm.username" name="username" type="text" placeholder="Mobile phone number/email" />
+        </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
+            v-model="loginForm.password"
+            name="password"
+            :type="pwdType"
+            placeholder="password"
+            @keyup.enter="handleLogin"
+          />
+          <span class="show-pwd" @click="showPwd">
+            <svg-icon icon-class="eye" />
+          </span>
+        </el-form-item>
+        <div class="tip-message">{{ tipsMsg }}</div>
+        <div style="display: inline-block;width: 100%;margin-bottom: 10px;">
+          <div style="display:inline-block">
+              <el-checkbox v-model="isAutoLogin">Auto Login</el-checkbox>
+          </div>
+          <el-popover
+            placement="right"
+            title=""
+            width="200"
+            trigger="hover"
+            class="popover_box"
+          >
+            <div>
+              <img :src="QCode" alt="" style="width: 100px; height: 100px; display: block; margin:0 auto;">
+              <div style="margin-top: 10px;">Please in lian classroom small program assistant, perfect personal information, set login password, mobile phone number or email.</div>
+            </div>
+            <div slot="reference">unable to login?</div>
+          </el-popover>
+        </div>
+        <!-- <el-popover
+          placement="right"
+          title=""
+          width="200"
+          trigger="hover"
+          class="popover_box"
+        >
+          <div>
+            <img :src="QCode" alt="" style="width: 100px; height: 100px; display: block; margin:0 auto;">
+            <div style="margin-top: 10px;">Please in lian classroom small program assistant, perfect personal information, set login password, mobile phone number or email.</div>
+          </div>
+          <div slot="reference">unable to login?</div>
+        </el-popover> -->
+        <el-form-item>
+          <el-button type="primary" style="width:100%;" :loading="loading" @click.native.prevent="handleLogin">
+            login
+          </el-button>
+        </el-form-item>
+      </el-form>
+    </div>
+  </div>
+</template>
+
+<script>
+import QCode from '@/assets/erCode.jpg';
+import { UrlConfig } from '@/router/index';
+import Cookies from 'js-cookie';
+import md5 from 'js-md5';
+import QrcodeVue from 'qrcode.vue';
+import { getLoginWmurl, checkLoginStatus } from '@/api/login';
+import { LoginParams } from '@/utils/login';
+import bgImg from '@/assets/bg1.jpg';
+import { setDesignToken } from '@/utils/auth';
+
+export default {
+	name: 'LoginDesign',
+	components: { QrcodeVue },
+	data() {
+		const validateUsername = (rule, value, callback) => {
+			if (value.length < 5) {
+				callback(new Error('Please enter the correct user name'));
+			} else {
+				callback();
+			}
+		};
+		const validatePass = (rule, value, callback) => {
+			if (value.length < 5) {
+				callback(new Error('Password cannot be less than 5 digits'));
+			} else {
+				callback();
+			}
+		};
+		return {
+      QCode:QCode,
+      isAutoLogin:false,
+			bgImg: bgImg,
+			loginForm: {
+				username: '',
+				password: ''
+			},
+			loginRules: {
+				username: [{ required: true, trigger: 'blur', validator: validateUsername }],
+				password: [{ required: true, trigger: 'blur', validator: validatePass }]
+			},
+			loading: false,
+			pwdType: 'password',
+			tipsMsg: '',
+			qrcodeClassName: 'login-qrcode',
+			sessionId: '',
+			loginUrl: '',
+			loadingCode: false,
+			checkLogin: null,
+			checkTimeout: null,
+			scanSuccess: false
+		};
+  },
+  beforeCreate(){
+    if(Cookies.get('UserDesignName')&&Cookies.get('UserDesignToken')){
+        const model = {'username':Cookies.get('UserDesignName'),'password':Cookies.get('UserDesignToken')};
+        model.type = 'design';
+        this.$store.dispatch('Login', model).then(() => {
+          this.$store.dispatch('GetUserConfigInfo');
+          // 设置路由
+          this.loading = false;
+          this.tipsMsg = '';
+          this.$nextTick(() => {
+            this.$i18n.locale = 'en';
+						Cookies.set('user_lang', 'en');
+          });
+          this.$router.push({ path: `${UrlConfig.design.prefix}` });
+        }).catch(error => {
+          this.tipsMsg = error.message;
+          this.loading = false;
+          setTimeout(() => { this.tipsMsg = ''; }, 5000);
+        });
+    }
+  },
+	mounted() {
+		document.title = '城市轨道交通设计平台';
+		this.loginRefresh();
+	},
+	methods: {
+		clearTimer(timer) {
+			if (timer) {
+				clearTimeout(timer);
+				timer = null;
+			}
+		},
+		loginRefresh() {
+			this.loadingCode = true;
+			getLoginWmurl(LoginParams.Design).then(response => {
+				this.sessionId = response.data.sessionId;
+				this.loginUrl = response.data.url;
+				this.loadingCode = false;
+				this.clearTimer(this.checkTimeout);
+				this.checkTimeout = setTimeout(() => {
+					this.loadingCode = true;
+					this.loginUrl = '';
+				}, 3 * 60 * 1000);
+				this.checkLoginStatus();
+			}).catch((error) => {
+				console.log(error);
+				this.loadingCode = false;
+				this.$messageBox('Failed to get login qr code, please refresh and try again');
+			});
+		},
+		checkLoginStatus() {
+			const self = this;
+
+			// 销毁则不再定时
+			if (this && this._isDestroyed) {
+				return;
+			}
+
+			// 清空已存在的定时器
+			// 设置定时器检测
+			this.clearTimer(this.checkLogin);
+			this.checkLogin = setTimeout(() => {
+				checkLoginStatus(self.sessionId).then(response => {
+					setDesignToken(response.data.token);
+					// 设置扫码登录
+					self.$store.dispatch('QrLoginSetting', { key: 'SET_TOKENDESIGN', value: response.data.token }).then(() => {
+						// 清除定时器，设置路由
+						self.clearTimer(self.checkLogin);
+						self.$router.push({ path: '/design/login' });
+						self.$nextTick(() => {
+							self.$i18n.locale = 'en';
+							Cookies.set('user_lang', 'en');
+						});
+					});
+				}).catch(error => {
+					if (error.data && error.data.status == '1') {
+						self.scanSuccess = true;
+					}
+					self.checkLoginStatus();
+				});
+			}, 3000);
+		},
+		showPwd() {
+			if (this.pwdType === 'password') {
+				this.pwdType = '';
+			} else {
+				this.pwdType = 'password';
+			}
+		},
+		handleLogin() {
+			this.$refs.loginForm.validate(valid => {
+				if (valid) {
+					const model = Object.assign({}, this.loginForm);
+					model.password = md5(model.password);
+					// model.type = 'plan';
+          model.type = 'design';
+          
+          if(this.isAutoLogin){
+              Cookies.set('UserDesignName', model.username, { expires: 1/48});
+              Cookies.set('UserDesignToken', model.password, { expires: 1/48});
+          }
+
+					this.loading = true;
+					this.$store.dispatch('Login', model).then(() => {
+						this.$store.dispatch('GetUserConfigInfo');
+						// 设置路由
+						this.loading = false;
+						this.tipsMsg = '';
+						this.$router.push({ path: `${UrlConfig.design.prefix}` });
+						this.$nextTick(() => {
+							this.$i18n.locale = 'en';
+							Cookies.set('user_lang', 'en');
+						});
+					}).catch(error => {
+						this.tipsMsg = error.message;
+						this.loading = false;
+						setTimeout(() => { this.tipsMsg = ''; }, 5000);
+					});
+
+				} else {
+					console.log('error submit!!');
+					return false;
+				}
+			});
+		}
+	}
+};
+</script>
+
+<style rel="stylesheet/scss" lang="scss">
+    $bg:#fff;
+    $light_gray:#eee;
+
+    .login-container {
+    .el-form-item{
+        background: #fff !important;
+        border: 1px solid rgba(0, 0, 0, 0.1) !important;
+    .el-input {
+        height: 40px;
+        width: 85%;
+        background: #fff;
+    input {
+        background: #fff !important;
+        border: 0px;
+        -webkit-appearance: none;
+        border-radius: 0px;
+        padding: 8px 9px 7px 5px;
+        color: #000;
+        height: 100%;
+
+    &:-webkit-autofill {
+         box-shadow: 0 0 0px 1000px $bg inset !important;
+         -webkit-text-fill-color: #000 !important;
+     }
+    }
+    }
+    }
+
+    .item_form_box {
+        border: 1px solid #ccc;
+        border-radius: 5px;
+        color: #454545;
+    }
+
+    .item_form_password{
+        margin-bottom: 10px;
+    }
+
+    .tip-message {
+        color: #F56C61;
+        padding: 5px;
+        font-size: 12px;
+        height: 23px;
+        margin-bottom: 10px;
+    }
+    }
+</style>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+    $bg:#f0f0f0;
+    $qrbg:#fff;
+    $dark_gray:#889aa4;
+    $light_gray:#eee;
+    $qrcodeSize: 270px;
+    .popover_box {
+        position: absolute;
+        right: 80px;
+        bottom: 106px;
+        cursor: pointer;
+        color: #225592;
+        font-size: 14px;
+    }
+    .login-container {
+        position: fixed;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        height: 100%;
+        width: 100%;
+        background-repeat: no-repeat;
+        background-origin: border-box;
+        background-size: 100% 100%;
+    .content-box{
+        width: 720px;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        background: #fff;
+        padding: 30px 30px 30px;
+        margin-bottom: 20px;
+        box-sizing: border-box;
+        position: relative;
+    }
+    .text-box{
+        position: absolute;
+        top: 10%;
+        font-size: 30px;
+        font-weight: bold;
+    }
+    .login-form {
+        width: 420px;
+        padding: 0 50px;
+    }
+
+    .svg-container {
+        padding-left: 14px;
+        color: $dark_gray;
+        vertical-align: middle;
+        width: 30px;
+        display: inline-block;
+
+    &_login {
+         font-size: 16px;
+     }
+    }
+
+    .title_box {
+        font-size: 20px;
+        color: #000;
+        margin: 0px auto 30px auto;
+        text-align: center;
+    }
+
+    .show-pwd {
+        position: absolute;
+        right: 10px;
+        top: 3px;
+        font-size: 16px;
+        color: $dark_gray;
+        cursor: pointer;
+        user-select: none;
+    }
+    }
+
+    .qrcode-main{
+        width: 300px;
+        background-color: $qrbg;
+        text-align: center;
+        border-right: 1px solid #ececec;
+    .tip-info {
+        text-align: left;
+        display: inline-block;
+        color: green;
+        margin: 0 auto;
+    }
+
+    .login-code-box{
+        width: 150px;
+        margin: 0 auto;
+        cursor: pointer;
+    }
+
+    .system-type {
+        margin: 5px 0;
+        display: block;
+    }
+
+    .sub-title {
+        font-size: 16px;
+        text-align: center;
+        color: #353535;
+        line-height: 30px;
+    }
+    }
+</style>
+
diff --git a/src/views/login/loginPlan.vue b/src/views/login/loginPlan.vue
index f0703a9d5..58032fc6b 100644
--- a/src/views/login/loginPlan.vue
+++ b/src/views/login/loginPlan.vue
@@ -30,7 +30,7 @@
       </div>
 
       <el-form ref="loginForm" class="login-form" :model="loginForm" :rules="loginRules" label-position="left">
-        <div class="title_box">欢迎登陆琏计划</div>
+        <div class="title_box">欢迎登录琏计划</div>
         <el-form-item prop="username" class="item_form_box">
           <span class="svg-container svg-container_login">
             <svg-icon icon-class="user" />
@@ -53,15 +53,12 @@
           </span>
         </el-form-item>
         <div class="tip-message">{{ tipsMsg }}</div>
-        <el-popover
-          placement="right"
-          title=""
-          width="200"
-          trigger="hover"
-          content="请在琏课堂小程序助手，完善个人信息，设置登陆密码，手机号或邮箱。"
-          class="popover_box"
-        >
-          <div slot="reference">无法登陆?</div>
+        <el-popover placement="right" title="" width="200" trigger="hover" class="popover_box">
+          <div>
+            <img :src="QCode" alt="" style="width: 100px; height: 100px; display: block; margin:0 auto;">
+            <div style="margin-top: 10px;">请在琏课堂小程序助手，完善个人信息，设置登录密码，手机号或邮箱。</div>
+          </div>
+          <div slot="reference">无法登录?</div>
         </el-popover>
         <el-form-item>
           <el-button type="primary" style="width:100%;" :loading="loading" @click.native.prevent="handleLogin">
@@ -150,7 +147,7 @@ export default {
 			}).catch((error) => {
 				console.log(error);
 				this.loadingCode = false;
-				this.$messageBox('获取登陆二维码失败，请刷新重试');
+				this.$messageBox('获取登录二维码失败，请刷新重试');
 			});
 		},
 		checkLoginStatus() {
diff --git a/src/views/login/loginScreen.vue b/src/views/login/loginScreen.vue
index b0d8bcee4..8f2c1c707 100644
--- a/src/views/login/loginScreen.vue
+++ b/src/views/login/loginScreen.vue
@@ -30,7 +30,7 @@
       </div>
 
       <el-form ref="loginForm" class="login-form" :model="loginForm" :rules="loginRules" label-position="left">
-        <div class="title_box">欢迎登陆大屏系统</div>
+        <div class="title_box">欢迎登录大屏系统</div>
         <el-form-item prop="username" class="item_form_box">
           <span class="svg-container svg-container_login">
             <svg-icon icon-class="user" />
@@ -53,19 +53,16 @@
           </span>
         </el-form-item>
         <div class="tip-message">{{ tipsMsg }}</div>
-        <el-popover
-          placement="right"
-          title=""
-          width="200"
-          trigger="hover"
-          content="请在琏课堂小程序助手，完善个人信息，设置登陆密码，手机号或邮箱。"
-          class="popover_box"
-        >
-          <div slot="reference">无法登陆?</div>
+        <el-popover placement="right" title="" width="200" trigger="hover" class="popover_box">
+          <div>
+            <img :src="QCode" alt="" style="width: 100px; height: 100px; display: block; margin:0 auto;">
+            <div style="margin-top: 10px;">请在琏课堂小程序助手，完善个人信息，设置登录密码，手机号或邮箱。</div>
+          </div>
+          <div slot="reference">无法登录?</div>
         </el-popover>
         <el-form-item>
           <el-button type="primary" style="width:100%;" :loading="loading" @click.native.prevent="handleLogin">
-            登陆
+            登录
           </el-button>
         </el-form-item>
       </el-form>
@@ -150,7 +147,7 @@ export default {
 			}).catch((error) => {
 				console.log(error);
 				this.loadingCode = false;
-				this.$messageBox('获取登陆二维码失败，请刷新重试');
+				this.$messageBox('获取登录二维码失败，请刷新重试');
 			});
 		},
 		checkLoginStatus() {
diff --git a/src/views/map/mapdraft/mapedit/index.vue b/src/views/map/mapdraft/mapedit/index.vue
index a2e3e3c1c..a9db7e342 100644
--- a/src/views/map/mapdraft/mapedit/index.vue
+++ b/src/views/map/mapdraft/mapedit/index.vue
@@ -4,6 +4,7 @@
       <div class="map-view">
         <jlmap-visual ref="jlmapVisual" @onSelect="clickEvent" @onMenu="onContextmenu" />
       </div>
+      <!-- <map-create ref="mapCreate" :skin-code="skinCode" @refresh="refresh" @editmap="handleNodeClick" /> -->
       <div class="map-draft">
         <div v-show="viewDraft==='draft'">
           <map-operate
@@ -51,6 +52,7 @@ import { checkLoginLine } from '@/api/login';
 import JlmapVisual from '@/views/jlmap/index';
 import MapOperate from './mapoperate/index';
 import { EventBus } from '@/scripts/event-bus';
+import MapCreate from '../mapmanage/create';
 
 import ConfigMap from './configMap';
 
@@ -62,7 +64,8 @@ export default {
 		JlmapVisual,
 		MapOperate,
 		DataRelation,
-		ConfigMap
+		ConfigMap,
+        // MapCreate,
 	},
 	data() {
 		return {
@@ -299,7 +302,39 @@ export default {
 		// 设置显示中心
 		setCenter(code) {
 			this.$refs.jlmapVisual.setCenter(code);
-		}
+		},
+        createMap() {
+            this.$refs.mapCreate.show();
+        },
+        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.refresh();
+                        loading.close();
+                    }).catch(error => {
+                        loading.close();
+                        that.$message.error('导入失败' + error.message);
+                    });
+                    obj.value = '';
+                };
+            });
+        }
 	}
 };
 </script>
@@ -345,4 +380,23 @@ export default {
             margin-right: 12px;
         }
     }
+
+    .uploadDemo {
+        position: relative;
+        overflow: hidden;
+        float: right;
+        padding: 3px 0;
+        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/map/mapdraft/mapmanage/create.vue b/src/views/map/mapdraft/mapmanage/create.vue
index d4f42d19c..b6a88f4c6 100644
--- a/src/views/map/mapdraft/mapmanage/create.vue
+++ b/src/views/map/mapdraft/mapmanage/create.vue
@@ -122,7 +122,8 @@ export default {
 				name: [
 					{ required: true, message: this.$t('rules.pleaseEnterMapName'), trigger: 'change' }
 				]
-			}
+			},
+			cityList: []
 		};
 	},
 	watch: {
@@ -152,7 +153,9 @@ export default {
 			getSkinCodeList().then(response => {
 				this.skinCodeList = response.data;
 			});
-
+			this.$Dictionary.cityType().then(list => {
+				this.cityList = list;
+			});
 			listPublishMap().then(response => {
 				this.publishMapList = response.data;
 			}).catch(() => {
diff --git a/src/views/map/mapdraft/mapmanage/edit.vue b/src/views/map/mapdraft/mapmanage/edit.vue
index 3c19b51b7..7b5ad3e94 100644
--- a/src/views/map/mapdraft/mapmanage/edit.vue
+++ b/src/views/map/mapdraft/mapmanage/edit.vue
@@ -12,7 +12,7 @@
           @submit.native.prevent
         >
           <el-form-item :label="$t('map.skinName')" prop="skinCode">
-            <el-select v-model="editModel.skinCode" :placeholder="$t('map.pleaseSelect')" size="mini">
+            <el-select v-model="editModel.skinCode" :placeholder="$t('map.pleaseSelect')" size="mini" disabled>
               <el-option
                 v-for="item in skinCodeList"
                 :key="item.code"
diff --git a/src/views/map/mapdraft/mapmanage/operateMenu.vue b/src/views/map/mapdraft/mapmanage/operateMenu.vue
index c1aadc2f9..c0a03315e 100644
--- a/src/views/map/mapdraft/mapmanage/operateMenu.vue
+++ b/src/views/map/mapdraft/mapmanage/operateMenu.vue
@@ -2,9 +2,9 @@
   <div>
     <pop-menu ref="popMenu" :menu="menu" />
     <map-edit ref="edit" :basic-info="true" :map="editModel" :skin-code="skinCode" @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" />
+    <!-- <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>
 
@@ -14,8 +14,8 @@ import { DeviceMenu } from '@/scripts/ConstDic';
 import { UrlConfig } from '@/router/index';
 import PopMenu from '@/components/PopMenu';
 import MapEdit from './edit';
-import MapSaveAs from './saveAs';
-import MapPublish from './publish';
+// import MapSaveAs from './saveAs';
+// import MapPublish from './publish';
 import { mapGetters } from 'vuex';
 
 export default {
@@ -23,8 +23,8 @@ export default {
 	components: {
 		PopMenu,
 		MapEdit,
-		MapSaveAs,
-		MapPublish
+		// MapSaveAs,
+		// MapPublish
 	},
 	props: {
 		point: {
@@ -47,18 +47,18 @@ export default {
 					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.publish'),
-					handler: this.publish
-				},
+				// {
+				// 	label: this.$t('map.updateObjAxis'),
+				// 	handler: this.updateObjAxis
+				// },
+				// {
+				// 	label: this.$t('map.saveAs'),
+				// 	handler: this.saveAs
+				// },
+				// {
+				// 	label: this.$t('map.publish'),
+				// 	handler: this.publish
+				// },
 				{
 					label: this.$t('map.deleteObj'),
 					handler: this.deleteObj
@@ -147,7 +147,8 @@ export default {
 					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.map.draft}/0/draft` });
+							_that.$router.push({ path: `${UrlConfig.designUser.prefix}` });
 						});
 					}
 					_that.refresh();
diff --git a/src/views/map/product/edit.vue b/src/views/map/product/edit.vue
index 8fb1913de..be3700aec 100644
--- a/src/views/map/product/edit.vue
+++ b/src/views/map/product/edit.vue
@@ -95,23 +95,23 @@ export default {
 	computed: {
 		title() {
 			if (this.node && this.node.data) {
-				if (this.node.data.type === 'skin') {
+				if (this.node.data.type === 'Skin') {
 					return this.$t('map.createProductCategories');
-				} else if (this.node.data.type === 'prd' ||
-                        this.node.data.type === 'prd') {
+				} else if (this.node.data.type === 'Prd' ||
+                        this.node.data.type === 'Prd') {
 					return this.$t('map.editTraining');
 				}
 			}
 			return this.$t('map.selectOperation');
 		},
 		isCreate() {
-			return this.node && this.node.data.type === 'skin';
+			return this.node && this.node.data.type === 'Skin';
 		},
 		isUpdate() {
-			return this.node && this.node.data.type === 'prd';
+			return this.node && this.node.data.type === 'Prd';
 		},
 		isDelete() {
-			return this.node && this.node.data.type === 'prd';
+			return this.node && this.node.data.type === 'Prd';
 		},
 		isShowTrainTypes() {
 			return this.addModel.prdType != '03' && this.addModel.prdType != '04';
@@ -149,12 +149,12 @@ export default {
 				this.initTrainTypes = [];
 				this.$refs.form.resetFields();
 				this.loading = true;
-				if (node.data.type === 'skin') {
+				if (node.data.type === 'Skin') {
 					this.codeDisabled = false;
 					this.addModel.mapName = node.data.name;
 					this.addModel.skinCode = node.data.id;
 					this.loading = false;
-				} else if (node.data.type === 'prd') {
+				} else if (node.data.type === 'Prd') {
 					this.codeDisabled = true;
 					getProductDetail(node.data.id).then(response => {
 						this.addModel.mapName = node.parent.data.name;
@@ -172,6 +172,7 @@ export default {
 					});
 				} else {
 					this.addModel.prdType = '01';
+					this.loading = false;
 				}
 
 				// 清除表单验证提示信息
diff --git a/src/views/map/product/tree.vue b/src/views/map/product/tree.vue
index 0626229f6..cff6d790a 100644
--- a/src/views/map/product/tree.vue
+++ b/src/views/map/product/tree.vue
@@ -17,10 +17,10 @@
         @node-click="clickEvent"
       >
         <span slot-scope="{ node }">
-          <span v-if="node.data.type == 'skin'" class="el-icon-news"></span>
-          <span v-if="node.data.type == 'prd'" class="el-icon-tickets"></span>
-          <span v-if="node.data.type == 'trainingType'" class="el-icon-document"></span>
-          <span v-if="node.data.type == 'trainingType'" class="el-icon-edit"></span>
+          <span v-if="node.data.type == 'skin'" class="el-icon-news" />
+          <span v-if="node.data.type == 'prd'" class="el-icon-tickets" />
+          <span v-if="node.data.type == 'trainingType'" class="el-icon-document" />
+          <span v-if="node.data.type == 'trainingType'" class="el-icon-edit" />
           <span>&nbsp;{{ node.label }}</span>
         </span>
       </el-tree>
@@ -88,7 +88,7 @@ export default {
 				/* 去除列表的training节点*/
 				list.forEach(elem => {
 					elem.children = this.convertTreeData(elem.children);
-					if (elem.type !== 'trainingType') {
+					if (elem.type !== 'TrainingType') {
 						tree.push(elem);
 					}
 				});
diff --git a/src/views/map/runplan/manage/list.vue b/src/views/map/runplan/manage/list.vue
index ab37388df..54f9be9de 100644
--- a/src/views/map/runplan/manage/list.vue
+++ b/src/views/map/runplan/manage/list.vue
@@ -94,7 +94,7 @@ export default {
 		},
 		handleNodeClick(obj, node) {
 			this.$store.dispatch('runPlan/clear').then(() => {
-				if (obj.type === 'skin') {
+				if (obj.type === 'Skin') {
 					this.$router.push({ path: `${UrlConfig.map.runPlanView}/draft`, query: { skinCode: obj.id, planId: null } });
 				} else {
 					this.$router.push({ path: `${UrlConfig.map.runPlanView}/draft`, query: { skinCode: node.parent.data.id, planId: obj.id } });
diff --git a/src/views/package/detail.vue b/src/views/package/detail.vue
index f18c26b67..fbbc41378 100644
--- a/src/views/package/detail.vue
+++ b/src/views/package/detail.vue
@@ -36,7 +36,7 @@ export default {
 				indexShow: true,
 				columns: [
 					{
-						title: '权限名称',
+						title: this.$t('orderAuthor.permissionName'),
 						prop: 'name'
 					},
 					{
diff --git a/src/views/package/index.vue b/src/views/package/index.vue
index e2f3ae44a..69210d2c6 100644
--- a/src/views/package/index.vue
+++ b/src/views/package/index.vue
@@ -30,21 +30,6 @@ export default {
 				labelWidth: '140px',
 				reset: true,
 				queryObject: {
-					// 'type': {
-					// 	type: 'select',
-					// 	label: this.$t('permission.permissionType'),
-					// 	config: {
-					// 		data: []
-					// 	}
-					// },
-					// 'status': {
-					// 	type: 'select',
-					// 	label: this.$t('permission.permissionStatus'),
-					// 	value: '1',
-					// 	config: {
-					// 		data: []
-					// 	}
-					// },
 					'canDistribute': {
 						type: 'select',
 						label: this.$t('permission.permissionUseType'),
@@ -83,18 +68,6 @@ export default {
 							}
 						}
 					},
-					// {
-					// 	title: this.$t('permission.isForever'),
-					// 	prop: 'forever',
-					// 	type: 'tag',
-					// 	columnValue: (row) => { return this.$ConstSelect.translate(row.forever, 'Whether'); },
-					// 	tagType: (row) => {
-					// 		switch (row.forever) {
-					// 		case true: return 'success';
-					// 		case false: return 'danger';
-					// 		}
-					// 	}
-					// },
 					{
 						title: this.$t('permission.permissionTotal'),
 						prop: 'amount'
@@ -142,34 +115,28 @@ export default {
 					}
 				],
 				actions: [
-					{ text: this.$t('permission.permissionPack'), btnCode: 'employee_insert', handler: this.handlePermissionPack }
+					{ text: this.$t('permission.permissionPack'), btnCode: 'employee_insert', handler: this.handlePermissionPack },
 				]
 			}
 		};
 	},
-
 	mounted() {
 		this.loadInitData();
 	},
+    watch: {
+        '$route.params.mapId': function (val) {
+            this.$refs.queryListPage.refresh(true);
+        }
+    },
 	methods: {
 		handleRoleVest(index, row) {
 			this.$refs.selectRole.doShow(row.id);
 		},
 		handleDetail(index, row) {
-			this.$router.push({ path: `${UrlConfig.permission.permissionList}/detail/${row.permissionId}` });
+			this.$router.push({ path: `${UrlConfig.trainingPlatform.permissionDetails}/${row.permissionId}` });
 		},
 		loadInitData() {
 			this.queryForm.queryObject.canDistribute.config.data = this.$ConstSelect.PermissionUseList;
-
-			// this.$Dictionary.effectiveType().then(list => {
-			// 	list.forEach(elem => {
-			// 		this.queryForm.queryObject.status.config.data.push({ value: elem.code, label: elem.name });
-			// 	});
-			// 	this.$convertList(list, this.EffectiveTypeList, elem => {
-			// 		return true;
-			// 	});
-			// });
-
 			this.$Dictionary.permissionType().then(list => {
 				list.forEach(elem => {
 					elem.value = elem.code;
@@ -184,10 +151,13 @@ export default {
 			return row[porpInfo.property] ? row[porpInfo.property] : '---';
 		},
 		queryFunction(params) {
+            if (this.$route.params.mapId) {
+                params.mapId = this.$route.params.mapId;
+            }
 			return listUserPermision(params);
 		},
 		handlePermissionPack() {
-			this.$router.push({ path: `${UrlConfig.permission.permissionDraft}` });
+			this.$router.push({ path: `${UrlConfig.trainingPlatform.draft}` });
 		},
 		reloadTable() {
 			if (this.queryList && this.queryList.reload) {
diff --git a/src/views/planMonitor/detail.vue b/src/views/planMonitor/detail.vue
index 09c6741cf..3b148e9b8 100644
--- a/src/views/planMonitor/detail.vue
+++ b/src/views/planMonitor/detail.vue
@@ -1,129 +1,261 @@
 <template>
-  <el-card>
-    <div slot="header" style="text-align: center;">
-      <span class=" title">{{ $t('global.line')+courseModel.name }}</span>
-    </div>
-    <div style="margin:50px; overflow-x: auto;" :style="{ height: height - 150 +'px' }">
-      <p class="list-item">
-        <span class="list-label">{{ $t('global.updateTime') }}</span>
-        <span class="list-elem">{{ courseModel.updateTime }}</span>
-      </p>
-      <p class="list-item">
-        <span class="list-label">{{ $t('global.permissionList') }}</span>
-      </p>
-      <limit-list ref="limitList" :course-model="courseModel" @initLoadPage="getScreenLists" />
-      <p style="display: flex; justify-content: center;">
-        <span class="list-label" />
-        <el-button type="success" @click="buy">{{ $t('global.buy') }}</el-button>
-        <el-button v-if="hasPermssion" type="primary" @click="distribute">{{ $t('global.distributePermission') }}</el-button>
-        <el-button v-if="hasPermssion" type="primary" @click="transfer">{{ $t('global.transferQRCode') }}</el-button>
-        <el-button type="primary" @click="start">{{ $t('planMonitor.offlineMappingSoftware') }}</el-button>
-      </p>
-    </div>
+  <el-card :style="{height: height+'px'}">
+	<div class="runPlanHeader" style="width: 90%;margin-left:5%;margin-top:20px;display: inline-block;">
+		<div class="runPlanList">{{$t('planMonitor.openRunPlan.runPlanList')}}</div>
+		<el-button size="small" type="primary" @click="handleCreate" class="createRunPlan" v-if="isCreate">{{$t('planMonitor.createRunningDiagram')}}</el-button>
+	</div>
+	<el-table :data="runPlanList" height="600" stripe
+        border
+		style="width: 90%;margin-left:5%;margin-top:20px;display: inline-block;">
+        <el-table-column prop="name" :label="this.$t('planMonitor.runGraphName')" />
+        <el-table-column :label="this.$t('global.status')" v-if="!(/^\/design\/userlist/.test(this.$route.fullPath))">
+            <template slot-scope="scope">
+                <el-tag>{{handlerStatus(scope.row)}}</el-tag>
+            </template>
+        </el-table-column>
+        <el-table-column
+            prop="explanation"
+            show-overflow-tooltip
+			v-if="!(/^\/design\/userlist/.test(this.$route.fullPath))"
+            :label="this.$t('planMonitor.explanation')">
+        </el-table-column>
+        <el-table-column :label="this.$t('planMonitor.creationDate')">
+            <template slot-scope="scope">
+                <el-tag type="success">{{handleTime(scope.row.createTime)}}</el-tag>
+            </template>
+        </el-table-column>
+        <el-table-column :label="this.$t('global.operate')"  width="400">
+          <template slot-scope="scope">
+            <el-button size="mini" class="button_box" type="success" @click="handleConfirm(scope.row)" v-if="scope.row.status !=='1'">{{$t('planMonitor.load')}}</el-button>
+            <el-button size="mini" class="button_box" type="primary" @click="handleEdit(scope.row)" v-if="isCreate && scope.row.status !=='1'">{{$t('planMonitor.modifyName')}}</el-button>
+            <el-button size="mini" class="button_box" type="danger" @click="handleDelete(scope.row)" v-if="isCreate && scope.row.status !=='1'">{{$t('global.delete')}}</el-button>
+            <el-button size="mini" class="button_box" type="primary" @click="handlePublish(scope.row)" v-if="isCreate && scope.row.status ==='0'">{{hasRelease?$t('global.release'):'申请发布'}}</el-button>
+            <el-button size="mini" class="button_box" type="primary" @click="handlePreview(scope.row)" v-if="scope.row.status === '1'">预览</el-button>
+            <el-button size="mini" class="button_box" type="danger" @click="handelRevert(scope.row)" v-if="scope.row.status === '1'" >撤销</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+	  <create-empty-plan ref="createEmptyPlan" :plan-convert="PlanConvert" @dispatchOperate="dispatchOperate" @dispatchDialog="dispatchDialog" @refresh="refresh"/>
+	  <edit-plan-name ref="editPlan" @renewal="getRunPlanList" />
   </el-card>
 </template>
 <script>
-import { getPublishMapInfo } from '@/api/jmap/map';
-import { PermissionType } from '@/scripts/ConstDic';
+import EditPlanName from './editTool/menus/editPlanName';
+import CreateEmptyPlan from './editTool/menus/createEmptyPlan';
+import { getRpListByUserMapId, publishRunPlan, releaseOrCancelRunPlan, previewRunPlan} from '@/api/designPlatform';
+import { getRpListByMapId, deleteRunPlan } from '@/api/runplan';
+import { launchFullscreen } from '@/utils/screen';
 import { UrlConfig } from '@/router/index';
-import LimitList from '@/views/components/limits/index';
-
 export default {
-	name: 'ExamDetailList',
+	name: 'userRunPlanList',
 	components: {
-		LimitList
+		CreateEmptyPlan,
+		EditPlanName
+		// LimitList
 	},
 	filters: {
 	},
 	data() {
 		return {
-			courseModel: {
-				mapId: '',
-				name: '',
-				skinCode: '',
-				updateTime: '',
-				pmsList: []
-			},
-			EffectiveTypeList: [],
-			screenList: []
+			dialogShow: false,
+			loading: false,
+			// height: 260,
+			// planId: '',
+			// planName: '',
+			type: 'add',
+			// defaultShowKeys: [],
+			runPlanList: [],
+			runPlanDict: {},
+			isCreate:false,
+			PlanConvert: {}
+			// defaultProps: {
+			// 	label: 'name'
+			// }
 		};
 	},
 	computed: {
-		hasPermssion() {
-			let isShow = false;
-			this.courseModel.pmsList.forEach(item => {
-				if (item.canDistribute) {
-					isShow = true;
-				}
-			});
-			return isShow;
-		},
 		height() {
-			return this.$store.state.app.height;
-		}
+			return this.$store.state.app.height - 50;
+		},
+		skinCode() {
+			return this.$route.query.skinCode || '02';
+		},
+        hasRelease() {
+            return this.$store.state.user.roles.includes('04') ||
+                this.$store.state.user.roles.includes('05');
+        }
+	},
+	created(){
+		this.PlanConvert = this.$theme.loadPlanConvert(this.$route.query.skinCode);
+	},
+	mounted(){
+		this.getRunPlanList();
 	},
 	watch: {
-		$route(newVal) {
-			this.initLoadPage();
+		'$route' () {
+			this.getRunPlanList();
 		}
 	},
-	async mounted() {
-		this.$Dictionary.effectiveType().then(list => {
-			this.EffectiveTypeList = list;
-		});
-		await this.getScreenLists();
-		this.initLoadPage();
-	},
-	methods: {
-		async getScreenLists() {
+	methods:{
+		refresh(){
+			this.getRunPlanList();
 		},
-		async initLoadPage() {
-			const that = this;
-			const data = { id: this.$route.params.lessonId };
-			if (parseInt(data.id)) {
-				try {
-					const res = await getPublishMapInfo(data.id);
-					this.tryUser = 0;
-					that.courseModel = {
-						name: res.data.name,
-						mapId: res.data.id,
-						skinCode: res.data.skinCode,
-						updateTime: res.data.updateTime,
-						pmsList: that.screenList || [],
-						PermissionType: PermissionType.PLAN
-					};
-
-					this.$store.dispatch('training/setPrdType', res.data.prdType);
-				} catch (error) {
-					this.$messageBox(this.$t('error.refreshFailed'));
+		getRunPlanList() {
+			if(/^\/design\/userlist/.test(this.$route.fullPath)){
+				this.isCreate=false;
+				getRpListByUserMapId(this.$route.params.mapId).then((resp) => {
+					this.runPlanList = resp.data;
+					this.runPlanList.forEach(elem => {
+						this.runPlanDict[elem.id] = elem.name;
+					});
+					// this.dialogShow = true;
+				}).catch(() => {
+					this.$messageBox(this.$t('planMonitor.openRunPlan.getRunPlanListFail'));
+				});
+			}
+			else{
+				this.isCreate=true;
+				getRpListByMapId(this.$route.params.mapId).then((resp) => {
+					this.runPlanList = resp.data;
+					this.runPlanList.forEach(elem => {
+						this.runPlanDict[elem.id] = elem.name;
+					});
+					// this.dialogShow = true;
+				}).catch(() => {
+					this.$messageBox(this.$t('planMonitor.openRunPlan.getRunPlanListFail'));
+				});
+			}
+		},
+		dispatchOperate(){
+			this.$refs[operateObj.dialogName][operateObj.operate](operateObj.params);
+		},
+		dispatchDialog(){
+			this.$refs['createEmptyPlan'].doShow();
+		},
+		handleCreate(){
+			this.$refs['createEmptyPlan'].doShow();
+		},
+		handleConfirm(row){
+			this.loadRunPlanData({
+				planId: row.id,
+				skinCode: this.$route.query.skinCode,
+				planName: row.name
+			});
+		},
+		// 修改运行图名称
+		handleEdit(row) {
+			if (row.id && row.name) {
+				this.$refs.editPlan.doShow({id: row.id, name: row.name});
+			} else {
+				this.$message.info(this.$t('planMonitor.openRunPlan.pleaseSelectRunplan'));
+			}
+		},
+		loadRunPlanData({ refresh, planId, skinCode, planName }) {
+			if (refresh) {
+				this.$store.dispatch('runPlan/refresh');
+			} else {
+				const query = { skinCode: skinCode, mapId: this.$route.params.mapId, planId: planId, planName: planName };
+				if(/^\/design\/userlist/.test(this.$route.fullPath)){
+					this.$router.push({ path: `${UrlConfig.plan.usertool}`, query: query });
+				}
+				else{
+					this.$router.push({ path: `${UrlConfig.plan.tool}`, query: query });
 				}
 			}
 		},
-		buy() {
-			this.$router.push({
-				path: `${UrlConfig.plan.pay}/${this.$route.params.lessonId}`,
-				query: { permissionType: PermissionType.SCREEN, prdCode: this.courseModel.prdCode, mapId: this.courseModel.mapId }
-			});
+		// 删除运行图
+		handleDelete(row) {
+			this.$confirm(this.$t('planMonitor.openRunPlan.confirmDeleteRunPlan'), this.$t('tip.hint'), {
+				confirmButtonText: this.$t('tip.confirm'),
+				cancelButtonText: this.$t('tip.cancel'),
+				type: 'warning'
+			}).then(() => {
+				deleteRunPlan(row.id).then(Response => {
+					this.$message.success(this.$t('planMonitor.openRunPlan.deleteSuccess'));
+					// if (row.id === this.$route.query.planId) {
+					// 	const query = { skinCode: this.$route.query.skinCode, mapId: this.$route.query.mapId };
+					// 	this.$router.push({ path: `${UrlConfig.plan.tool}`, query: query });
+					// }
+					this.refresh();
+					// this.doClose();
+				}).catch(() => {
+					this.$messageBox(this.$t('tip.deleteOperationGraphFailed'));
+				});
+			}).catch(() => { });
 		},
-		transfer() {
-			if (this.$refs) {
-				this.$refs.limitList.transfer(this.courseModel);
-			}
-		},
-		distribute() {
-			if (this.$refs) {
-				this.$refs.limitList.distribute(this.courseModel);
-			}
-		},
-		jump() {
-			const query = {
-				skinCode: this.courseModel.skinCode, mapId: this.courseModel.mapId
-			};
-			this.$router.push({ path: `${UrlConfig.plan.tool}`, query: query });
-		},
-		start() {
-			this.jump();
-		}
+        handlePublish(row) {
+            this.$confirm(this.hasRelease? '此操作将发布运行图，是否继续？':'此操作将发起运行图发布申请，是否继续？',this.$t('tip.hint'),{
+                confirmButtonText: this.$t('tip.confirm'),
+                cancelButtonText: this.$t('tip.cancel'),
+                type: 'warning'
+            }).then(() => {
+                if (this.hasRelease){
+                    publishRunPlan(row.id,{runPlanName: name}).then(resp => {
+                        this.$message.success('发布运行图成功！');
+                        this.refresh();
+                    }).catch(() => {
+                        this.$messageBox('发布运行图失败！');
+                        this.refresh();
+                    })
+                } else {
+                    releaseOrCancelRunPlan(row.id, '1').then(resp => {
+                        this.$message.success('提交运行图发布申请成功！');
+                        this.refresh();
+                    }).catch(() => {
+                        this.$messageBox('提交运行图发布申请失败！');
+                        this.refresh();
+                    })
+                }
+            });
+        },
+        handelRevert(row) {
+		    this.$confirm('此操作将撤销发布运行图申请，是否继续？',this.$t('tip.hint'),{
+		        confirmButtonText: this.$t('tip.confirm'),
+                cancelButtonText: this.$t('tip.cancel'),
+                type:'warning'
+            }).then(() => {
+                releaseOrCancelRunPlan(row.id,'0').then(resp=> {
+                    this.$message.success('撤销运行图发布申请成功！');
+                    this.refresh();
+                }).catch(() => {
+                    this.$messageBox('撤销运行图发布申请失败！')
+                    this.refresh();
+                })
+            })
+        },
+        handlerStatus(row) {
+            let lessonStatus = '';
+            switch (row.status){
+                case '0':
+                    lessonStatus = this.$t('lesson.notRelease');
+                    break;
+                case '1':
+                    lessonStatus = this.$t('lesson.pendingReview');
+                    break;
+                case '2':
+                    lessonStatus = this.$t('lesson.published');
+                    break;
+                case '3':
+                    lessonStatus = this.$t('lesson.rejected');
+                    break;
+            }
+            return lessonStatus;
+        },
+        handleTime(time) {
+            let timeList = time.split("T");
+            return timeList[0] + ' ' +timeList[1];
+        },
+        handlePreview(row){
+            previewRunPlan(row.id).then(resp => {
+                const query = {
+                    skinCode: row.skinCode, prdType: '01', group: resp.data, mapId: row.mapId, planId: row.id,from:''
+                };
+                this.$router.push({ path: `${UrlConfig.display}/plan`, query: query });
+                launchFullscreen();
+            }).catch(error => {
+                this.$messageBox(this.$t('tip.createSimulationFaild')+this.$t('global.colon')+error.message);
+            });
+        }
 	}
 };
 </script>
@@ -136,39 +268,49 @@ export default {
 <style rel="stylesheet/scss" lang="scss" scoped>
     @import "src/styles/mixin.scss";
 
-    .title {
-        font-weight: bold
-    }
+    // .title {
+    //     font-weight: bold
+    // }
 
-    .time-item {
-        font-size: 24px;
-        color: black !important;
-    }
+    // .time-item {
+    //     font-size: 24px;
+    //     color: black !important;
+    // }
 
-    .time-label {
-        display: -moz-inline-box;
-        display: inline-block;
-        text-align: right;
-        margin-left: 14px;
-    }
+    // .time-label {
+    //     display: -moz-inline-box;
+    //     display: inline-block;
+    //     text-align: right;
+    //     margin-left: 14px;
+    // }
 
-    .time-elem {
-        color: rgb(90, 89, 89) !important;
-    }
+    // .time-elem {
+    //     color: rgb(90, 89, 89) !important;
+    // }
 
-    .list-item {
-        font-size: 16px;
-        margin-bottom: 20px;
-    }
+    // .list-item {
+    //     font-size: 16px;
+    //     margin-bottom: 20px;
+    // }
 
-    .list-label {
-        display: -moz-inline-box;
-        display: inline-block;
-        text-align: right;
-        /* width: 160px; */
-    }
+    // .list-label {
+    //     display: -moz-inline-box;
+    //     display: inline-block;
+    //     text-align: right;
+    //     /* width: 160px; */
+    // }
 
-    .list-elem {
-        color: #808080 !important;
-    }
+    // .list-elem {
+    //     color: #808080 !important;
+    // }
+
+	.createRunPlan{
+		display:inline-block;float:right;margin-right:20px;
+	}
+	.runPlanHeader{
+		display:inline-block;margin-top:40px;width: 90%;margin-left:5%;
+	}
+	.runPlanList{
+		display:inline-block;padding:7px 0px
+	}
 </style>
diff --git a/src/views/planMonitor/editTool/index.vue b/src/views/planMonitor/editTool/index.vue
index 1c97e77ae..ceb2d2a8d 100644
--- a/src/views/planMonitor/editTool/index.vue
+++ b/src/views/planMonitor/editTool/index.vue
@@ -10,8 +10,8 @@
     />
     <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" />
+    <!-- <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" />
@@ -19,16 +19,17 @@
       ref="editPlanningTrain"
       @dispatchDialog="dispatchDialog"
       @dispatchOperate="dispatchOperate"
+      @refresh="refresh"
     />
     <edit-smooth-run-time ref="editSmoothRunTime" @dispatchDialog="dispatchDialog" />
     <add-smooth-run-time ref="addSmoothRunTime" @dispatchDialog="dispatchDialog" />
-    <duplicate-train ref="duplicateTrain" @dispatchDialog="dispatchDialog" @dispatchOperate="dispatchOperate" />
+    <duplicate-train ref="duplicateTrain" @dispatchDialog="dispatchDialog" @dispatchOperate="dispatchOperate" @refresh="refresh"/>
     <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" />
+    <add-task ref="addTask" @dispatchOperate="dispatchOperate" @refresh="refresh"/>
+    <delete-task ref="deleteTask" @dispatchOperate="dispatchOperate" @refresh="refresh"/>
     <modifying-task ref="modifyingTask" @dispatchOperate="dispatchOperate" />
 
     <edit-station-between-time ref="editStationBetweenTime" />
@@ -42,8 +43,8 @@
 import MenuBar from './menuBar';
 import StatusBar from './statusBar';
 import Schedule from './schedule';
-import OpenRunPlan from './menus/openRunPlan';
-import CreateEmptyPlan from './menus/createEmptyPlan';
+// 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';
@@ -68,8 +69,8 @@ export default {
 		MenuBar,
 		StatusBar,
 		Schedule,
-		OpenRunPlan,
-		CreateEmptyPlan,
+		// OpenRunPlan,
+		// CreateEmptyPlan,
 		Parameter,
 		OffLine,
 		AddPlanningTrain,
@@ -146,12 +147,12 @@ export default {
 				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.$refs.openRunPlan.loadRunPlanData(Object.assign({refresh: true}, this.$route.query));
+                    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'));
 				});
@@ -161,7 +162,10 @@ export default {
 			if (this.$refs.schedule) {
 				this.$refs.schedule.displayTrain();
 			}
-		}
+        },
+        refresh(){
+            this.$store.dispatch('runPlan/refresh');
+        }
 	}
 };
 </script>
diff --git a/src/views/planMonitor/editTool/menuBar.vue b/src/views/planMonitor/editTool/menuBar.vue
index 4c127107c..3556e4b89 100644
--- a/src/views/planMonitor/editTool/menuBar.vue
+++ b/src/views/planMonitor/editTool/menuBar.vue
@@ -1,14 +1,14 @@
 <template>
   <div id="PlanMenuBar">
-    <div class="nav">
+    <div class="nav" style="height:45px;">
       <template v-for="(item,i) in menus">
         <template v-if="noShowingChildren(item.children)">
-          <li :key="i" class="nav-li" @click="hookClick(item)">
+          <li :key="i" class="nav-li" @click="hookClick(item)" v-if="isNotUser">
             <span class="nav-li-text">{{ item.title }}</span>
           </li>
         </template>
-        <template v-else>
-          <li :key="i" class="nav-li" :class="{'menu_active' :i==classA}" @click.stop="popupMenuA(item, i)">
+        <template v-else >
+          <li :key="i" class="nav-li" :class="{'menu_active' :i==classA}" @click.stop="popupMenuA(item, i)" v-if="isNotUser">
             <span class="nav-li-text">{{ item.title }}</span>
             <ul class="nav-ul" :class="{'active' :i==classA}">
               <template v-for="(child,j) in item.children">
@@ -136,6 +136,7 @@ export default {
 	},
 	data() {
 		return {
+			isNotUser:true,
 			classA: -1,
 			classB: -1,
 			tempClassA: -1,
@@ -146,19 +147,19 @@ export default {
 				{
 					title: this.$t('planMonitor.file'),
 					children: [
-						{
-							title: this.$t('planMonitor.openRunningDiagram'),
-							click: this.handleOpenRunPlan
-						},
+						// {
+						// 	title: this.$t('planMonitor.openRunningDiagram'),
+						// 	click: this.handleOpenRunPlan
+						// },
 						// {
 						// 	type: 'file',
 						// 	title: '导入运行图',
 						// 	click: this.handleImportRunPlan
 						// },
-						{
-							title: this.$t('planMonitor.createRunningDiagram'),
-							click: this.handleCreateEmptyPlan
-						},
+						// {
+						// 	title: this.$t('planMonitor.createRunningDiagram'),
+						// 	click: this.handleCreateEmptyPlan
+						// },
 						// {
 						// 	title: '修改运行图名称',
 						// 	click: this.handleEditPlan
@@ -271,6 +272,14 @@ export default {
 			]
 		};
 	},
+	created(){
+		if(/^\/plan\/usertool/.test(this.$route.fullPath)){
+			this.isNotUser=false;
+		}else{
+			this.isNotUser=true;
+		}
+
+	},
 	computed: {
 		...mapGetters('training', [
 			'mode'
@@ -303,7 +312,8 @@ export default {
 	},
 	methods: {
 		back() {
-			this.$router.push({ path: `${UrlConfig.plan.detail}/${this.$route.query.mapId}` });
+			// this.$router.push({ path: `${UrlConfig.plan.detail}/${this.$route.query.mapId}` });
+            this.$router.go(-1);
 		},
 		menuConvert(menuBase) {
 			const menus = [];
@@ -396,9 +406,9 @@ export default {
 			});
 		},
 		// 打开运行图列表
-		handleOpenRunPlan() {
-			this.$emit('dispatchDialog', { name: 'openRunPlan', params: {type: 'add'} });
-		},
+		// handleOpenRunPlan() {
+		// 	this.$emit('dispatchDialog', { name: 'openRunPlan', params: {type: 'add'} });
+		// },
 		// handledeleteRunPlan() {
 		// 	this.$emit('dispatchDialog', { name: 'openRunPlan', params: {type: 'delete'} });
 		// },
@@ -469,9 +479,9 @@ export default {
 			this.closeMenu();
 		},
 		// 新建运行图
-		handleCreateEmptyPlan() {
-			this.$emit('dispatchDialog', { name: 'createEmptyPlan', params: {} });
-		},
+		// handleCreateEmptyPlan() {
+		// 	this.$emit('dispatchDialog', { name: 'createEmptyPlan', params: {} });
+		// },
 		// 修改站间运行时间
 		handleModifyingStationIntervalTime() {
 			this.$emit('dispatchDialog', { name: 'modifyingStationIntervalTime', params: {} });
diff --git a/src/views/planMonitor/editTool/menus/addTask.vue b/src/views/planMonitor/editTool/menus/addTask.vue
index 70c08babf..a9fb7b3e5 100644
--- a/src/views/planMonitor/editTool/menus/addTask.vue
+++ b/src/views/planMonitor/editTool/menus/addTask.vue
@@ -313,9 +313,10 @@ export default {
 			} else {
 				// 直接添加任务
 				addPlanTrip(this.addModel).then(resp => {
-					this.$emit('dispatchOperate', {
-						dialogName: 'openRunPlan', operate: 'loadRunPlanData', params: Object.assign({refresh: true}, this.$route.query)
-					});
+					// this.$emit('dispatchOperate', {
+					// 	dialogName: 'openRunPlan', operate: 'loadRunPlanData', params: Object.assign({refresh: true}, this.$route.query)
+					// });
+					this.$emit('refresh');
 					this.$message.success(this.$t('tip.addTaskSuccessfully'));
 				}).catch(() => {
 					this.$messageBox(this.$t('tip.addTaskFailed'));
diff --git a/src/views/planMonitor/editTool/menus/createEmptyPlan.vue b/src/views/planMonitor/editTool/menus/createEmptyPlan.vue
index c95e6c998..9eab16024 100644
--- a/src/views/planMonitor/editTool/menus/createEmptyPlan.vue
+++ b/src/views/planMonitor/editTool/menus/createEmptyPlan.vue
@@ -12,7 +12,7 @@
   >
     <div>
       <el-tabs v-model="activeTab" type="card">
-        <el-tab-pane :label="this.$t('planMonitor.normalNew')" name="first">
+         <el-tab-pane :label="this.$t('planMonitor.normalNew')" name="first">
           <el-row>
             <el-form ref="form" :model="newModel" label-width="140px" size="mini" :rules="rules" @submit.native.prevent>
               <el-form-item :label="this.$t('planMonitor.runGraphName')+this.$t('global.colon')" prop="name">
@@ -82,7 +82,7 @@ export default {
 	},
 	data() {
 		return {
-			activeTab: 'first',
+			activeTab: 'second',
 			dialogShow: false,
 			loading: false,
 			loadingDig: null,
@@ -161,7 +161,7 @@ export default {
 
 							this.$emit('dispatchOperate', params);
 							this.$message.success(this.$t('tip.createAnEmptyRunGraphSuccessfully'));
-							this.jump(resp.data, this.newModel.name);
+							// this.jump(resp.data, this.newModel.name);
 							this.doClose();
 						}).catch((error) => {
 							this.$messageBox(this.$t('error.createOperationGraphFailed')+ this.$t('global.colon') + error.message);
@@ -175,7 +175,8 @@ export default {
 						this.loading = true;
 						postCreatePlan(this.pullModel).then(resp => {
 							this.$message.success(this.$t('tip.createARunGraphSuccessfully'));
-							this.jump(resp.data, this.pullModel.name);
+							// this.jump(resp.data, this.pullModel.name);
+							this.$emit('refresh');
 							this.doClose();
 						}).catch((error) => {
 							this.$messageBox(this.$t('error.createOperationGraphFailed')+ this.$t('global.colon') + error.message);
diff --git a/src/views/planMonitor/editTool/menus/deleteTask.vue b/src/views/planMonitor/editTool/menus/deleteTask.vue
index 34985da1e..5eeece4ca 100644
--- a/src/views/planMonitor/editTool/menus/deleteTask.vue
+++ b/src/views/planMonitor/editTool/menus/deleteTask.vue
@@ -76,9 +76,10 @@ export default {
 
 				deletePlanTrip(model).then(resp => {
 					this.$store.dispatch('runPlan/setSelected', {});
-					this.$emit('dispatchOperate', {
-						dialogName: 'openRunPlan', operate: 'loadRunPlanData', params: Object.assign({refresh: true}, this.$route.query)
-					});
+					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'));
diff --git a/src/views/planMonitor/editTool/menus/duplicateTrain.vue b/src/views/planMonitor/editTool/menus/duplicateTrain.vue
index ca981004d..db5230726 100644
--- a/src/views/planMonitor/editTool/menus/duplicateTrain.vue
+++ b/src/views/planMonitor/editTool/menus/duplicateTrain.vue
@@ -19,13 +19,13 @@
     <el-row style="margin-top: 20px">
       <el-col :span="5" :offset="4">{{$t('planMonitor.frequency')}}</el-col>
       <el-col :span="10">
-        <el-input-number v-model="model.times" size="mini" controls-position="right" />
+        <el-input-number v-model="model.times" size="mini" :min="1" controls-position="right" />
       </el-col>
     </el-row>
     <el-row style="margin: 10px 0px">
       <el-col :span="5" :offset="4">{{$t('planMonitor.intervals')}}</el-col>
       <el-col :span="10">
-        <el-input-number v-model="model.intervals" size="mini" controls-position="right" />
+        <el-input-number v-model="model.intervals" size="mini" :min="30" controls-position="right" />
         <span>{{$t('global.second')}}</span>
       </el-col>
     </el-row>
@@ -76,12 +76,18 @@ export default {
 			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.$message.success(this.$t('tip.duplicatePlanSuccessful'));
-			}).catch(() => {
-				this.$messageBox(this.$t('tip.duplicatePlanFailed'));
+				// 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'));
+				}
+				
 			});
 		}
 	}
diff --git a/src/views/planMonitor/editTool/menus/editPlanName.vue b/src/views/planMonitor/editTool/menus/editPlanName.vue
index e5f5b81bb..08c23fa9f 100644
--- a/src/views/planMonitor/editTool/menus/editPlanName.vue
+++ b/src/views/planMonitor/editTool/menus/editPlanName.vue
@@ -88,11 +88,11 @@ export default {
 						};
 
 						this.$emit('dispatchOperate', params);
-						this.$message.success(this.$t('planMonitor.runGraphNameModifiedSuccessfully'));
+						this.$message.success(this.$t('tip.runGraphNameModifiedSuccessfully'));
 						this.$emit('renewal');
 						this.doClose();
 					}).catch(() => {
-						this.$messageBox(this.$t('planMonitor.modifyRunGraphNameFailed'));
+						this.$messageBox(this.$t('tip.modifyRunGraphNameFailed'));
 						this.doClose();
 					});
 				}
diff --git a/src/views/planMonitor/editTool/menus/editPlanningTrain.vue b/src/views/planMonitor/editTool/menus/editPlanningTrain.vue
index bdec8ca69..077f0804c 100644
--- a/src/views/planMonitor/editTool/menus/editPlanningTrain.vue
+++ b/src/views/planMonitor/editTool/menus/editPlanningTrain.vue
@@ -202,9 +202,10 @@ export default {
 		handleCommit() {
 			this.doClose();
 			addPlanService(this.model).then(() => {
-				this.$emit('dispatchOperate', {
-					dialogName: 'openRunPlan', operate: 'loadRunPlanData', params: Object.assign({refresh: true}, this.$route.query)
-				});
+				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'));
diff --git a/src/views/planMonitor/editTool/schedule.vue b/src/views/planMonitor/editTool/schedule.vue
index 682687b40..0c160e883 100644
--- a/src/views/planMonitor/editTool/schedule.vue
+++ b/src/views/planMonitor/editTool/schedule.vue
@@ -26,6 +26,7 @@
 import { mapGetters } from 'vuex';
 import { timeFormat } from '@/utils/date';
 import { getStationListBySkinCode, queryRunPlan } from '@/api/runplan';
+import {getRpDetailByUserMapId,getUserMapDetailByMapId} from '@/api/designPlatform';
 import { loadMapData } from '@/utils/loaddata';
 import { getPublishMapInfo } from '@/api/jmap/map';
 import DataTable from './menus/components/dataTable';
@@ -357,9 +358,16 @@ export default {
 		},
 		async loadChartPage() {
 			try {
-				getPublishMapInfo(this.$route.query.mapId).then(resp => {
-					this.mapName = `${resp.data.name} (${this.$route.query.planName || ''})`;
-				});
+				if(/^\/plan\/usertool/.test(this.$route.fullPath)){
+					getUserMapDetailByMapId(this.$route.query.mapId).then(resp => {
+						this.mapName = `${resp.data.name} (${this.$route.query.planName || ''})`;
+					});
+				}
+				else{
+					getPublishMapInfo(this.$route.query.mapId).then(resp => {
+						this.mapName = `${resp.data.name} (${this.$route.query.planName || ''})`;
+					});
+				}
 				this.planConvert = this.$theme.loadPlanConvert(this.skinCode);
 				this.$store.dispatch('runPlan/clear').then(() => {
 					this.loadInitChart().then(() => {
@@ -370,16 +378,32 @@ export default {
 									this.loadInitData();
 									if (this.planId) {
 										this.myChart && this.myChart.showLoading();
-										queryRunPlan(this.planId).then(rest => {
-											this.$store.dispatch('runPlan/setPlanData', rest.data).then(() => {
-												this.analyticalServiceNumber(this.$store.state.runPlan.editData);
-												this.loadChartData();
+
+										if(/^\/plan\/usertool/.test(this.$route.fullPath)){
+											getRpDetailByUserMapId(this.planId).then(rest => {
+												this.$store.dispatch('runPlan/setPlanData', rest.data).then(() => {
+													this.analyticalServiceNumber(this.$store.state.runPlan.editData);
+													this.loadChartData();
+													this.myChart && this.myChart.hideLoading();
+												});
+											}).catch(() => {
 												this.myChart && this.myChart.hideLoading();
+												this.$messageBox(this.$t('error.obtainOperationGraphFailed'));
 											});
-										}).catch(() => {
-											this.myChart && this.myChart.hideLoading();
-											this.$messageBox(this.$t('error.obtainOperationGraphFailed'));
-										});
+										}else{
+											queryRunPlan(this.planId).then(rest => {
+												this.$store.dispatch('runPlan/setPlanData', rest.data).then(() => {
+													this.analyticalServiceNumber(this.$store.state.runPlan.editData);
+													this.loadChartData();
+													this.myChart && this.myChart.hideLoading();
+												});
+											}).catch(() => {
+												this.myChart && this.myChart.hideLoading();
+												this.$messageBox(this.$t('error.obtainOperationGraphFailed'));
+											});
+										}
+										
+
 									} else {
 										this.clearCanvas();
 									}
diff --git a/src/views/planMonitor/editTool/statusBar.vue b/src/views/planMonitor/editTool/statusBar.vue
index 7043754fc..048b96165 100644
--- a/src/views/planMonitor/editTool/statusBar.vue
+++ b/src/views/planMonitor/editTool/statusBar.vue
@@ -1,19 +1,19 @@
 <template>
   <div class="PlanStatusBar">
     <ul class="ul-box">
-      <div class="li_plan" @click="showTrain">{{ $t('planMonitor.serviceAndTripNumber') }}</div>
+      <div class="li_plan" @click="showTrain"  v-if="isNotUser">{{$t('planMonitor.serviceAndTripNumber')}}</div>
     </ul>
     <ul class="ul-box">
-      <div class="li_plan" @click="handleAddPlanningTrain">{{ $t('planMonitor.addPlan') }}</div>
-      <div class="li_plan" @click="handleDeletePlanningTrain">{{ $t('planMonitor.deletePlan') }}</div>
-      <div class="li_plan" @click="handleDuplicateTrain">{{ $t('planMonitor.duplicatePlan') }}</div>
-      <div class="li_plan" @click="handleAddTask">{{ $t('planMonitor.addTask') }}</div>
-      <div class="li_plan" @click="handleDeleteTask">{{ $t('planMonitor.deleteTask') }}</div>
-      <div class="li_plan" @click="handleModifyingTask">{{ $t('planMonitor.modifyTask') }}</div>
+      <div class="li_plan" @click="handleAddPlanningTrain"  v-if="isNotUser">{{$t('planMonitor.addPlan')}}</div>
+      <div class="li_plan" @click="handleDeletePlanningTrain"  v-if="isNotUser">{{$t('planMonitor.deletePlan')}}</div>
+      <div class="li_plan" @click="handleDuplicateTrain"  v-if="isNotUser">{{$t('planMonitor.duplicatePlan')}}</div>
+      <div class="li_plan" @click="handleAddTask"  v-if="isNotUser">{{$t('planMonitor.addTask')}}</div>
+      <div class="li_plan" @click="handleDeleteTask"  v-if="isNotUser">{{$t('planMonitor.deleteTask')}}</div>
+      <div class="li_plan" @click="handleModifyingTask"  v-if="isNotUser">{{$t('planMonitor.modifyTask')}}</div>
     </ul>
     <ul class="ul-box tool">
-      <div class="li_plan" @click="handlePlanEffectiveCheck">{{ $t('planMonitor.validityCheck') }}</div>
-      <div class="li_plan" @click="handleTestRunPlan">{{ $t('planMonitor.testRunning') }}</div>
+      <div class="li_plan" @click="handlePlanEffectiveCheck"  v-if="isNotUser">{{$t('planMonitor.validityCheck')}}</div>
+      <div class="li_plan" @click="handleTestRunPlan">{{$t('planMonitor.testRunning')}}</div>
     </ul>
   </div>
 </template>
@@ -27,11 +27,19 @@ export default {
 	name: 'PlanStatusBar',
 	data() {
 		return {
+            isNotUser:true
 		};
 	},
 	watch: {
 
 	},
+    created(){
+        if(/^\/plan\/usertool/.test(this.$route.fullPath)){
+            this.isNotUser=false;
+        }else{
+            this.isNotUser=true;
+        }
+    },
 	methods: {
 		showTrain() {
 			this.$emit('showTrain');
diff --git a/src/views/planMonitor/editTool/userindex.vue b/src/views/planMonitor/editTool/userindex.vue
new file mode 100644
index 000000000..b5fb42925
--- /dev/null
+++ b/src/views/planMonitor/editTool/userindex.vue
@@ -0,0 +1,485 @@
+<template>
+  <div class="plan-tool" style="width: 100%; height: 100%;">
+    <menu-bar ref="menuBar" :plan-convert="PlanConvert" @dispatchDialog="dispatchDialog" />
+    <schedule
+      ref="schedule"
+      :skin-code="skinCode"
+      :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: {
+		skinCode() {
+			return this.$route.query.skinCode || '02';
+		},
+		width() {
+			return this.$store.state.app.width;
+		},
+		height() {
+			return this.$store.state.app.height;
+		}
+	},
+	created() {
+		this.PlanConvert = this.$theme.loadPlanConvert(this.skinCode);
+	},
+	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/publish/examRule/draft/examFrom.vue b/src/views/publish/examRule/draft/examFrom.vue
index f5b0b4429..a885fa57b 100644
--- a/src/views/publish/examRule/draft/examFrom.vue
+++ b/src/views/publish/examRule/draft/examFrom.vue
@@ -22,7 +22,7 @@
             style="float: left; width: calc(100% - 80px);"
             :disabled="isEdit"
           />
-          <span style="width:80px; display: block;float: left; text-align: center;">&nbsp;{{$t('publish.durationMinutes')}}</span>
+          <span style="width:80px; display: block;float: left; text-align: center;">&nbsp;{{ $t('publish.durationMinutes') }}</span>
         </el-form-item>
         <el-form-item :label="$t('publish.testDate')">
           <el-col :span="11">
@@ -59,8 +59,8 @@
         </el-form-item>
         <el-form-item v-if="trialShow" :label="$t('publish.whetherToTry')" required>
           <el-radio-group v-model="trial">
-            <el-radio label="1">{{$t('publish.trialNo')}}</el-radio>
-            <el-radio label="2">{{$t('publish.trialYes')}}</el-radio>
+            <el-radio label="1">{{ $t('publish.trialNo') }}</el-radio>
+            <el-radio label="2">{{ $t('publish.trialYes') }}</el-radio>
           </el-radio-group>
         </el-form-item>
         <el-form-item :label="$t('publish.testDescription')" prop="desc">
@@ -76,7 +76,7 @@
 </template>
 
 <script>
-import { getPublishLessonTree } from '@/api/jmap/lesson';
+import { getPublishLessonList } from '@/api/jmap/lesson';
 import { getExamLessonDetail, updateExamRules } from '@/api/management/exam';
 
 export default {
@@ -268,7 +268,7 @@ export default {
 
 		},
 		refresh() {
-			getPublishLessonTree({ mapId: '' }).then(response => {
+			getPublishLessonList().then(response => {
 				this.options = response.data;
 				if (parseInt(this.$route.params.lessonId)) {
 					this.form.region = this.$route.params.lessonId;
diff --git a/src/views/publish/examRule/draft/index.vue b/src/views/publish/examRule/draft/index.vue
index db2d89d81..5a0500a4e 100644
--- a/src/views/publish/examRule/draft/index.vue
+++ b/src/views/publish/examRule/draft/index.vue
@@ -32,7 +32,7 @@
 </template>
 
 <script>
-import { getPublishLessonTree } from '@/api/jmap/lesson';
+import { getPublishLessonList } from '@/api/jmap/lesson';
 import RuleFrom from './rule';
 import ExamFrom from './examFrom';
 
@@ -72,7 +72,7 @@ export default {
 	},
 	methods: {
 		loadInitData() {
-			getPublishLessonTree({ mapId: '' }).then(response => {
+			getPublishLessonList().then(response => {
 				this.OrganizationList = response.data;
 				this.OrganizationList.forEach(elem => {
 					if (elem.id == this.$route.params.lessonId) {
diff --git a/src/views/publish/examRule/index.vue b/src/views/publish/examRule/index.vue
index 07502d8f4..a9ee61551 100644
--- a/src/views/publish/examRule/index.vue
+++ b/src/views/publish/examRule/index.vue
@@ -19,7 +19,7 @@
 
 <script>
 import { getExamList, deleteExam, setExamEfficacy, setExamEffectivey } from '@/api/management/exam';
-import { getPublishLessonTree } from '@/api/jmap/lesson';
+import { getPublishLessonList } from '@/api/jmap/lesson';
 import { UrlConfig } from '@/router/index';
 
 export default {
@@ -176,7 +176,8 @@ export default {
 					}
 				],
 				actions: [
-					{ text: this.$t('global.add'), btnCode: 'employee_insert', handler: this.handleNormalAdd }
+					{ text: this.$t('global.add'), btnCode: 'employee_insert', handler: this.handleNormalAdd },
+					{ text: this.$t('global.back'), btnCode: 'employee_back', handler: this.handlerBack }
 				]
 			}
 		};
@@ -196,7 +197,7 @@ export default {
 	methods: {
 		loadInitData() {
 			this.queryForm.queryObject.lessonId.config.data.length = 0;
-			getPublishLessonTree({ mapId: '' }).then(response => {
+			getPublishLessonList().then(response => {
 				this.OrganizationList = response.data;
 				this.OrganizationList.forEach(elem => {
 					if (elem.id == this.$route.query.lessonId) {
@@ -315,6 +316,9 @@ export default {
 					this.$message({ type: 'warning', message: `${this.$t('error.setFailed')}${res.message}` });
 				});
 			}).catch(() => { });
+		},
+		handlerBack() {
+		    this.$router.back();
 		}
 	}
 };
diff --git a/src/views/scriptManage/category/tree.vue b/src/views/scriptManage/category/tree.vue
deleted file mode 100644
index a31f89370..000000000
--- a/src/views/scriptManage/category/tree.vue
+++ /dev/null
@@ -1,147 +0,0 @@
-<template>
-    <el-card v-loading="loading" class="map-list-main">
-        <div slot="header" class="clearfix">
-            <span class="mapListTitle">{{ $t('scriptRecord.mapList') }}</span>
-            <el-button type="primary" size="small" @click="addScript" class="addScript">{{ $t('scriptRecord.addScript') }}</el-button>
-        </div>
-        <el-select v-model="mapSelect" size="medium" class="mapSelect"  @change="mapSelectChange">
-            <el-option v-for="item in mapList" :key="item.id" :label="item.name" :value="item.id" />
-        </el-select>
-        <!-- <div class="addScript" @click="addScript">
-            <i class="el-icon-plus" style="color:#409eff;font-size:16px;"></i>
-            <span class="addScriptText">添加剧本</span>
-        </div> -->
-        <el-scrollbar wrap-class="scrollbar-wrapper" :style="{ height: (height-125) +'px', width:'100%',margin:'5px 0 0 0' }">
-            <el-tree
-                ref="tree"
-                :data="treeList"
-                node-key="id"
-                :props="defaultProps"
-                highlight-current
-                :span="22"
-                @node-click="clickEvent"
-                @node-contextmenu="showContextMenu"
-            >
-                <span slot-scope="{ node:tnode, data }">
-                <span
-                    class="el-icon-tickets"
-                    :style="{color: data.valid ? 'green':''}"
-                ></span>
-                <span :style="{color: data.valid ? 'green':''}">&nbsp;{{ tnode.label }}</span>
-                </span>
-            </el-tree>
-        </el-scrollbar>
-    </el-card>
-</template>
-<script>
-import { UrlConfig } from '@/router/index';
-import localStore from 'storejs';
-import { getQuestPageList,createQuest,deleteQuest,updateQuest} from '@/api/quest';
-import { listPublishMap } from '@/api/jmap/map';
-import { getSessionStorage, setSessionStorage, removeSessionStorage } from '@/utils/auth';
-
-export default {
-	name: 'ScriptTree',
-	props: {
-		height: {
-			type: Number,
-			required: true
-		}
-    },
-    created() {
-        this.loadInitData();
-    },
-	data() {
-		return {
-            loading: true,
-            mapList:[],
-            mapSelect:"",
-            treeData: [],
-			treeList: [],
-            defaultProps: {
-				children: 'children',
-                label: 'name',
-			},
-        }
-    },
-    mounted(){
-
-    },
-    methods:{
-        loadInitData() {
-            this.loading=true;
-            this.mapList = [];
-            listPublishMap().then(response => {
-                this.mapList = response.data;
-                this.loading = false;
-                this.mapSelect=localStore.get("script_mapId") || this.mapList[0].id;
-                if(localStore.get("script_mapId")){
-                    this.$store.dispatch('scriptRecord/updateScriptId',localStore.get("script_mapId"));
-                }
-                this.getQuestPageList(this.mapSelect);
-            })
-        },
-        mapSelectChange(id){
-            this.loading = true;
-            localStore.set("script_mapId", id);
-            this.$store.dispatch('scriptRecord/updateScriptId',id);
-            this.getQuestPageList(id);
-        },
-        async getQuestPageList(id){
-            let response=await getQuestPageList(id);
-            this.loading = false;
-            this.treeList=response.data;
-        },
-        showContextMenu(e, obj, node, vueElem) {
-			if (obj) {
-				this.node = node;
-				this.selected = obj;
-			}
-        },
-        clickEvent(obj, data, ele) {
-            // setSessionStorage('scriptId', obj.id);
-            this.$router.push({ path: `${UrlConfig.script.detail}/${obj.id}` });
-        },
-        addScript(){
-            this.refresh(null);
-            this.$router.push({ path: `${UrlConfig.script.prefix}` });
-        },
-        refresh(data) {
-            let that=this;
-            if(data)
-            {
-                let currentMapId=this.mapSelect;
-                if(currentMapId!=data.mapId)
-                {
-                    this.mapSelect=data.mapId;
-                }
-                this.getQuestPageList(this.mapSelect).then(function(){
-                    that.$refs.tree.setCurrentKey(data.scriptId);
-                });
-            }
-            else
-            {
-                this.getQuestPageList(this.mapSelect);
-            }
-        }
-    }
-}
-</script>
-<style rel="stylesheet/scss" lang="scss" scoped>
-    .mapListTitle{
-        display: inline-block;
-        text-align: center;
-        padding: 8px 0px;
-    }
-    .mapSelect {
-        width:100%;
-    }
-    .addScript{
-        float: right;
-        display: inline-block;
-    }
-    .addScriptText{
-        color:#409eff;
-        font-size: 15px;
-    }
-</style>
diff --git a/src/views/scriptManage/create.vue b/src/views/scriptManage/create.vue
new file mode 100644
index 000000000..759fdb286
--- /dev/null
+++ b/src/views/scriptManage/create.vue
@@ -0,0 +1,109 @@
+<template>
+    <el-dialog :title="title" :visible.sync="dialogVisible" width="500px" :before-close="doClose" center>
+        <data-form ref="dataform" :form="form" :formModel="formModel" :rules="rules"></data-form>
+        <span slot="footer" class="dialog-footer">
+            <el-button type="primary" @click="doCreate">{{$t('global.confirm')}}</el-button>
+            <el-button @click="doClose">{{$t('global.cancel')}}</el-button>
+        </span>
+    </el-dialog>
+</template>
+
+<script>
+    import { listPublishMap } from '@/api/jmap/map'
+    
+    import { getQuestById} from '@/api/quest';
+
+    export default {
+        name: 'ScriptDraft',
+        data() {
+            return {
+                dialogVisible: false,
+                mapList: [],
+                taskStatusList: [],
+                disabled:null,
+                formModel: {
+                    name: '',
+                    mapId: '',
+                    description:''
+                }
+            }
+        },
+        props: {
+            title: String,
+        },
+        computed: {
+            form() {
+                let isAdd = this.type === 'ADD'
+                let form = {
+                    labelWidth: '150px',
+                    items: [
+                        { prop: 'name', label: this.$t('scriptRecord.scriptName'), type: 'text', required: true},
+                        { prop: 'mapId', label: this.$t('scriptRecord.map'), type: 'select', required: true, options: this.mapList,disabled:this.disabled},
+                        { prop: 'description', label: this.$t('scriptRecord.scriptDescription'), type: 'textarea', required: true},
+                    ]
+                }
+                return form
+            },
+            rules() {
+                let crules = {
+                    name: [
+                        { required: true, message: this.$t('scriptRecord.inputScriptName'), trigger: 'blur' },
+                    ],
+                    mapId: [
+                        { required: true, message: this.$t('scriptRecord.selectMap'), trigger: 'change' },
+                    ],
+                    description:[
+                        { required: true, message: this.$t('scriptRecord.inputScriptDescription'), trigger: 'blur' },
+                    ]
+                }
+                return crules
+            },
+        },
+        mounted() {
+            this.loadInitData();
+        },
+        methods: {
+            loadInitData() {
+                this.mapList = [];
+                listPublishMap().then(response => {
+                    this.mapList = response.data.map(elem => { return { value: elem.id, label: elem.name } });
+                })
+            },
+            doShow(questid) {
+                if(questid)
+                {
+                    getQuestById(questid).then(resp=>{
+                        let data={'name':resp.data.name,'description':resp.data.description,'mapId':resp.data.mapId};
+                        this.formModel=data;
+                        this.formModel.id=questid;
+                        this.disabled="disabled";
+                        this.dialogVisible = true
+                    });
+                }
+                else
+                {
+                    this.formModel.mapId=this.$route.params.mapId;
+                    this.disabled="disabled";
+                    this.dialogVisible = true
+                }
+                
+            },
+            doCreate() {
+                let self = this
+                this.$refs.dataform.validateForm(() => {
+                    self.$emit('create', Object.assign({}, this.formModel));
+                    self.doClose()
+                })
+            },
+            doClose() {
+                this.$refs.dataform.resetForm();
+                this.dialogVisible = false
+            }
+        }
+    }
+</script>
+<style lang="scss" scoped>
+/deep/ .el-dialog--center .el-dialog__body{
+    padding: 25px 65px 30px 10px;
+}
+</style>
\ No newline at end of file
diff --git a/src/views/scriptManage/home.vue b/src/views/scriptManage/home.vue
index 8ac5c5bde..661db766e 100644
--- a/src/views/scriptManage/home.vue
+++ b/src/views/scriptManage/home.vue
@@ -1,150 +1,296 @@
 <template>
   <el-card :style="{height: height+'px'}">
-    <div class="home-box">
-      <el-card class="box-card">
-        <div id="scriptTitle">{{ $t('scriptRecord.createScript') }}</div>
-        <div id="sciptForm">
-          <data-form ref="dataform" :form="form" :form-model="formModel" :rules="rules" />
-        </div>
-        <div id="btnList">
-          <span slot="footer" class="btn-footer">
-            <el-button type="primary" :loading="loading" @click="doCreate">{{$t('scriptRecord.submit')}}</el-button>
-          </span>
-        </div>
-      </el-card>
-    </div>
+	  <div class="scriptHeader">
+		  <div class="scriptList">{{$t('scriptRecord.scriptList')}}</div>
+		  <el-button size="small" type="primary" @click="handleCreate" class="createScript">{{$t('scriptRecord.scriptCreate')}}</el-button>
+	  </div>
+	  <QueryListPage ref="queryListPage" :pager-config="pagerConfig" :query-form="queryForm" :query-list="queryList" style="width: 91%;margin-left:4%;margin-top:20px;display: inline-block;"/>
+	<script-publish ref='publishScript' @reloadTable="reloadTable" @create="handleConfirmPublish" :title="$t('scriptRecord.publishScript')">
+    </script-publish>
+	<create-script ref='createScript' @reloadTable="reloadTable" @create="handleConfirmCreate" :title="$t('scriptRecord.createScript')">
+	</create-script>
+	<create-script ref='modifyScript' @reloadTable="reloadTable" @create="handleConfirmModify" :title="$t('scriptRecord.modifyScript')">
+	</create-script>
   </el-card>
 </template>
 
 <script>
 import Cookies from 'js-cookie';
+import ConstConfig from '@/scripts/ConstConfig';
 import { UrlConfig } from '@/router/index';
-import {listPublishMap} from '@/api/jmap/map';
-import {createQuest} from '@/api/quest';
+import { mapGetters } from 'vuex';
+import { admin, superAdmin} from '@/router';
+import { getQuestPageList,createQuest,deleteQuest,updateQuest,publishQuest,retractQuest} from '@/api/quest';
+import { launchFullscreen } from '@/utils/screen';
+import { scriptRecordNotify } from '@/api/simulation';
+import CreateScript from './create';
+import ScriptPublish from './publish';
 
 export default {
 	name: 'ScriptDraft',
+	 components: {
+		CreateScript,
+		ScriptPublish
+	},
 	data() {
 		return {
-			loading: false,
-			mapList: [],
-			taskStatusList: [],
-			disabled: true,
-			formModel: {
-				name: '',
-				mapId: '',
-				description: ''
+			pagerConfig: {
+				pageSize: 'pageSize',
+				pageIndex: 'pageNum'
 			},
-			isShow: false
+			queryForm: {
+				labelWidth: '100px',
+				reset: true,
+				show:false
+			},
+			queryList: {
+				query: this.queryFunction,
+				selectCheckShow: false,
+				indexShow: true,
+				columns: [
+					{
+						title: this.$t('scriptRecord.scriptName'),
+						prop: 'name'
+					},
+					{
+						title: this.$t('scriptRecord.scriptDescription'),
+						prop: 'description',
+					},
+					{
+						title: this.$t('scriptRecord.status'),
+						prop: 'status',
+						type: 'tag',
+						columnValue: (row) => { return this.covertData(row)},
+						tagType: (row) => { return ''; }
+					},
+					{
+						title: this.$t('scriptRecord.revokeReason'),
+						prop: 'explanation',
+					},
+					{
+						type: 'button',
+						title: this.$t('scriptRecord.operate'),
+						width: '400',
+						buttons: [
+							{
+								name: this.$t('scriptRecord.scriptRecord'),
+								handleClick: this.drawUp,
+								type: 'success',
+								showControl:(row) => { return !(row.status==1) },
+							},
+							{
+								name: this.$t('scriptRecord.scriptModify'),
+								handleClick: this.handleModify,
+								type: 'primary',
+								showControl:(row) => { return !(row.status==1) },
+							},
+							{
+								name: this.$t('scriptRecord.scriptDelete'),
+								handleClick: this.deleteScript,
+								type: 'danger',
+								showControl:(row) => { return !(row.status==1) },
+							},
+							{
+								name: this.covertButtonname(),
+								handleClick: this.publishScript,
+								type: 'primary',
+								showControl:(row) => { return row.status==0 },
+							},
+							{
+								name: this.$t('scriptRecord.applyRevoke'),
+								handleClick: this.revokeScript,
+								type: 'primary',
+								showControl:(row) => { return row.status==1 },
+							},
+							{
+								name: this.$t('scriptRecord.preview'),
+								handleClick: this.previewScript,
+								type: 'success',
+								showControl:(row) => { return row.status==1 },
+							}
+						]
+					}
+                ]
+			}
 		};
 	},
 	computed: {
-		form() {
-			const form = {
-				labelWidth: '150px',
-				items: [
-					{ prop: 'name', label: this.$t('scriptRecord.scriptName'), type: 'text', required: true},
-					{ prop: 'mapId', label: this.$t('scriptRecord.map'), type: 'select', required: true, options: this.mapList, disabled: this.disabled},
-					{ prop: 'description', label: this.$t('scriptRecord.scriptDescription'), type: 'textarea', required: true}
-				]
-			};
-			return form;
-		},
-		rules() {
-			const crules = {
-				name: [
-					{ required: true, message: this.$t('scriptRecord.scriptNameRule'), trigger: 'blur' },
-					{ required: true, message: this.$t('scriptRecord.scriptNameRule'), trigger: 'change' }
-					
-
-				],
-				mapId: [
-					{ required: true, message: '请选择所属地图', trigger: 'change' }
-				],
-				description: [
-					{ required: true, message: this.$t('scriptRecord.scriptDescriptionRule'), trigger: 'blur' },
-					{ required: true, message: this.$t('scriptRecord.scriptDescriptionRule'), trigger: 'change' }
-				]
-			};
-			return crules;
-		},
 		height() {
 			return this.$store.state.app.height - 50;
 		}
 	},
 	watch: {
-		'$store.state.scriptRecord.scriptId': function (val) {
-			this.formModel.mapId=val;
+		'$route' () {
+			this.reloadTable();
 		}
 	},
 	mounted() {
-		this.loadInitData();
+		this.reloadTable();
 	},
 	methods: {
-		loadInitData() {
-			this.mapList = [];
-			listPublishMap().then(response => {
-				this.mapList = response.data.map(elem => { return { value: elem.id, label: elem.name }; });
-				this.formModel.mapId=this.$store.state.scriptRecord.scriptId|| this.mapList[0].value;
+		queryFunction(params) {
+            return getQuestPageList(this.$route.params.mapId,params);
+		},
+		reloadTable() {
+			if (this.queryList && this.queryList.reload) {
+				this.queryList.reload();
+			}
+		},
+		drawUp(index,row) {
+			scriptRecordNotify(row.id).then(resp => {
+				const query = { mapId: row.mapId, group: resp.data, scriptId: row.id,lang:row.lang };
+				this.$router.push({ path: `${UrlConfig.scriptDisplay}/script`, query });
+				launchFullscreen();
+			}).catch(error => {
+				this.$messageBox(`${this.$t('scriptRecord.createSimulationFail')}: ${error.message}`);
 			});
 		},
-		doCreate() {
-			const self = this;
-			if (!this.loading) {
-				this.$refs.dataform.validateForm(() => {
-					this.loading=true;
-					const data=this.formModel;
-					if(Cookies.get("user_lang")=="en"){
-						data.lang='en';
-					}else{
-						data.lang='zh';
+		deleteScript(index,row) {
+			this.$confirm(this.$t('scriptRecord.deleteScriptTip'), this.$t('global.tips'), {
+				confirmButtonText: this.$t('global.confirm'),
+				cancelButtonText: this.$t('global.cancel'),
+				type: 'warning'
+			}).then(() => {
+				deleteQuest(row.id).then(response => {
+					this.$message.success(this.$t('scriptRecord.deleteScriptSucess'));
+					this.reloadTable();
+				}).catch(() => {
+					this.$messageBox(this.$t('scriptRecord.deleteScriptFail'));
+				});
+			}).catch(() => { });
+		},
+		// 确定创建
+		handleConfirmCreate(data) {
+			if(Cookies.get("user_lang")=="en"){
+				data.lang='en';
+			}else{
+				data.lang='zh';
+			}
+			createQuest(data).then(resp => {
+				this.reloadTable();
+				this.$message.success(this.$t('scriptRecord.createScriptSuccess'));
+			}).catch(error => {
+				this.$messageBox(`${this.$t('scriptRecord.createScriptFail')}: ${error.message}`);
+			})
+		},
+		//修改
+		handleModify(index, row){
+			this.$refs.modifyScript.doShow(row.id);
+		},
+		//确认修改
+		handleConfirmModify(data){
+			if(Cookies.get("user_lang")=="en"){
+				data.lang='en';
+			}else{
+				data.lang='zh';
+			}
+			updateQuest(data.id,data).then(resp => {
+				this.reloadTable();
+				this.$message.success(this.$t('scriptRecord.modifyScriptSuccess'));
+			}).catch(error => {
+				this.$messageBox(`${this.$t('scriptRecord.modifyScriptFail')}: ${error.message}`);
+			})
+		},
+		// 创建
+		handleCreate() {
+			this.$refs.createScript.doShow(null);
+		},
+		covertData(row){
+			let releaseReview=ConstConfig.ConstSelect.releaseReview;
+			let lastData=Object.assign({}, row);
+			if(Cookies.get("user_lang")=="en"){
+				releaseReview.forEach(function(element){
+					let rolename=element.value;
+					if(lastData.status==rolename){
+						lastData.status=element.enlabel;
+					}
+				});
+			}else{
+				releaseReview.forEach(function(element){
+					let rolename=element.value;
+					if(lastData.status==rolename){
+						lastData.status=element.label;
 					}
-					createQuest(data).then(resp => {
-						const data={mapId: self.formModel.mapId, scriptId: resp.data};
-						this.$emit('refresh', data);
-						this.$message.success(this.$t('scriptRecord.createScriptSuccess'));
-						
-
-						this.formModel={};
-						this.loading=false;
-						this.$router.push({ path: `${UrlConfig.script.detail}/${resp.data}` });
-					}).catch(error => {
-						this.loading=false;
-						this.$messageBox(`${this.$t('scriptRecord.createScriptFail')}${error.message}`);
-					});
 				});
 			}
+			return lastData.status;
+			// let explanation=lastData.explanation?'{ 说明：'+lastData.explanation+'}':'';
+			// return lastData.status+explanation;
+		},
+		handleConfirmPublish(data){
+			publishQuest(data.id,{'scriptName':data.scriptName}).then(resp => {
+				this.reloadTable();
+				this.$message.success(this.$t('scriptRecord.publishScriptSuccess'));
+			}).catch(error => {
+				this.$messageBox(`${this.$t('scriptRecord.publishScriptFailed')}: ${error.message}`);
+			});
+		},
+		publishScript(index,row){
+			if(this.$store.getters.roles.indexOf(admin) >= 0 || this.$store.getters.roles.indexOf(superAdmin) >= 0){
+				this.$refs.publishScript.doShow(row);
+			}else{
+				this.$confirm(this.$t('scriptRecord.releaseScriptTip'), this.$t('global.tips'), {
+					confirmButtonText: this.$t('global.confirm'),
+					cancelButtonText: this.$t('global.cancel'),
+					type: 'warning'
+				}).then(() => {
+					publishQuest(row.id,{name:''}).then(resp => {
+						this.reloadTable();
+						this.$message.success(this.$t('scriptRecord.releaseScriptSuccess'));
+					}).catch(error => {
+						this.$messageBox(`${this.$t('scriptRecord.releaseScriptFailed')}: ${error.message}`);
+					});
+				}).catch(() => { });
+
+			}
+		},
+		covertButtonname(){
+			if(this.$store.getters.roles.indexOf(admin) >= 0 || this.$store.getters.roles.indexOf(superAdmin) >= 0){
+				return this.$t('scriptRecord.publish');
+			}else{
+				return this.$t('scriptRecord.applyPublish');
+			}
+		},
+		revokeScript(index,row){
+			this.$confirm(this.$t('scriptRecord.revokeScriptTip'), this.$t('global.tips'), {
+				confirmButtonText: this.$t('global.confirm'),
+				cancelButtonText: this.$t('global.cancel'),
+				type: 'warning'
+			}).then(() => {
+				retractQuest(row.id).then(resp => {
+					this.reloadTable();
+					this.$message.success(this.$t('approval.revokeScriptSuccess'));
+				}).catch(error => {
+					this.$messageBox(`${this.$t('approval.revokeScriptFailed')}: ${error.message}`);
+				});
+			}).catch(() => { });
+		},
+		previewScript(index,row){
+			scriptRecordNotify(row.id).then(resp => {
+				const query = { mapId: row.mapId, group: resp.data, scriptId: row.id,skinCode:this.$route.query.skinCode,try:0};
+				this.$router.push({ path: `${UrlConfig.design.display}/demon`, query });
+				launchFullscreen();
+			}).catch(error => {
+				this.$messageBox(`${this.$t('scriptRecord.createSimulationFail')}: ${error.message}`);
+			});
+			// skinCode=02&group=16-128-757&prdType=02&mapId=18&code=JLFZZX-1&goodsId=&try=0
 		}
 	}
 };
 </script>
 <style rel="stylesheet/scss" lang="scss" scoped>
     @import "src/styles/mixin.scss";
-    .home-box {
-        padding: 20px 100px;
-        float: left;
-        width: 100%;
-        font-family: 'Microsoft YaHei';
-    }
-    .box-card {
-        width:800px;
-        margin: 0 auto;
-        margin-top: 20px;
-        padding-bottom: 50px;
-    }
-    #scriptTitle{
-        padding: 30px 40px;
-    }
-    #sciptForm{
-        margin-top: 10px;
-        padding: 0px 130px 0px 100px;
-    }
-    #btnList{
-        margin: 0px 100px;
-    }
-    .btn-footer{
-        margin-left: 100px;
-        margin-top: 10px;
-        display: inline-block;
-    }
+	.createScript{
+		display:inline-block;float:right;margin-right:20px;
+	}
+	.scriptHeader{
+		display:inline-block;margin-top:40px;width: 90%;margin-left:5%;
+	}
+	.scriptList{
+		display:inline-block;padding:7px 0px
+	}
+	.el-button+.el-button {
+		margin-left: 10px;
+		margin-top: 5px;
+	}
 </style>
diff --git a/src/views/scriptManage/index.vue b/src/views/scriptManage/index.vue
deleted file mode 100644
index aeb7f4255..000000000
--- a/src/views/scriptManage/index.vue
+++ /dev/null
@@ -1,60 +0,0 @@
-<template>
-  <div class="app-wrapper">
-    <el-scrollbar wrap-class="scrollbar-wrapper">
-      <div v-show="treeShow" class="list" :style="{width: widthLeft+'px'}">
-        <script-tree ref="scriptTree" :height="height" />
-      </div>
-      <drap-left :width-left="widthLeft" @drapWidth="drapWidth" />
-      <transition>
-        <router-view @refresh="refresh" />
-      </transition>
-    </el-scrollbar>
-  </div>
-</template>
-<script>
-import ScriptTree from './category/tree';
-import drapLeft from '@/views/components/drapLeft/index';
-
-export default {
-	name: 'Script',
-	components: {
-		ScriptTree,
-		drapLeft
-	},
-	data() {
-		return {
-			treeShow: true,
-			widthLeft: 450
-		};
-	},
-	computed: {
-		height() {
-			return this.$store.state.app.height - 50;
-		}
-	},
-	methods: {
-		drapWidth(width) {
-			this.widthLeft = Number(width);
-		},
-		refresh(data) {
-			this.$refs.scriptTree.refresh(data);
-		}
-	}
-
-};
-</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;
-  }
-
-  .list {
-    float: left;
-  }
-</style>
diff --git a/src/views/scriptManage/publish.vue b/src/views/scriptManage/publish.vue
new file mode 100644
index 000000000..16f09d1f3
--- /dev/null
+++ b/src/views/scriptManage/publish.vue
@@ -0,0 +1,73 @@
+<template>
+    <div>
+        <el-dialog :title="title" :visible.sync="dialogVisible" width="500px" :before-close="doClose" center>
+            <data-form ref="dataform" :form="form" :formModel="formModel" :rules="rules"></data-form>
+            <span slot="footer" class="dialog-footer">
+                <el-button type="primary" @click="doCreate">{{$t('global.confirm')}}</el-button>
+                <el-button @click="doClose">{{$t('global.cancel')}}</el-button>
+            </span>
+        </el-dialog>
+    </div>
+</template>
+<script>
+    export default {
+        name: 'ScriptOperate',
+        data() {
+            return {
+                dialogVisible: false,
+                formModel:{
+                    scriptName:'',
+                    id:'',
+                },
+                isShow: false,
+            }
+        },
+        props: {
+            title: String,
+            type:String,
+        },
+        computed: {
+            form() {
+                let form={
+                        labelWidth: '150px',
+                        items: [
+                            { prop: 'scriptName', label: this.$t('approval.scriptName'), type: 'text', required: true},
+                        ]
+                    }
+                return form
+            },
+            rules() {
+                let crules ={
+                        scriptName: [
+                            { required: true, message: this.$t('approval.inputScriptName'), trigger: 'blur' },
+                        ]
+                    }
+                return crules
+            },
+        },
+        methods: {
+            doShow(row) {
+                this.formModel.scriptName=row.name;
+                this.formModel.id=row.id;
+                this.dialogVisible = true   
+            },
+            doCreate() {
+                let self = this
+                this.$refs.dataform.validateForm(() => {
+                    self.$emit('create', Object.assign({}, this.formModel));
+                    self.doClose()
+                })
+            },
+            doClose() {
+                this.$refs.dataform.resetForm();
+                this.isShow = false;
+                this.dialogVisible = false
+            }
+        }
+    };
+</script>
+<style lang="scss" scoped>
+/deep/ .el-dialog--center .el-dialog__body{
+    padding: 15px 65px 10px 10px;
+}
+</style>
diff --git a/src/views/scriptManage/scriptRecord/addAction.vue b/src/views/scriptManage/scriptRecord/addAction.vue
index 95e888dc5..c23d3fe54 100644
--- a/src/views/scriptManage/scriptRecord/addAction.vue
+++ b/src/views/scriptManage/scriptRecord/addAction.vue
@@ -3,11 +3,6 @@
     <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">
-        <!-- <el-form-item label="动作类型" class="conditionVO" prop="actionVO.type" >
-                        <el-select v-model="modalData.actionVO.type " placeholder="请选择动作类型" @change="changeType" :disabled="deviceTypeReadOnly||isPause">
-                            <el-option v-for="actionType in actionTypeList" :key="actionType.label" :label="actionType.label" :value="actionType.value"></el-option>
-                        </el-select>
-                    </el-form-item> -->
         <div>
           <div class="itemGroup">
             <el-form-item :label="$t('scriptRecord.narrator')" class="conditionVO" prop="actionVO.memberId">
@@ -68,8 +63,6 @@
 <script>
     import Vue from 'vue';
     import Cookies from 'js-cookie';
-    import DeviceTypeDic from '@/scripts/DeviceTypeDic';
-    // import CommandForm from "./commandForm";
     import ConstConfig from '@/scripts/ConstConfig';
     import {addScriptAction,modifyScriptAction,getAvailableDeviceCommand,getDeviceCodeByDeviceType,getScriptPlayMember} from '@/api/simulation';
     export default {
@@ -130,7 +123,6 @@
                 isNotModify:true,
                 modifying:false,
                 adding:false,
-                actionTypeList:DeviceTypeDic.ConstSelect.actionType,
                 isJinLu:false,
                 stationList:[],
                 memberList:[],
@@ -182,7 +174,6 @@
                     let lastData=JSON.stringify(resp.data);
                     roleTypeList.forEach(function(element){
                         let rolename=element.value;
-                        // lastData=lastData.replace(new RegExp(rolename,'g'),element.label);
                         if(Cookies.get("user_lang")=="en"){
                             lastData=lastData.replace(new RegExp(rolename,'g'),element.enLabel);
                         }else{
diff --git a/src/views/systemGenerate/create.vue b/src/views/systemGenerate/create.vue
new file mode 100644
index 000000000..faf22969e
--- /dev/null
+++ b/src/views/systemGenerate/create.vue
@@ -0,0 +1,157 @@
+<template>
+    <div>
+        <el-dialog :title="title" :visible.sync="dialogVisible" width="500px" :before-close="doClose" center>
+            <data-form ref="dataform" :form="form" :formModel="formModel" :rules="rules"></data-form>
+            <span slot="footer" class="dialog-footer">
+                <el-button type="primary" @click="doCreate">{{$t('global.confirm')}}</el-button>
+                <el-button @click="doClose">{{$t('global.cancel')}}</el-button>
+            </span>
+        </el-dialog>
+    </div>
+</template>
+<script>
+    import ConstConfig from '@/scripts/ConstConfig';
+    import Cookies from 'js-cookie';
+    import { listPublishMap } from '@/api/jmap/map';
+    import { getCommodityMapProduct } from '@/api/management/mapprd';
+    export default {
+        name: 'OnceGenerate',
+        data() {
+            return {
+                dialogVisible: false,
+                mapList: [],
+                disabled:null,
+                productList:[],
+                mapInfoList:[],
+                projectList:[],
+                typeList:[],
+                formModel:{
+                    mapId:'',
+                    name: "",
+                    prdCode: "",
+                    type: "",
+                    id:null,
+                }
+            }
+        },
+        mounted() {
+            this.loadInitData();
+        },
+        props: {
+            title: String,
+            operateType:String
+        },
+        computed: {
+            form() {
+                let form={};
+                if(this.operateType=="add"){
+                    form={
+                        labelWidth: '150px',
+                        items: [
+                            { prop: 'customized', label: this.$t('systemGenerate.customized'), type: 'select', required: true,options: this.projectList},
+                            { prop: 'mapId', label: this.$t('systemGenerate.mapName'), type: 'select', required: true,options: this.mapList,change:true,onChange:this.changeMap},
+                            { prop: 'prdCode', label: this.$t('systemGenerate.prdName'), type: 'select', required: true,options:this.productList},
+                            { prop: 'name', label: this.$t('systemGenerate.name'), type: 'text', required: true,},
+                            { prop: 'type', label: this.$t('systemGenerate.type'), type: 'select', required: true,options: this.typeList},
+                        ]
+                    }
+                }
+                else{
+                    form={
+                        labelWidth: '150px',
+                        items: [
+                            { prop: 'name', label: this.$t('systemGenerate.name'), type: 'text', required: true,},
+                        ]
+                    }
+                }
+                return form
+            },
+            rules() {
+                let crules ={};
+                if(this.operateType=="add"){
+                    crules ={customized:[
+                            { required: true, message: this.$t('systemGenerate.selectProject'), trigger: 'change'},
+                        ],
+                        mapId:[
+                            { required: true, message: this.$t('systemGenerate.selectMap'), trigger: 'change'},
+                        ],
+                        name: [
+                            { required: true, message: this.$t('systemGenerate.inputName'), trigger: 'blur' },
+                            { required: true, message: this.$t('systemGenerate.inputName'), trigger: 'change' },
+                        ],
+                        type:[
+                            { required: true, message: this.$t('systemGenerate.selectType'), trigger: 'change'},
+                        ],
+                        prdCode:[
+                            { required: true, message: this.$t('systemGenerate.selectPrdName'), trigger: 'change'},
+                        ]
+                    }
+                }else{
+                    crules ={
+                        name: [
+                            { required: true, message: this.$t('systemGenerate.inputName'), trigger: 'blur' },
+                            { required: true, message: this.$t('systemGenerate.inputName'), trigger: 'change' },
+                        ],
+                    };
+                }
+                return crules
+            },
+        },
+        methods:{
+            loadInitData(){
+                this.projectList=[{value:'xty',label:'西铁院'}];
+                let customeredProductType=ConstConfig.ConstSelect.customeredProductType;
+                if(Cookies.get("user_lang")=="en"){
+                    customeredProductType.forEach(elem => {
+                        this.typeList.push({ value: elem.value, label: elem.enlabel });
+                    });
+                }else{
+                    customeredProductType.forEach(elem => {
+                        this.typeList.push({ value: elem.value, label: elem.label });
+                    });
+                }
+                listPublishMap().then(response => {
+                    this.mapInfoList=response.data;
+                    this.mapList = response.data.map(elem => { return { value: elem.id, label: elem.name } });
+                })
+            },
+            changeMap(index){
+                this.productList=[];
+                let mapInfo=this.mapInfoList.find(elem=>{
+                    return elem.id==index;
+                });
+                
+                getCommodityMapProduct(mapInfo.skinCode).then((response) => {
+                    this.productList = response.data.map(elem => { return { value: elem.code, label: elem.name } });
+                    this.formModel.prdCode="";
+				});
+            },
+            doShow(data) {
+                if(data){
+                    this.formModel.name=data.name;
+                    this.formModel.id=data.id;
+                }
+                this.dialogVisible = true   
+            },
+            doCreate() {
+                let self = this
+                this.$refs.dataform.validateForm(() => {
+                    self.$emit('create', Object.assign({}, this.formModel));
+                    self.doClose()
+                })
+            },
+            doClose() {
+                this.$refs.dataform.resetForm();
+                this.dialogVisible = false
+            }
+        }
+    };
+</script>
+<style lang="scss" scoped>
+/deep/ .el-dialog--center .el-dialog__body{
+    padding: 25px 55px 20px 20px;
+}
+/deep/ .el-dialog--center .el-dialog__body .el-input{
+    width:200px !important;
+}
+</style>
diff --git a/src/views/systemGenerate/generate.vue b/src/views/systemGenerate/generate.vue
new file mode 100644
index 000000000..2483a2444
--- /dev/null
+++ b/src/views/systemGenerate/generate.vue
@@ -0,0 +1,75 @@
+<template>
+    <div>
+        <el-dialog :title="title" :visible.sync="dialogVisible" width="500px" :before-close="doClose" center>
+            <data-form ref="dataform" :form="form" :formModel="formModel" :rules="rules"></data-form>
+            <span slot="footer" class="dialog-footer">
+                <el-button type="primary" @click="doCreate">{{$t('global.confirm')}}</el-button>
+                <el-button @click="doClose">{{$t('global.cancel')}}</el-button>
+            </span>
+        </el-dialog>
+    </div>
+</template>
+<script>
+    import { listPublishMap } from '@/api/jmap/map'
+    export default {
+        name: 'OnceGenerate',
+        data() {
+            return {
+                dialogVisible: false,
+                mapList: [],
+                formModel:{
+                    mapId:'',
+                },
+                title: this.$t('systemGenerate.generation') 
+            }
+        },
+        mounted() {
+            this.loadInitData();
+        },
+        computed: {
+            form() {
+                let form={
+                    labelWidth: '150px',
+                    items: [
+                        { prop: 'mapId', label: this.$t('systemGenerate.mapName'), type: 'select', required: true,options: this.mapList},
+                    ]
+                }
+                return form
+            },
+            rules() {
+                let crules ={
+                    mapId:[
+                        { required: true, message: this.$t('systemGenerate.selectMap'), trigger: 'change'},
+                    ]
+                }
+                return crules
+            },
+        },
+        methods: {
+            loadInitData() {
+                listPublishMap().then(response => {
+                    this.mapList = response.data.map(elem => { return { value: elem.id, label: elem.name } });
+                })
+            },
+            doShow() {
+                this.dialogVisible = true   
+            },
+            doCreate() {
+                let self = this
+                this.$refs.dataform.validateForm(() => {
+                    self.$emit('create', Object.assign({}, this.formModel));
+                    self.doClose()
+                })
+            },
+            doClose() {
+                this.$refs.dataform.resetForm();
+                this.dialogVisible = false
+            }
+        }
+    }
+</script>
+<style lang="scss" scoped>
+/deep/ .el-dialog--center .el-dialog__body{
+    padding: 25px 55px 20px 30px;
+}
+</style>
\ No newline at end of file
diff --git a/src/views/systemGenerate/index.vue b/src/views/systemGenerate/index.vue
new file mode 100644
index 000000000..38a7fe370
--- /dev/null
+++ b/src/views/systemGenerate/index.vue
@@ -0,0 +1,207 @@
+<template>
+    <el-card>
+        <QueryListPage ref="subSystemListPage" :pager-config="pagerConfig" :query-form="queryForm" :query-list="queryList" />
+        <once-generate ref="generate" @create="generateMapSystem"></once-generate>
+        <createMapSystem ref="createMapSystem" :title="$t('systemGenerate.createSubSystem')" @create="handleCreate" operateType="add"></createMapSystem>
+        <createMapSystem ref="modifyMapSystem" :title="$t('systemGenerate.modifySubSystem')" @create="handleModify" operateType="modify"></createMapSystem>
+    </el-card>
+</template>
+
+<script>
+    import Cookies from 'js-cookie';
+    import { listPublishMap } from '@/api/jmap/map';
+    import { generateMapSystem,getMapSystemPageList,createMapSubSystem,getSubSystemInfo,updateSubSystem,deleteSubSystem} from '@/api/trainingPlatform';
+    import ConstConfig from '@/scripts/ConstConfig';
+    import OnceGenerate from './generate';
+    import createMapSystem from './create';
+
+    export default {
+        name: 'SystemGenerate',
+        data() {
+            return{
+                prdTypeList:[],
+                mapId: '',
+                pagerConfig: {
+                    pageSize: 'pageSize',
+                    pageIndex: 'pageNum'
+                },
+                queryForm: {
+                    labelWidth: '100px',
+                    reset: true,
+                    queryObject: {
+                        mapId: {
+                            type: 'select',
+                            label: this.$t('systemGenerate.map'),
+                            config: {
+                                data: []
+                            }
+                        },
+                        'name': {
+                            type: 'text',
+                            label: this.$t('systemGenerate.name')
+                        },
+                        'type': {
+                            type: 'select',
+                            label: this.$t('systemGenerate.type'),
+                            config: {
+                                data: []
+                            }
+                        },
+                    }
+                },
+                queryList: {
+                    query: this.queryFunction,
+                    selectCheckShow: false,
+                    indexShow: true,
+                    columns: [
+                        {
+                            title: this.$t('systemGenerate.name'),
+                            prop: 'name'
+                        },
+                        {
+                            title: this.$t('systemGenerate.type'),
+                            type: 'tag',
+                            prop: 'type',
+                            columnValue: (row) => { return this.$convertField(row.type , this.prdTypeList, ['value', 'label']); },
+                            tagType: (row) => { return ''; }
+                        },
+                        {
+                            title: this.$t('systemGenerate.mapName'),
+                            type: 'tag',
+                            prop: 'mapName',
+                            columnValue: (row) => { return row.mapName},
+                            tagType: (row) => { return ''; }
+                        },
+                        {
+                            title: this.$t('systemGenerate.prdName'),
+                            prop: 'prdName'
+                        },
+                        {
+                            type: 'button',
+                            title: this.$t('global.operate'),
+                            width: '400',
+                            buttons: [
+                                {
+                                    name: this.$t('systemGenerate.updateData'),
+                                    handleClick: this.updateData,
+                                    type: ''
+                                },
+                                {
+                                    name: this.$t('systemGenerate.deleteData'),
+                                    handleClick: this.deleteData,
+                                    type: 'danger',
+								    showControl:(row) => { return Boolean(row.customized) },
+                                },
+                            ],
+                        },
+                    ],
+                    actions: [
+                        { text: this.$t('systemGenerate.commission'), handler: this.handleAdd },
+                        { text: this.$t('systemGenerate.generate'), handler: this.generate }
+                    ]
+                },
+
+            }
+        },
+        components: {
+            OnceGenerate,
+            createMapSystem
+        },
+        mounted(){
+            this.loadInitData();
+        },
+        computed: {
+            height() {
+                return this.$store.state.app.height - 50;
+            }
+        },
+        methods: {
+            updateData(index,row){
+                getSubSystemInfo(row.id).then(response => {
+                    this.$refs.modifyMapSystem.doShow(response.data);
+				}).catch(() => {
+					this.$messageBox(this.$t('systemGenerate.getSubSystemInfoFail'));
+				});
+            },
+            deleteData(index,row){
+                this.$confirm(this.$t('systemGenerate.deleteMapSystemTip'), this.$t('global.tips'), {
+                    confirmButtonText: this.$t('global.confirm'),
+                    cancelButtonText: this.$t('global.cancel'),
+                    type: 'warning'
+                }).then(() => {
+                    deleteSubSystem(row.id).then(response => {
+                        this.$message.success(this.$t('systemGenerate.deleteMapSystemSuccess'));
+                        this.reloadTable();
+                    }).catch(() => {
+                        this.$messageBox(this.$t('systemGenerate.deleteMapSystemFail'));
+                    });
+                }).catch(() => { });
+            },
+            handleCreate(data){
+                delete data.id;
+                createMapSubSystem(data).then(response => {
+					this.$message.success(this.$t('systemGenerate.createMapSystemSuccess'));
+					this.reloadTable();
+				}).catch(() => {
+					this.$messageBox(this.$t('systemGenerate.createMapSystemFail'));
+				});
+            },
+            handleModify(data){
+               let datainfo={'name':data.name};
+               updateSubSystem(data.id,datainfo).then(response => {
+					this.$message.success(this.$t('systemGenerate.updateMapSystemSuccess'));
+					this.reloadTable();
+				}).catch(() => {
+					this.$messageBox(this.$t('systemGenerate.updateMapSystemFail'));
+				});
+            },
+            handleAdd(){
+                this.$refs.createMapSystem.doShow();
+            },
+            reloadTable(){
+                if (this.queryList && this.queryList.reload) {
+                    this.queryList.reload();
+                }
+            },
+            async loadInitData() {
+                try {
+                    // 获取地图
+                    this.mapList = [];
+                    const res = await listPublishMap();
+                    this.allMapList=res.data;
+                    res.data.forEach(elem => {
+                        this.queryForm.queryObject.mapId.config.data.push({ value: elem.id, label: elem.name });
+                    });
+                    let productTypeList=ConstConfig.ConstSelect.productType;
+                    if(Cookies.get("user_lang")=="en"){
+                        productTypeList.forEach(elem => {
+                            this.queryForm.queryObject.type.config.data.push({ value: elem.value, label: elem.enlabel });
+                            this.prdTypeList.push({ value: elem.value, label: elem.enlabel });
+                        });
+                    }else{
+                        productTypeList.forEach(elem => {
+                            this.queryForm.queryObject.type.config.data.push({ value: elem.value, label: elem.label });
+                            this.prdTypeList.push({ value: elem.value, label: elem.label });
+                        });
+                    }
+                } catch (error) {
+                    console.error(error, '获取发布地图');
+                }
+            },
+            generate() {
+                this.$refs.generate.doShow();
+            },
+            generateMapSystem(data) {
+                generateMapSystem(data.mapId).then(response => {
+                    this.reloadTable();
+                    this.$message.success(this.$t('systemGenerate.generateSuccess'));
+                }).catch(() => {
+                    this.$messageBox(this.$t('systemGenerate.generateFail'));
+                });
+            },
+            queryFunction(params) {
+                return getMapSystemPageList(params);
+            },
+        }
+    }
+</script>
diff --git a/src/views/teach/category/tree.vue b/src/views/teach/category/tree.vue
deleted file mode 100644
index 38334aed7..000000000
--- a/src/views/teach/category/tree.vue
+++ /dev/null
@@ -1,226 +0,0 @@
-<template>
-  <el-card v-loading="loading" class="map-list-main">
-    <div slot="header" class="clearfix">
-      <span>{{ $t('teach.courseList') }}</span>
-    </div>
-    <filter-city
-      ref="filerCity"
-      is-cascader
-      filter-empty
-      :query-function="queryFunction"
-      @filterSelectChange="refresh"
-    />
-    <el-input v-model="filterText" :placeholder="$t('tip.enterKeywordsFiltering')" clearable />
-    <el-scrollbar wrap-class="scrollbar-wrapper" :style="{ height: (height-125) +'px', width:'100%' }">
-      <el-tree
-        ref="tree"
-        :data="treeData"
-        :props="defaultProps"
-        :filter-node-method="filterNode"
-        node-key="id"
-        :default-expanded-keys="defaultShowKeys"
-        highlight-current
-        :span="22"
-        @node-contextmenu="showContextMenu"
-        @node-click="clickEvent"
-		style="padding-bottom: 30px;"
-      >
-        <span slot-scope="{ node: tnode }" class="custom-tree-node">
-          <span
-            v-if="tnode.data.type === 'lesson'"
-            :class="tnode.data.valid? 'el-icon-sold-out':'el-icon-goods'"
-          >
-            <span class="el-icon-tickets">
-            </span>
-          </span>
-          <span
-            v-else-if="tnode.data.type === 'chapter'"
-            :class="tnode.data.valid? 'el-icon-sold-out':'el-icon-goods'"
-          >
-            <span class="el-icon-document">
-            </span>
-          </span>
-          <span
-            v-else-if="tnode.data.type === 'training'"
-            :class="tnode.data.valid? 'el-icon-sold-out':'el-icon-goods'"
-          >
-            <span class="el-icon-mobile-phone">
-            </span>
-          </span>
-          <span :style="{color: tnode.data.valid ? 'green':''}">&nbsp;{{ tnode.label }}</span>
-        </span>
-      </el-tree>
-    </el-scrollbar>
-  </el-card>
-</template>
-<script>
-import { getPublishLessonTree, getPublishLessonDetail } from '@/api/jmap/lesson';
-import { PermissionType } from '@/scripts/ConstDic';
-import { UrlConfig } from '@/router/index';
-import FilterCity from '@/views/components/filterCity';
-
-export default {
-	name: 'TrainingTree',
-	components: {
-		FilterCity
-	},
-	props: {
-		height: {
-			type: Number,
-			required: true
-		}
-	},
-	data() {
-		return {
-			loading: true,
-			filterSelect: [],
-			filterOptions: [],
-			filterText: '',
-			queryFunction: getPublishLessonTree,
-			treeData: [],
-			selected: {},
-			defaultProps: {
-				children: 'children',
-				label: 'name'
-			},
-			defaultShowKeys: [],
-			lessonId: 0,
-			point: {
-				x: 0,
-				y: 0
-			},
-			node: {
-			}
-		};
-	},
-	computed: {
-		role() {
-			return this.$store.state.user.roles.includes('04') ||
-                    this.$store.state.user.roles.includes('05') ||
-                    this.$store.state.user.roles.includes('01');
-		}
-	},
-	watch: {
-		filterText(val) {
-			this.$refs.tree.filter(val);
-		}
-	},
-	methods: {
-		// backHome() {
-		// 	this.$router.push({ path: `/` });
-		// },
-		filterNode(value, data) {
-			if (!value) return true;
-			return data.name.indexOf(value) !== -1;
-		},
-		showContextMenu(e, obj, node, vueElem) {
-			if (obj) {
-				switch (obj.type) {
-				case 'trainType':
-				case 'training':
-					e.preventDefault();
-					this.point = {
-						x: e.clientX,
-						y: e.clientY
-					};
-					this.node = node;
-					this.selected = obj;
-					break;
-				}
-			}
-		},
-		trainingStart(data, node) {
-			if (node.level == 1) { //  判断层级是1的 才返回 id
-				this.$router.push({ path: `${UrlConfig.teach.practical}/${data.id}/${node.data.id}` });
-			} else {
-				this.trainingStart(data, node.parent);
-			}
-		},
-		lessonDetail(data) {
-			this.$router.push({ path: `${UrlConfig.teach.detail}/${data.id}` });
-		},
-		buy(data) {
-			this.$router.push({
-				path: `${UrlConfig.teach.pay}/${data.lessonId}`, query:
-                        { permissionType: PermissionType.LESSON, lessonId: data.lessonId, prdCode: data.prdCode, mapId: data.mapId }
-			});
-		},
-		clickEvent(obj, node, data) {
-			this.$store.dispatch('menuOperation/setPopMenu', { position: null, menu: null });
-			if (obj) {
-				switch (obj.type) {
-				case 'lesson':
-					this.lessonId = obj.id;
-					this.lessonDetail(obj);
-					break;
-				case 'training':
-					if (obj.valid) {
-						this.trainingStart(obj, node);
-					} else {
-						this.$confirm(this.$t('tip.accessCourseNo'), this.$t('tip.hint'), {
-							confirmButtonText: this.$t('tip.confirm'),
-							cancelButtonText: this.$t('tip.cancel')
-						}).then(() => {
-							while (node) {
-								if (node.data.type === 'lesson') {
-									const lessonId = node.data.id;
-									if (lessonId) {
-										getPublishLessonDetail({ id: lessonId }).then(res => {
-											const query = {
-												lessonId: lessonId,
-												prdCode: res.data.prdCode,
-												mapId: res.data.mapId
-											};
-											this.buy(query);
-										});
-									}
-									break;
-								}
-								node = node.parent;
-							}
-						}).catch(() => { });
-					}
-					break;
-				}
-			}
-		},
-		refresh(filterSelect) {
-			const params = { mapId: filterSelect[1] };
-			this.loading = true;
-			getPublishLessonTree(params).then(response => {
-				this.treeData = response.data;
-				this.defaultShowKeys = [this.$route.params.trainingId];
-				this.$nextTick(() => {
-					this.loading = false;
-					this.$refs.tree.setCurrentKey(this.$route.params.trainingId); // value 绑定的node-key
-					if (this.filterText) {
-						this.$refs.tree.filter(this.filterText);
-					}
-				});
-			}).catch(() => {
-				this.loading = false;
-				this.$messageBox(this.$t('tip.refreshFailure'));
-			});
-		}
-	}
-};
-</script>
-<style rel="stylesheet/scss" lang="scss" scoped>
-    .back-home {
-        float: right;
-        cursor: pointer;
-
-        &:hover {
-            color: #3ea726;
-        }
-    }
-</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/teach/detail/index.vue b/src/views/teach/detail/index.vue
index 9776c4cb1..1f3805e19 100644
--- a/src/views/teach/detail/index.vue
+++ b/src/views/teach/detail/index.vue
@@ -4,30 +4,29 @@
       <b>{{ $t('teach.courseName') }}: {{ courseModel.name }}</b>
     </div>
     <div style="margin:50px" :style="{ height: height - 190 +'px' }">
-      <p style="font-size: 14px; margin-bottom: 20px"> {{ $t('teach.courseDescription') }}:
-        <span style="color: #808080 !important;">
-          {{ courseModel.remarks }}
-        </span>
-      </p>
       <el-tabs v-model="activeName">
         <el-tab-pane :label="$t('teach.courseDetails')" name="first">
           <div :style="{ height: height - 270 +'px' }">
             <el-scrollbar wrap-class="scrollbar-wrapper">
-              <template v-for="item in courseModel.detail">
-                <ul :key="item.code" type="circle">
-                  <li>{{ item.name }}
-                    <template v-for="it in item.trainingVos">
-                      <ul :key="it.code" style="float:none;" type="circle">
-                        <li :style="{color: it.trial? 'green':'' }">
-                          <span>{{ it.name }}
-                            <span v-if="it.trial">({{ $t('teach.free') }})</span>
-                          </span>
-                        </li>
-                      </ul>
-                    </template>
-                  </li>
-                </ul>
-              </template>
+              <el-tree
+                ref="tree"
+                :data="courseModel.treeList"
+                node-key="id"
+                :props="defaultProps"
+                :filter-node-method="filterNode"
+                highlight-current
+                :default-expanded-keys="expandList"
+                :span="22"
+                @node-click="clickEvent"
+                @node-expand="nodeExpand"
+                @node-collapse="nodeCollapse"
+              >
+                <span slot-scope="{ node }">
+                  <span v-if="node.data.type === 'Training'" class="el-icon-goods" />
+                  <span v-if="node.data.valid" :style="{color: 'green'}">&nbsp;{{ node.label }}</span>
+                  <span v-else>&nbsp;{{ node.label }}</span>
+                </span>
+              </el-tree>
             </el-scrollbar>
           </div>
         </el-tab-pane>
@@ -44,15 +43,19 @@
       <el-button type="success" @click="buy">{{ $t('teach.buy') }}</el-button>
       <el-button v-if="hasPermssion" type="primary" @click="distribute">{{ $t('teach.permissionDistribute') }}</el-button>
       <el-button v-if="hasPermssion" type="primary" @click="transfer">{{ $t('teach.authorityTransferred') }}</el-button>
+      <el-button type="primary" @click="backLessonList">返回课程列表</el-button>
     </div>
   </el-card>
 </template>
 
 <script>
-import { getPublishLessonDetail } from '@/api/jmap/lesson';
+import { getPublishLessonTree } from '@/api/jmap/lesson';
 import { PermissionType } from '@/scripts/ConstDic';
 import { UrlConfig } from '@/router/index';
 import LimitList from '@/views/components/limits/index';
+import { getSessionStorage, setSessionStorage } from '@/utils/auth';
+import { trainingNotify } from '@/api/simulation';
+import { launchFullscreen } from '@/utils/screen';
 
 export default {
 	name: 'LessonDetail',
@@ -68,13 +71,14 @@ export default {
 			courseModel: {
 				id: '',
 				name: '',
-				skinCode: '',
-				price: 0,
-				remarks: '',
-				detail: [],
 				pmsList: []
 			},
-			activeName: 'first'
+			activeName: 'first',
+			defaultProps: {
+				children: 'children',
+				label: 'name'
+			},
+			expandList: []
 		};
 	},
 	computed: {
@@ -98,31 +102,21 @@ export default {
 	},
 	methods: {
 		initLoadPage() {
-			const data = { id: this.$route.params.lessonId };
-			if (parseInt(data.id)) {
-				getPublishLessonDetail(data).then(response => {
+			getPublishLessonTree(this.$route.query.lessonId).then(response => {
+				if (response.data.tree && response.data.tree.length>0) {
 					this.courseModel = {
-						id: response.data.id,
-						name: response.data.name,
-						price: response.data.price,
-						remarks: response.data.remarks,
-						detail: response.data.chapters,
-						pmsList: response.data.pmsList || [],
-						prdCode: response.data.prdCode,
-						mapId: response.data.mapId,
-						skinCode: response.data.skinCode,
+						id: response.data.tree[0].id,
+						name: response.data.tree[0].name,
+						pmsList: response.data.permissionList || [],
+						treeList: response.data.tree,
+						prdCode: this.$route.query.prdCode,
+						mapId: this.$route.query.mapId,
 						PermissionType: PermissionType.LESSON
 					};
-				}).catch(error => {
-					this.$message.error(this.$t('tip.failedCourse') + ':' + error.message);
-				});
-			}
-		},
-		buy() {
-			this.loading = true;
-			this.$router.push({
-				path: `${UrlConfig.teach.pay}/${this.$route.params.lessonId}`,
-				query: { permissionType: PermissionType.LESSON, lessonId: this.$route.params.lessonId, prdCode: this.courseModel.prdCode, mapId: this.courseModel.mapId }
+				}
+				this.getExpandList(this.courseModel.id);
+			}).catch(error => {
+				this.$message.error(this.$t('tip.failedCourse') + ':' + error.message);
 			});
 		},
 		transfer() {
@@ -138,6 +132,79 @@ export default {
 				this.activeName = 'second';
 				this.$refs.limitList.distribute(this.courseModel);
 			}
+		},
+		clickEvent(obj, node, ele) {
+			if (obj && obj.type==='Training') {
+				if (obj.valid) {
+					this.loading = true;
+					trainingNotify({ trainingId: obj.id }).then(resp => {
+						const query = {
+							group: resp.data, trainingId: obj.id, lessonId: this.$route.query.lessonId
+						};
+						this.$router.push({ path: `${UrlConfig.display}/teach`, query: query });
+						launchFullscreen();
+					}).catch(error => {
+						this.loading = false;
+						this.$messageBox(`${this.$t('tip.createSimulationFaild')} : ${error.message}`);
+					});
+				} else {
+					this.$confirm(this.$t('tip.accessCourseNo'), this.$t('tip.hint'), {
+						confirmButtonText: this.$t('tip.confirm'),
+						cancelButtonText: this.$t('tip.cancel')
+					}).then(() => {
+						this.buy();
+					}).catch(() => { });
+				}
+			}
+		},
+		filterNode(value, data) {
+			if (!value) return true;
+			return data.name.indexOf(value) !== -1;
+		},
+		buy() {
+			this.$router.push({
+				path: `${UrlConfig.trainingPlatform.pay}/${this.courseModel.id}`, query:
+                    { permissionType: PermissionType.LESSON, lessonId: this.courseModel.id, prdCode: this.$route.query.prdCode, mapId: this.$route.query.mapId, subSystem: this.$route.params.subSystem }
+			});
+		},
+		nodeExpand(obj, node, ele) {
+			const key = obj.id;
+			this.expandList = this.expandList.filter(item => item!==key);
+			this.expandList.push(key);
+			setSessionStorage('trainingTeachExpandList'+this.courseModel.id, this.expandList);
+		},
+		nodeCollapse(obj, node, ele) {
+			const key = obj.id;
+			if (obj.type === 'Lesson') {
+				this.expandList = [];
+			} else {
+				this.expandList = this.expandList.filter(item => item!==key);
+			}
+			setSessionStorage('trainingTeachExpandList'+this.courseModel.id, this.expandList);
+		},
+		getExpandList(id) {
+			let expand = getSessionStorage('trainingTeachExpandList'+id);
+			expand = expand?(expand+'').split(','):'';
+			if (expand instanceof Array) {
+				this.expandList = expand;
+			}
+		},
+		startTraining(data) {
+			if (data && data.type==='Training') {
+				if (data.valid) {
+					this.$router.push({ path: `${UrlConfig.trainingPlatform.practical}/${data.id}/${this.courseModel.id}`});
+				} else {
+					this.$confirm(this.$t('tip.accessCourseNo'), this.$t('tip.hint'), {
+						confirmButtonText: this.$t('tip.confirm'),
+						cancelButtonText: this.$t('tip.cancel')
+					}).then(() => {
+						this.buy();
+					}).catch(() => { });
+				}
+			}
+		},
+		backLessonList() {
+			this.$router.push({ path: `${UrlConfig.trainingPlatform.teachHome}/${this.$route.params.subSystem}`});
 		}
 	}
 };
@@ -160,4 +227,11 @@ export default {
     justify-content: center;
     transform: translateY(-20px);
   }
+  .custom-tree-node {
+      flex: 1;
+      display: flex;
+      align-items: center;
+      justify-content: space-between;
+      padding-right: 50px;
+  }
 </style>
diff --git a/src/views/teach/home.vue b/src/views/teach/home.vue
deleted file mode 100644
index b6f32ee8d..000000000
--- a/src/views/teach/home.vue
+++ /dev/null
@@ -1,98 +0,0 @@
-<template>
-  <el-card :style="{height: height+'px'}">
-    <div class="home-box" :style="{height: height+'px'}">
-      <el-scrollbar wrap-class="scrollbar-wrapper">
-        <h1 class="title">
-          {{ $t('teach.title') }}
-          <img :src="logo" alt="" class="logo-img">
-        </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('teach.describe') }}</div>
-      </el-scrollbar>
-    </div>
-  </el-card>
-</template>
-
-<script>
-import logo from '@/assets/logo.png';
-import home1 from '@/assets/home/home3.png';
-import home2 from '@/assets/home/home4.png';
-import home3 from '@/assets/home/home3.jpg';
-import home4 from '@/assets/home/tring2.png';
-import home5 from '@/assets/home/tring5.jpg';
-import home6 from '@/assets/home/tring6.jpg';
-export default {
-	name: 'Home',
-	data() {
-		return {
-			listImg: [
-				{ src: home1 },
-				{ src: home2 },
-				{ src: home3 },
-				{ src: home4 },
-				{ src: home5 },
-				{ src: home6 }
-			],
-			logo: logo
-		};
-	},
-	computed: {
-		height() {
-			return this.$store.state.app.height - 50;
-		}
-	}
-};
-</script>
-<style rel="stylesheet/scss" lang="scss" scoped>
-    @import "src/styles/mixin.scss";
-
-    /deep/ .el-carousel {
-        overflow: hidden;
-    }
-
-    .home-box {
-        padding: 15px 100px;
-        float: left;
-        width: 100%;
-        font-family: 'Microsoft YaHei';
-
-        .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/teach/index.vue b/src/views/teach/index.vue
index d0adbd87a..3999e8535 100644
--- a/src/views/teach/index.vue
+++ b/src/views/teach/index.vue
@@ -1,76 +1,75 @@
 <template>
-  <div class="app-wrapper">
-    <el-scrollbar wrap-class="scrollbar-wrapper">
-      <div v-show="treeShow" class="list" :style="{width: widthLeft+'px'}">
-        <lesson-tree ref="tree" :height="height" />
+  <div style="height: 100%; padding-bottom: 20px;">
+    <el-card>
+      <div slot="header" style="text-align: center;">
+        <b>教学系统</b>
       </div>
-      <drap-left :width-left="widthLeft" @drapWidth="drapWidth" />
-      <transition>
-        <router-view />
-      </transition>
-    </el-scrollbar>
+    </el-card>
+    <el-card v-loading="loading">
+      <el-table
+        :data="tableData"
+        border
+        style="width: 100%"
+      >
+        <el-table-column
+          prop="name"
+          label="课程"
+        />
+        <el-table-column
+          prop="remarks"
+          show-overflow-tooltip
+          label="说明"
+        />
+        <el-table-column
+          label="操作"
+        >
+          <template slot-scope="scope">
+            <el-button size="mini" type="primary" @click="goLesson(scope.row)">
+              进入课程
+            </el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+    </el-card>
   </div>
 </template>
 
 <script>
-import { mapGetters } from 'vuex';
-import LessonTree from './category/tree';
+import { getSubSystemDetail } from '@/api/trainingPlatform';
+import { UrlConfig } from '@/router/index';
 import localStore from 'storejs';
-import drapLeft from '@/views/components/drapLeft/index';
 
 export default {
-	name: 'Lesson',
-	components: {
-		LessonTree,
-		drapLeft
-	},
+	name: 'TeachHome',
 	data() {
 		return {
-			treeShow: true,
-			widthLeft: Number(localStore.get('LeftWidth')) || 450
+			tableData: [],
+			loading: false
 		};
 	},
-	computed: {
-		...mapGetters(['lessonbar']),
-		height() {
-			return this.$store.state.app.height - 50;
+	watch: {
+		$route(newVal) {
+			this.loadInitPage();
 		}
 	},
-	watch: {
-		'lessonbar.opened': function (val) {
-			this.treeShow = val;
-		},
-		$route(to, from) {
-			if (/\/lesson\/detail/.test(to.path) && /\/lesson\/pay/.test(from.path)) {
-				this.$emit('refresh', [
-					localStore.get('cityCode') || '',
-					localStore.get('mapId') || ''
-				]);
-			}
-		}
+	mounted() {
+		this.loadInitPage();
 	},
 	methods: {
-		drapWidth(width) {
-			this.widthLeft = Number(width);
+		loadInitPage() {
+			if (this.$route.params.subSystem) {
+				getSubSystemDetail(this.$route.params.subSystem).then(resp =>{
+					if (resp.data) {
+						this.tableData = resp.data.lessonList;
+					}
+				}).catch(()=>{
+					this.$messageBox('获取课程信息失败！');
+				});
+			}
 		},
-		refresh(filterSelect) {
-			this.$refs && this.$refs.tree && this.$refs.tree.refresh(filterSelect);
+		goLesson(row) {
+			this.$router.push({ path: `${UrlConfig.trainingPlatform.teachDetail}/${this.$route.params.subSystem}`, query: {lessonId: row.id, mapId: row.mapId, prdCode: row.prdCode}});
 		}
 	}
 };
 </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;
-  }
-
-  .list {
-    float: left;
-  }
-</style>
diff --git a/src/views/teach/practical/index.vue b/src/views/teach/practical/index.vue
index 96123d98a..f4221b80d 100644
--- a/src/views/teach/practical/index.vue
+++ b/src/views/teach/practical/index.vue
@@ -21,6 +21,7 @@
     </div>
     <div class="btn-start">
       <el-button :loading="loading" type="primary" @click="start">{{ $t('teach.startTraining') }}</el-button>
+      <el-button @click="back">{{ $t('global.back') }}</el-button>
     </div>
   </el-card>
 </template>
@@ -96,6 +97,9 @@ export default {
 				this.loading = false;
 				this.$messageBox(`${this.$t('tip.createSimulationFaild')} : ${error.message}`);
 			});
+		},
+		back() {
+			this.$router.back();
 		}
 	}
 };
diff --git a/src/views/trainRoom/index.vue b/src/views/trainRoom/index.vue
index f71013520..4ed75deda 100644
--- a/src/views/trainRoom/index.vue
+++ b/src/views/trainRoom/index.vue
@@ -4,9 +4,9 @@
       <!-- title显示 -->
       <div class="creator">
         <p style="margin-top: 2px;font-size: 15px;">{{ $t('trainRoom.comprehensiveTrainingManager') + roomInfo.creator }}</p>
-        <p class="roomName">{{$t('trainRoom.comprehensiveDrillRoom')}}</p>
+        <p class="roomName">{{ $t('trainRoom.comprehensiveDrillRoom') }}</p>
         <div style="padding-right: 30px;">
-          <p class="num">{{$t('trainRoom.numberOfAssignableRoles')}}{{ permissionRest }} / {{ roomInfo.permissionNum - 1 }}</p>
+          <p class="num">{{ $t('trainRoom.numberOfAssignableRoles') }}{{ permissionRest }} / {{ roomInfo.permissionNum - 1 }}</p>
         </div>
       </div>
       <!-- 聊天窗口 -->
@@ -18,7 +18,7 @@
         <div style="height: calc(100% - 20px); overflow-y: scroll; padding: 0px 30px;">
           <div style="display: flex; justify-content: space-between;">
             <div class="Scheduling">
-              <p class="title">{{$t('trainRoom.dispatcher')}}</p>
+              <p class="title">{{ $t('trainRoom.dispatcher') }}</p>
               <ul>
                 <li v-for="(nor, index) in dispatchList" :key="index" class="selectPerson">
                   <span>{{ nor.nickName }}</span>
@@ -34,7 +34,7 @@
               </div>
             </div>
             <div class="Scheduling">
-              <p class="title">{{$t('trainRoom.stationAttendant')}}</p>
+              <p class="title">{{ $t('trainRoom.stationAttendant') }}</p>
               <ul>
                 <li v-for="(nor, index) in equipmentList" :key="index" class="selectPerson">
                   <span>{{ nor.nickName }}</span>
@@ -75,7 +75,7 @@
           </div>
           <div style="display: flex; justify-content: space-between;">
             <div class="Scheduling ">
-              <p class="title">{{$t('trainRoom.teacher')}}</p>
+              <p class="title">{{ $t('trainRoom.teacher') }}</p>
               <ul>
                 <li v-for="(nor, index) in adminList" :key="index" class="selectPerson">
                   <span>{{ nor.nickName }}</span>
@@ -91,7 +91,7 @@
               </div>
             </div>
             <div class="Scheduling ">
-              <p class="title">{{$t('trainRoom.universalAccount')}}</p>
+              <p class="title">{{ $t('trainRoom.universalAccount') }}</p>
               <ul>
                 <li v-for="(nor, index) in signalList" :key="index" class="selectPerson">
                   <span>{{ nor.nickName }}</span>
@@ -109,7 +109,7 @@
           </div>
           <div style="display: flex; justify-content: space-between;">
             <div class="Scheduling">
-              <p class="title">{{$t('trainRoom.driver')}}</p>
+              <p class="title">{{ $t('trainRoom.driver') }}</p>
               <ul>
                 <li v-for="(nor, index) in driverList" :key="index" class="selectPerson">
                   <span>{{ nor.nickName }}</span>
@@ -135,13 +135,14 @@
                     @click="handleDelUserForStation(nor, index, stationListForIBP, ibpList)"
                   />
                   <div style="float: right; margin-right: 15px;">
-                      <el-cascader
-                          v-model="nor.deviceCode"
-                          size="mini"
-                          :placeholder="$t('global.choose')"
-                          :disabled="userId != roomInfo.creatorId"
-                          :options="stationListForIBP"
-                          @change="handleChangeUser(nor, 'IBP', stationListForIBP, ibpList)"></el-cascader>
+                    <el-cascader
+                      v-model="nor.deviceCode"
+                      size="mini"
+                      :placeholder="$t('global.choose')"
+                      :disabled="userId != roomInfo.creatorId"
+                      :options="stationListForIBP"
+                      @change="handleChangeUser(nor, 'IBP', stationListForIBP, ibpList)"
+                    />
                   </div>
                 </li>
               </ul>
@@ -157,7 +158,7 @@
           </div>
           <div style="display: flex; justify-content: space-between;">
             <div class="Scheduling">
-              <p class="title">{{$t('trainRoom.bigScreen')}}</p>
+              <p class="title">{{ $t('trainRoom.bigScreen') }}</p>
               <ul>
                 <li v-for="(nor, index) in bigScreenList" :key="index" class="selectPerson">
                   <span>{{ nor.nickName }}</span>
@@ -173,33 +174,33 @@
               </div>
             </div>
             <!--<div class="Scheduling">-->
-                <!--<p class="title">真实设备-<span>{{hasPlc?'[PLC网关在线]':'[PLC网关离线]'}}</span></p>-->
-              <!--<ul>-->
-                 <!--<li v-for="(nor, index) in stationStandList" :key="index" class="selectPerson">-->
-                 <!--<span>{{ realDeviceType[nor.deviceType] }}</span>-->
-                 <!--<div style="float: right; margin-right: 15px;">-->
-                     <!--<el-select-->
-                         <!--v-model="nor.deviceCode"-->
-                         <!--:placeholder="$t('global.choose')"-->
-                         <!--size="mini"-->
-                         <!--:disabled="userId != roomInfo.creatorId"-->
-                         <!--@change="handleChangeDevice(nor, doorList, stationStandList)"-->
-                     <!--&gt;-->
-                         <!--<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>-->
-                 <!--</div>-->
-                 <!--</li>-->
-              <!--</ul>-->
-              <!--<div v-if="userId == roomInfo.creatorId" class="add-box">-->
-                 <!--<el-button icon="el-icon-plus" circle plain @click="addingDevice" />-->
-              <!--</div>-->
+            <!--<p class="title">真实设备-<span>{{hasPlc?'[PLC网关在线]':'[PLC网关离线]'}}</span></p>-->
+            <!--<ul>-->
+            <!--<li v-for="(nor, index) in stationStandList" :key="index" class="selectPerson">-->
+            <!--<span>{{ realDeviceType[nor.deviceType] }}</span>-->
+            <!--<div style="float: right; margin-right: 15px;">-->
+            <!--<el-select-->
+            <!--v-model="nor.deviceCode"-->
+            <!--:placeholder="$t('global.choose')"-->
+            <!--size="mini"-->
+            <!--:disabled="userId != roomInfo.creatorId"-->
+            <!--@change="handleChangeDevice(nor, doorList, stationStandList)"-->
+            <!--&gt;-->
+            <!--<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>-->
+            <!--</div>-->
+            <!--</li>-->
+            <!--</ul>-->
+            <!--<div v-if="userId == roomInfo.creatorId" class="add-box">-->
+            <!--<el-button icon="el-icon-plus" circle plain @click="addingDevice" />-->
+            <!--</div>-->
             <!--</div>-->
           </div>
         </div>
@@ -210,7 +211,7 @@
             type="danger"
             :loading="loading"
             @click="exit"
-          >{{$t('trainRoom.destroyRoom')}}
+          >{{ $t('trainRoom.destroyRoom') }}
           </el-button>
           <el-button
             v-if="userId == roomInfo.creatorId"
@@ -218,7 +219,7 @@
             type="success"
             :loading="loading"
             @click="postCode"
-          >{{$t('trainRoom.generatingQRCode')}}
+          >{{ $t('trainRoom.generatingQRCode') }}
           </el-button>
           <template v-if="!starting">
             <el-button
@@ -228,7 +229,7 @@
               :loading="loading"
               @click="start"
             >
-                {{$t('trainRoom.startSimulation')}}</el-button>
+              {{ $t('trainRoom.startSimulation') }}</el-button>
           </template>
           <template v-else>
             <el-button
@@ -237,7 +238,7 @@
               :loading="loading"
               @click="joinJointTrain"
             >
-                {{$t('trainRoom.enterSimulation')}}</el-button>
+              {{ $t('trainRoom.enterSimulation') }}</el-button>
             <el-button
               v-if="userId == roomInfo.creatorId"
               style="margin-left: 10px"
@@ -245,9 +246,9 @@
               :loading="loading"
               @click="stop"
             >
-                {{$t('trainRoom.endSimulation')}}</el-button>
+              {{ $t('trainRoom.endSimulation') }}</el-button>
           </template>
-          <el-button type="" @click="backRoom">{{$t('global.back')}}
+          <el-button type="" @click="backRoom">{{ $t('global.back') }}
           </el-button>
         </div>
       </div>
@@ -283,12 +284,12 @@
 </template>
 
 <script>
-import { getJoinTrainCode, deljointTrainRoom, putUserRoles, postRoomDetail, getJointTrainRoomUserList, putJointTrainingExit, startJointTraining, putJointTrainingSimulation, putJointTrainingSimulationEntrance,setRealDevice } from '@/api/chat';
+import { getJoinTrainCode, deljointTrainRoom, putUserRoles, postRoomDetail, getJointTrainRoomUserList, putJointTrainingExit, startJointTraining, putJointTrainingSimulation, putJointTrainingSimulationEntrance, setRealDevice } from '@/api/chat';
 import { getStationList } from '@/api/runplan';
 import { launchFullscreen } from '@/utils/screen';
-import { DeviceMenu,RealDeviceType } from '@/scripts/ConstDic';
+import { DeviceMenu, RealDeviceType } from '@/scripts/ConstDic';
 import { checkLoginLine } from '@/api/login';
-import { getPublishMapInfo,hasDoorStationList } from '@/api/jmap/map';
+import { getPublishMapInfo, hasDoorStationList } from '@/api/jmap/map';
 import { getPlcGateway } from '@/api/simulation';
 import trainChat from './trainChat';
 import AddPerson from './addPerson';
@@ -305,7 +306,7 @@ export default {
 	},
 	data() {
 		return {
-		    testData: ['Station_203_0.07533','left'],
+			testData: ['Station_203_0.07533', 'left'],
 			userId: '',
 			permissionRest: 0,
 			roomInfo: {
@@ -330,7 +331,7 @@ export default {
 			signalList: [],
 			bigScreenList: [],
 			stationList: [],
-            stationStandList: [],
+			stationStandList: [],
 			ibpList: [],
 			point: {
 				x: 0,
@@ -341,9 +342,9 @@ export default {
 			starting: false,
 			mapId: '',
 			loading: false,
-            hasPlc: false,
-            doorList: [],
-            realDeviceType:RealDeviceType
+			hasPlc: false,
+			doorList: [],
+			realDeviceType: RealDeviceType
 		};
 	},
 	computed: {
@@ -363,7 +364,7 @@ export default {
 		},
 		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')}] };
+				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;
 			});
 		}
@@ -406,11 +407,11 @@ export default {
 				await this.addPeopleList(val);
 			}
 		},
-        '$store.state.socket.deviceInfo': async function (val) {
-            if (val) { 		// 分配设备信息
-                await this.handlerDeviceList(val);
-            }
-        },
+		'$store.state.socket.deviceInfo': async function (val) {
+			if (val) { 		// 分配设备信息
+				await this.handlerDeviceList(val);
+			}
+		}
 	},
 	beforeDestroy() {
 		if (this.timeDemon) {
@@ -421,7 +422,7 @@ export default {
 		this.userId = this.$store.state.user.id;
 		this.getRoomInfo(); // 获取房间信息 info
 		this.getUserList(); // 房间人员 列表
-        // this.checkPlcGateway(); //PLC网关
+		// this.checkPlcGateway(); //PLC网关
 		this.timeDemon = setInterval(() => {
 			checkLoginLine();
 		}, 5000 * 60);
@@ -443,9 +444,9 @@ export default {
 			if (!value) return true;
 			return data.name.indexOf(value) !== -1;
 		},
-        ibpRoleData(nor) {
-		    return [nor.deviceCode,nor.ibpPart]
-        },
+		ibpRoleData(nor) {
+			return [nor.deviceCode, nor.ibpPart];
+		},
 		async handleRoomInfo(data) {
 			const param = {
 				creatorId: data.creatorId,
@@ -457,14 +458,14 @@ export default {
 			};
 
 			if (data.state == '03') { // 房间销毁
-				this.$router.push({ path: `/demonstration/detail/${param.mapId}` });
+				this.$router.push({ path: `/trainingPlatform/detail/${this.$route.query.subSystem}`, query: {mapId: this.mapId}});
 			} else if (data.state == '01') { // 进入准备中
 				this.starting = false;
 			} else if (data.state == '02') {
 				this.starting = true;
 				await putJointTrainingSimulationEntrance(param.group);
 				const rest = await getPublishMapInfo(param.mapId);
-				const query = { skinCode: rest.data.skinCode, mapId: param.mapId, group: param.group };
+				const query = { skinCode: rest.data.skinCode, mapId: param.mapId, group: param.group, subSystem: this.$route.query.subSystem };
 				this.$router.push({ path: `/jointTraining`, query: query });
 				launchFullscreen();
 			}
@@ -486,7 +487,7 @@ export default {
 			this.loading = true;
 			await putJointTrainingSimulationEntrance(this.$route.query.group);
 			const rest = await getPublishMapInfo(this.mapId);
-			const query = { skinCode: rest.data.skinCode, mapId: this.mapId, group: this.$route.query.group };
+			const query = { skinCode: rest.data.skinCode, mapId: this.mapId, group: this.$route.query.group, subSystem: this.$route.query.subSystem };
 			this.$router.push({ path: `/jointTraining`, query: query });
 			launchFullscreen();
 		},
@@ -553,7 +554,7 @@ export default {
 							this.ibpList.splice(index, 1);
 						}
 					});
-					item.deviceCode = [item.deviceCode,item.ibpPart];
+					item.deviceCode = [item.deviceCode, item.ibpPart];
 					this.ibpList.push(item);
 					break;
 				case 'BigScreen':
@@ -606,6 +607,7 @@ export default {
 
 			this.starting = res.data.state == '02';
 			this.mapId = res.data.mapId;
+			this.prodId = res.data.mapPrdCode;
 			this.roomInfo = {
 				creatorId: res.data.creatorId,
 				totalNum: Number(res.data.permissionNum) + Number(res.data.audiencePermissionNum),
@@ -620,7 +622,7 @@ export default {
 			this.stationList = resp.data;
 			this.computePermissionRest();
 			// 获取屏蔽门列表
-            // this.handleDoorList(res.data.mapId, resp.data);
+			// this.handleDoorList(res.data.mapId, resp.data);
 		},
 		// 获取观众席list 分配角色    Admin 管理员 Instructor 教员 Dispatcher 行调 Attendant 车站 Audience 观众 Driver 司机 Repair 通号 IBP IBP盘
 		async getUserList() {
@@ -658,7 +660,7 @@ export default {
 					break;
 				case 'IBP':
 					item.select = true;
-					item.deviceCode = [item.deviceCode,item.ibpPart]
+					item.deviceCode = [item.deviceCode, item.ibpPart];
 					this.ibpList.push(item);
 					break;
 				case 'BigScreen':
@@ -721,7 +723,7 @@ export default {
 				this.loading = true;
 				await putJointTrainingExit(this.$route.query.group);
 				this.loading = false;
-				this.$router.push({ path: `/demonstration/detail/${this.mapId}` });
+				this.$router.push({ path: `/trainingPlatform/detail/${this.$route.query.subSystem}`, query: {mapId: this.mapId}});
 			} catch (error) {
 				this.messageInfo( this.$t('error.operationFailure'), 'error');
 			}
@@ -743,16 +745,16 @@ export default {
 		},
 		// 打开弹窗
 		addingRoles(name, title) {
-		    const titleMap = {
-                '增加调度人员': this.$t('trainRoom.increaseDispatchers'),
-                '增加车站值班员': this.$t('trainRoom.increaseStationAttendant'),
-                '增加教员': this.$t('trainRoom.increaseTeacher'),
-                '增加通号': this.$t('trainRoom.increaseUniversalAccount'),
-                '增加司机': this.$t('trainRoom.driver'),
-                '增加大屏': this.$t('trainRoom.increaseBigScreen'),
-                '增加IBP': this.$t('trainRoom.increaseIbp')
-            };
-		    title = titleMap[title];
+			const titleMap = {
+				'增加调度人员': this.$t('trainRoom.increaseDispatchers'),
+				'增加车站值班员': this.$t('trainRoom.increaseStationAttendant'),
+				'增加教员': this.$t('trainRoom.increaseTeacher'),
+				'增加通号': this.$t('trainRoom.increaseUniversalAccount'),
+				'增加司机': this.$t('trainRoom.driver'),
+				'增加大屏': this.$t('trainRoom.increaseBigScreen'),
+				'增加IBP': this.$t('trainRoom.increaseIbp')
+			};
+			title = titleMap[title];
 			this.listName = name;
 			const treeList = [];
 			this.treeData.forEach(item => {
@@ -829,20 +831,20 @@ export default {
 			});
 		},
 		handleChangeUser(val, role, stationList, list) {
-		    let deviceCode = ''
-		    if (role === 'IBP'){
-                val.ibpPart = val.deviceCode[1];
-                deviceCode = val.deviceCode[0];
-            }else {
-		        val.ibpPart = '';
-                deviceCode = val.deviceCode;
-            }
+			let deviceCode = '';
+			if (role === 'IBP') {
+				val.ibpPart = val.deviceCode[1];
+				deviceCode = val.deviceCode[0];
+			} else {
+				val.ibpPart = '';
+				deviceCode = val.deviceCode;
+			}
 			const params = [{
 				id: val.id,
 				nickName: val.nickName,
 				userRole: role,
 				deviceCode: deviceCode,
-                ibpPart: val.ibpPart
+				ibpPart: val.ibpPart
 			}];
 			putUserRoles(params, this.$route.query.group);
 			stationList.forEach(item => {
@@ -891,63 +893,63 @@ export default {
 				type: type
 			});
 		},
-        checkPlcGateway() {
-            getPlcGateway(this.$route.query.group).then(resp=>{
-                if(resp.data){
-                    this.hasPlc = true;
-                }else {
-                    this.hasPlc = false;
-                }
-            }).catch(() => {
-                this.$messageBox('查询PLC设备失败！');
-            });
-        },
-        handleDoorList(mapId,stationList) {
-            let doorList = [];
-            hasDoorStationList(mapId).then(res =>{
-                stationList.forEach(item => {
-                    res.data.forEach(it =>{
-                        if (item.code === it.stationCode) {
-                            const direction = parseInt(it.doorLocationType)%2 ===0? '上行站台':'下行站台';
-                            doorList.push({code:it.code,name:item.name+direction})
-                        }
-                    })
-                });
-                this.doorList = doorList;
-            }).catch((error) => {
-                this.$messageBox('获取屏蔽门列表失败！');
-            })
-        },
-        addingDevice() {
-		    const roomDeviceVo = {id:'',deviceType:'ScreenDoor',deviceCode:''};
-            setRealDevice(this.$route.query.group,roomDeviceVo);
-        },
-        handleChangeDevice(nor,doorList, stationStandList){
-            setRealDevice(this.$route.query.group,nor);
-            doorList.forEach(item => {
-                item.disabled = false;
-                stationStandList.forEach(nor => {
-                    if (item.code == nor.deviceCode) {
-                        item.disabled = true;
-                    }
-                });
-            });
-        },
-        handlerDeviceList(data) {
-		    this.stationStandList = [data];
-        }
+		checkPlcGateway() {
+			getPlcGateway(this.$route.query.group).then(resp=>{
+				if (resp.data) {
+					this.hasPlc = true;
+				} else {
+					this.hasPlc = false;
+				}
+			}).catch(() => {
+				this.$messageBox('查询PLC设备失败！');
+			});
+		},
+		handleDoorList(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? '上行站台':'下行站台';
+							doorList.push({code: it.code, name: item.name+direction});
+						}
+					});
+				});
+				this.doorList = doorList;
+			}).catch((error) => {
+				this.$messageBox('获取屏蔽门列表失败！');
+			});
+		},
+		addingDevice() {
+			const roomDeviceVo = {id: '', deviceType: 'ScreenDoor', deviceCode: ''};
+			setRealDevice(this.$route.query.group, roomDeviceVo);
+		},
+		handleChangeDevice(nor, doorList, stationStandList) {
+			setRealDevice(this.$route.query.group, nor);
+			doorList.forEach(item => {
+				item.disabled = false;
+				stationStandList.forEach(nor => {
+					if (item.code == nor.deviceCode) {
+						item.disabled = true;
+					}
+				});
+			});
+		},
+		handlerDeviceList(data) {
+			this.stationStandList = [data];
+		}
 	}
 };
 </script>
 
 <style scoped lang="scss">
     /deep/ {
-        .Scheduling {
-            .el-input__inner {
-                height: 30px;
-                width: 180px;
-            }
-        }
+    .Scheduling {
+    .el-input__inner {
+        height: 30px;
+        width: 180px;
+    }
+    }
     }
 
     ul,
@@ -970,47 +972,47 @@ export default {
         height: 100%;
         min-width: 1300px;
 
-        .content-box {
-            width: calc(100% - 320px);
-            height: 100%;
-            float: left;
-            position: relative;
+    .content-box {
+        width: calc(100% - 320px);
+        height: 100%;
+        float: left;
+        position: relative;
 
-            .creator {
-                padding-left: 50px;
-                margin-top: 10px;
-                display: flex;
-                justify-content: space-between;
+    .creator {
+        padding-left: 50px;
+        margin-top: 10px;
+        display: flex;
+        justify-content: space-between;
 
-                .num {
-                    float: left;
-                    margin-left: 15px;
-                    margin-top: 14px;
-                }
-            }
+    .num {
+        float: left;
+        margin-left: 15px;
+        margin-top: 14px;
+    }
+    }
 
-            .roomName {
-                margin-left: 20px;
-                margin: 0;
-                font-size: 25px;
-                line-height: 30px;
-            }
-        }
+    .roomName {
+        margin-left: 20px;
+        margin: 0;
+        font-size: 25px;
+        line-height: 30px;
+    }
+    }
 
-        .person-box {
-            width: 320px;
-            height: 100%;
-            float: right;
-            padding: 5px;
-            border: 1px solid #ccc;
+    .person-box {
+        width: 320px;
+        height: 100%;
+        float: right;
+        padding: 5px;
+        border: 1px solid #ccc;
 
-            .title {
-                padding-left: 5px;
-                font-size: 20px;
-                margin: 10px 0;
-                overflow: hidden;
-            }
-        }
+    .title {
+        padding-left: 5px;
+        font-size: 20px;
+        margin: 10px 0;
+        overflow: hidden;
+    }
+    }
     }
 
     .chat-box {
@@ -1025,56 +1027,56 @@ export default {
         height: calc(100% - 120px);
         float: left;
 
-        .Scheduling {
-            width: calc(50% - 10px);
-            float: left;
-            height: 240px;
-            border: 1px solid #ccc;
-            margin-bottom: 20px;
-            overflow-y: scroll;
-            position: relative;
+    .Scheduling {
+        width: calc(50% - 10px);
+        float: left;
+        height: 240px;
+        border: 1px solid #ccc;
+        margin-bottom: 20px;
+        overflow-y: scroll;
+        position: relative;
 
-            .title {
-                padding: 0;
-                margin: 0;
-                padding: 5px;
-            }
+    .title {
+        padding: 0;
+        margin: 0;
+        padding: 5px;
+    }
 
-            .add-box {
-                position: absolute;
-                right: 10px;
-                bottom: 10px;
-                width: 40px;
-                height: 40px;
-            }
-        }
+    .add-box {
+        position: absolute;
+        right: 10px;
+        bottom: 10px;
+        width: 40px;
+        height: 40px;
+    }
+    }
 
-        .selectPerson {
-            height: 30px;
-            line-height: 30px;
-            padding-left: 10px;
-            margin-bottom: 2px;
+    .selectPerson {
+        height: 30px;
+        line-height: 30px;
+        padding-left: 10px;
+        margin-bottom: 2px;
 
-            &:hover {
-                background-color: #f1f1f1;
-            }
+    &:hover {
+         background-color: #f1f1f1;
+     }
 
-            .delPerson {
-                float: right;
-                margin-right: 10px;
-                margin-top: 7px;
-                cursor: pointer;
-            }
-        }
+    .delPerson {
+        float: right;
+        margin-right: 10px;
+        margin-top: 7px;
+        cursor: pointer;
+    }
+    }
 
     }
 
     .start-box {
-		width: 100%;
-		display: flex;
-		justify-content: center;
-		background: #f1f1f1;
-		padding: 20px 0px;
+        width: 100%;
+        display: flex;
+        justify-content: center;
+        background: #f1f1f1;
+        padding: 20px 0px;
     }
 
     @media screen and (max-width: 1325px) {
diff --git a/src/views/trainingPlatform/demonList.vue b/src/views/trainingPlatform/demonList.vue
new file mode 100644
index 000000000..6d801dc56
--- /dev/null
+++ b/src/views/trainingPlatform/demonList.vue
@@ -0,0 +1,239 @@
+<template>
+  <el-card v-loading="loading" class="map-list-main">
+    <div slot="header" class="clearfix">
+      <span>{{ $t('global.mapList') }}</span>
+    </div>
+	<!-- v-if="project!=='xty' "  -->
+    <filter-city ref="filerCity" filter-empty :query-function="queryFunction" :local-param-name="localParamName" @filterSelectChange="refresh" />
+	<!-- v-if="project!=='xty' "  -->
+    <el-input v-model="filterText" :placeholder="this.$t('global.filteringKeywords')" clearable />
+    <el-scrollbar wrap-class="scrollbar-wrapper" :style="{ height: (height-(project?50:125)) +'px' }">
+      <el-tree
+        ref="tree"
+        :data="treeList"
+        node-key="id"
+        :props="defaultProps"
+        highlight-current
+        :span="22"
+        :filter-node-method="filterNode"
+        :default-expanded-keys="expandList"
+        @node-click="clickEvent"
+        @node-contextmenu="showContextMenu"
+        @node-expand="nodeExpand"
+        @node-collapse="nodeCollapse"
+      >
+        <span slot-scope="{ node:tnode, data }">
+          <span
+            class="el-icon-tickets"
+            :style="{color: data.valid ? 'green':''}"
+          >&nbsp;{{ tnode.label }}</span>
+        </span>
+      </el-tree>
+    </el-scrollbar>
+  </el-card>
+</template>
+<script>
+import { getPublishMapTree } from '@/api/management/mapprd';
+import { getTrainingSystemList, getTrainingSystemListByMapId, getSubSystemInfo } from '@/api/trainingPlatform';
+import { UrlConfig } from '@/router/index';
+import FilterCity from '@/views/components/filterCity';
+import localStore from 'storejs';
+import { getSessionStorage } from '@/utils/auth';
+
+export default {
+	name: 'DemonList',
+	components: {
+		FilterCity
+	},
+	props: {
+		height: {
+			type: Number,
+			required: true
+		}
+	},
+	data() {
+		return {
+			loading: true,
+			defaultShowKeys: [],
+			queryFunction: getPublishMapTree,
+			filterText: '',
+			treeList: [],
+			selected: {},
+			defaultProps: {
+				children: 'children',
+				label: 'name'
+			},
+			node: {
+			},
+			mapId: '',
+			expandList: [],
+			filterSelect: '',
+			localParamName: 'training_cityCode'
+		};
+	},
+	computed: {
+		account() {
+			return this.$store.state.user.account;
+		},
+		project() {
+			return getSessionStorage('project');
+		}
+	},
+	watch: {
+		filterText(val) {
+			this.$refs.tree.filter(val);
+		}
+	},
+	beforeDestroy () {
+	},
+	mounted() {
+		// if (this.project === 'xty') {
+		// 	this.projectInitData('18');
+		// }
+	},
+	methods: {
+		filterNode(value, data) {
+			if (!value) return true;
+			return data.name.indexOf(value) !== -1;
+		},
+		showContextMenu(e, obj, node, vueElem) {
+			if (obj) {
+				this.node = node;
+				this.selected = obj;
+			}
+		},
+		clickEvent(obj, data, ele) {
+			localStore.set('trainingPlatformCheckId'+this.filterSelect+this.account, obj.id);
+			while (data) {
+				if (data.data.type === 'Map') {
+					this.mapId = data.data.id;
+					break;
+				}
+				data = data.parent;
+			}
+			if ( obj.type === 'Map') {
+				this.mapId = obj.id;
+				this.$router.push({ path: `${UrlConfig.trainingPlatform.permission}/${this.mapId}`});
+			} else if ( obj.type === 'MapSystem') {
+				getSubSystemInfo(obj.id).then(resp => {
+					switch (resp.data.type) {
+					case 'Exam':
+						this.setLocalRoute(`${UrlConfig.trainingPlatform.examHome}/${obj.id}`);
+						// this.$router.push({ path: `${UrlConfig.trainingPlatform.course}/${obj.id}`});
+						this.$router.push({ path: `${UrlConfig.trainingPlatform.examHome}/${obj.id}`});
+						break;
+					case 'Lesson':
+						this.setLocalRoute(`${UrlConfig.trainingPlatform.teachHome}/${obj.id}`);
+						// this.$router.push({ path: `${UrlConfig.trainingPlatform.teachDetail}/${obj.id}`});
+						this.$router.push({ path: `${UrlConfig.trainingPlatform.teachHome}/${obj.id}`});
+						break;
+					case 'Simulation':
+						this.setLocalRoute(`${UrlConfig.trainingPlatform.prodDetail}/${obj.id}?mapId=${this.mapId}`);
+						this.$router.push({ path: `${UrlConfig.trainingPlatform.prodDetail}/${obj.id}`, query: { mapId: this.mapId}});
+						break;
+                        // case '运行图编制':
+                        //     this.$router.push({ path: `${UrlConfig.trainingPlatform.runPlan}/${this.mapId}`, query: {skinCode: '02'} });
+                        //     break;
+					}
+				}).catch(() => {
+					this.$messageBox('获取子系统信息失败！');
+				});
+			}
+		},
+		setLocalRoute(path) {
+			localStore.set('trainingPlatformRoute'+this.account, path);
+		},
+		async refresh(filterSelect) {
+			this.loading = true;
+			this.treeList = [];
+			this.filterSelect = filterSelect;
+			try {
+				let params={};
+				if(this.project === 'xty'){
+					params={'customized':'xty'};
+				}
+				const res = await getTrainingSystemList(filterSelect,params);
+				res.data.forEach(item =>{
+					item.key = item.id + item.type;
+					item.children && item.children.forEach(childrenItem => {
+						childrenItem.key = childrenItem.id + item.type;
+					});
+				});
+				this.treeList = res.data;
+				this.getExpandList(filterSelect);
+				// this.changeCityWithPage(this.treeList);
+				this.$nextTick(() => {
+					const checkId = localStore.get('trainingPlatformCheckId'+filterSelect+this.account) || null;
+					this.$refs.tree && this.$refs.tree.setCurrentKey(checkId);
+					this.loading = false;
+				});
+			} catch (error) {
+				this.loading = false;
+				this.$messageBox(this.$t('error.refreshFailed'));
+			}
+		},
+		// async projectInitData(mapId) {
+		// 	this.loading = true;
+		// 	this.treeList = [];
+		// 	try {
+		// 		debugger;
+		// 		const resp = await getTrainingSystemListByMapId(mapId);
+		// 		this.treeList = resp.data;
+		// 		this.loading = false;
+		// 		this.getExpandList(this.filterSelect);
+		// 		this.$nextTick(() => {
+		// 			const checkId = localStore.get('trainingPlatformCheckId'+this.filterSelect+this.account) || null;
+		// 			this.$refs.tree && this.$refs.tree.setCurrentKey(checkId);
+		// 			this.loading = false;
+		// 		});
+		// 	} catch (e) {
+		// 		this.loading = false;
+		// 		this.$messageBox(this.$t('error.failedToGetSystemData'));
+		// 	}
+		// },
+		nodeExpand(obj, node, ele) {
+			const key = obj.id;
+			this.expandList = this.expandList.filter(item => item!==key);
+			this.expandList.push(key);
+			localStore.set('trainIngPlatformExpandList'+this.filterSelect+this.account, this.expandList);
+		},
+		nodeCollapse(obj, node, ele) {
+			const key = obj.id;
+			this.expandList = this.expandList.filter(item => item!==key);
+			localStore.set('trainIngPlatformExpandList'+this.filterSelect+this.account, this.expandList);
+		},
+		getExpandList(filterSelect) {
+			let expand = localStore.get('trainIngPlatformExpandList'+filterSelect+this.account);
+			expand = expand?(expand+'').split(','):'';
+			if (expand instanceof Array) {
+				this.expandList = expand;
+			}
+		}
+		// changeCityWithPage(treeList) {
+		// 	if (treeList.length > 0) {
+		// 		this.$router.push({ path: `${UrlConfig.trainingPlatform.permission}/${treeList[0].id}`});
+		// 		this.$refs.tree.setCurrentKey(treeList[0].id);
+		// 	}
+		// }
+	}
+};
+</script>
+<style rel="stylesheet/scss" lang="scss" scoped>
+    .back-home {
+        float: right;
+        cursor: pointer;
+
+    &:hover {
+         color: #3ea726;
+     }
+    }
+</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/exam/home.vue b/src/views/trainingPlatform/home.vue
similarity index 85%
rename from src/views/exam/home.vue
rename to src/views/trainingPlatform/home.vue
index 98b44c4f9..8f98c83e8 100644
--- a/src/views/exam/home.vue
+++ b/src/views/trainingPlatform/home.vue
@@ -1,21 +1,19 @@
 <template>
   <el-card :style="{height: height+'px'}">
     <div class="home-box" :style="{height: height+'px'}">
-      <el-scrollbar wrap-class="scrollbar-wrapper" style="margin-top:5px;">
+      <el-scrollbar wrap-class="scrollbar-wrapper">
         <h1 class="title">
-          {{ $t('exam.testSystem') }}
+          城市轨道交通实训平台
           <img :src="logo" alt="" class="logo-img">
         </h1>
         <div class="card-box">
-          <el-carousel :interval="4000" type="card" height="370px">
+          <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('exam.testSystemDescription') }}
-        </div>
+        <div class="brief-box">{{ $t('demonstration.simulationSystemDescription') }}</div>
       </el-scrollbar>
     </div>
   </el-card>
@@ -25,10 +23,10 @@
 import logo from '@/assets/logo.png';
 import home1 from '@/assets/home/home1.png';
 import home2 from '@/assets/home/home2.png';
-import home3 from '@/assets/home/home2.jpg';
+import home3 from '@/assets/home/demon1.jpg';
 import home4 from '@/assets/home/tring1.png';
 import home5 from '@/assets/home/tring4.jpg';
-import home6 from '@/assets/home/tring3.jpg';
+import home6 from '@/assets/home/demon2.jpg';
 export default {
 	name: 'Home',
 	data() {
diff --git a/src/views/trainingPlatform/index.vue b/src/views/trainingPlatform/index.vue
new file mode 100644
index 000000000..a141eb171
--- /dev/null
+++ b/src/views/trainingPlatform/index.vue
@@ -0,0 +1,87 @@
+<template>
+  <div class="app-wrapper">
+    <el-scrollbar wrap-class="scrollbar-wrapper">
+      <div v-show="listShow" class="examList" :style="{width: widthLeft+'px'}">
+        <demon-list ref="demonList" :height="height" />
+      </div>
+      <drap-left :width-left="widthLeft" @drapWidth="drapWidth" />
+      <transition>
+        <router-view :style="{ position:'relative', left:widthLeft+'px', width: (width - widthLeft)+'px'}" :product-list="productList" />
+      </transition>
+    </el-scrollbar>
+  </div>
+</template>
+
+<script>
+import { mapGetters } from 'vuex';
+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';
+
+export default {
+	name: 'TrainingPlatform',
+	components: {
+		demonList,
+		drapLeft
+	},
+	data() {
+		return {
+			listShow: true,
+			widthLeft: 450,
+			productList: []
+		};
+	},
+	computed: {
+		...mapGetters([
+			'lessonbar'
+		]),
+		height() {
+			return this.$store.state.app.height - 50;
+		},
+		width() {
+			return this.$store.state.app.width;
+		}
+	},
+	watch: {
+		'lessonbar.opened': function (val) {
+			this.listShow = val;
+		}
+	},
+	mounted() {
+		const againEnter = getSessionStorage('againEnter') || null;
+		if (!againEnter) {
+			launchFullscreen();
+			setSessionStorage('againEnter', true);
+		}
+
+		this.widthLeft = Number(localStore.get('LeftWidth'))?Number(localStore.get('LeftWidth')):450;
+	},
+	methods: {
+		refresh() {
+			this.$refs && this.$refs.demonList && this.$refs.demonList.refresh();
+		},
+		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 {
+        position: fixed;
+        top: 61px;
+        height: 100%;
+    }
+</style>
diff --git a/static/model/auto/rail.FBX b/static/model/auto/rail.FBX
index 58c2aa49e..46e0be08d 100644
Binary files a/static/model/auto/rail.FBX and b/static/model/auto/rail.FBX differ
diff --git a/static/model/auto/suidao.FBX b/static/model/auto/suidao.FBX
index 0ea58d08d..bf916f367 100644
Binary files a/static/model/auto/suidao.FBX and b/static/model/auto/suidao.FBX differ
diff --git a/static/model/auto/suidaoold.FBX b/static/model/auto/suidaoold.FBX
deleted file mode 100644
index f386a1fe3..000000000
Binary files a/static/model/auto/suidaoold.FBX and /dev/null differ
diff --git a/static/model/auto/switch1.FBX b/static/model/auto/switch1.FBX
index 20c69be1b..54fef923e 100644
Binary files a/static/model/auto/switch1.FBX and b/static/model/auto/switch1.FBX differ
diff --git a/static/model/auto/switch11.FBX b/static/model/auto/switch11.FBX
deleted file mode 100644
index 4c3060c5c..000000000
Binary files a/static/model/auto/switch11.FBX and /dev/null differ
diff --git a/static/model/auto/switch2.FBX b/static/model/auto/switch2.FBX
index 5a4caa08c..9de259ef9 100644
Binary files a/static/model/auto/switch2.FBX and b/static/model/auto/switch2.FBX differ
diff --git a/static/model/signal/d3d.FBX b/static/model/signal/d3d.FBX
new file mode 100644
index 000000000..b581278f6
Binary files /dev/null and b/static/model/signal/d3d.FBX differ
diff --git a/static/model/station/fuzhou.FBX b/static/model/station/fuzhou.FBX
index c578639d3..a55566f7e 100644
Binary files a/static/model/station/fuzhou.FBX and b/static/model/station/fuzhou.FBX differ
diff --git a/static/model/station/fuzhous.FBX b/static/model/station/fuzhous.FBX
new file mode 100644
index 000000000..e01529e4b
Binary files /dev/null and b/static/model/station/fuzhous.FBX differ
diff --git a/static/model/suidao/fengkou.png b/static/model/suidao/fengkou.png
new file mode 100644
index 000000000..e8f162c59
Binary files /dev/null and b/static/model/suidao/fengkou.png differ
diff --git a/static/model/suidao/suidao.FBX b/static/model/suidao/suidao.FBX
index 562e67b84..047b18588 100644
Binary files a/static/model/suidao/suidao.FBX and b/static/model/suidao/suidao.FBX differ
diff --git a/static/model/suidao/suidao1.FBX b/static/model/suidao/suidao1.FBX
new file mode 100644
index 000000000..157b9bd15
Binary files /dev/null and b/static/model/suidao/suidao1.FBX differ
diff --git a/static/model/suidao/suidao2.FBX b/static/model/suidao/suidao2.FBX
deleted file mode 100644
index 6fd58e20d..000000000
Binary files a/static/model/suidao/suidao2.FBX and /dev/null differ
diff --git a/static/model/suidao/suidaodimian1111.jpg b/static/model/suidao/suidaodimian1111.jpg
new file mode 100644
index 000000000..1f35d4b97
Binary files /dev/null and b/static/model/suidao/suidaodimian1111.jpg differ
diff --git a/static/model/suidao/suidaodimian11111.jpg b/static/model/suidao/suidaodimian11111.jpg
new file mode 100644
index 000000000..55f45889c
Binary files /dev/null and b/static/model/suidao/suidaodimian11111.jpg differ
diff --git a/static/model/train/liechehuo.png b/static/model/train/liechehuo.png
new file mode 100644
index 000000000..4abcee8bd
Binary files /dev/null and b/static/model/train/liechehuo.png differ
diff --git a/static/model/train/train.FBX b/static/model/train/train.FBX
new file mode 100644
index 000000000..1286b7934
Binary files /dev/null and b/static/model/train/train.FBX differ